[ViewVC] Diff of: cvs/deliantra/server/common/button.C

Comparing deliantra/server/common/button.C (file contents):
Revision 1.13 by root, Sat Dec 9 16:11:08 2006 UTC vs.
Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <funcpoint.h>
26		25
27	/*	26	/*
28	* This code is no longer highly inefficient 8)	27	* This code is no longer highly inefficient 8)
29	*/	28	*/
30		29
31	/*	30	/*
32	* elmex:	31	* elmex:
33	* This function takes a objectlink list with all the objects are going to be activated.	32	* This function takes a objectlink list with all the objects are going to be activated.
34	* state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.	33	* state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
35	* The source argument can be 0 or the source object for this activation.	34	* The activator argument can be 0 or the source object for this activation.
		35	* the originator is the player or monster who did something.
36	*/	36	*/
37	void	37	static void
38	activate_connection_link (objectlink * ol, bool state, object *source = 0)	38	activate_connection_link (objectlink ol, int state, object activator, object *originator)
39	{	39	{
40	object *tmp = 0;
41
42	for (; ol; ol = ol->next)	40	for (; ol; ol = ol->next)
43	{	41	{
44	if (!ol->ob)	42	if (!ol->ob)
45	{	43	{
46	LOG (llevError, "Internal error in activate_connection_link.\n");	44	LOG (llevError, "Internal error in activate_connection_link.\n");
55	* re-loaded. As such, just exit this function if that is the case.	53	* re-loaded. As such, just exit this function if that is the case.
56	*/	54	*/
57		55
58	if (QUERY_FLAG (ol->ob, FLAG_FREED))	56	if (QUERY_FLAG (ol->ob, FLAG_FREED))
59	return;	57	return;
		58
60	tmp = ol->ob;	59	object *tmp = ol->ob;
61		60
62	/* if the criteria isn't appropriate, don't do anything */	61	/* if the criteria isn't appropriate, don't do anything */
63	if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))	62	if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
64	continue;	63	continue;
		64
65	if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))	65	if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
66	continue;	66	continue;
67		67
68	switch (tmp->type)	68	switch (tmp->type)
69	{	69	{
70	case GATE:	70	case GATE:
71	case HOLE:	71	case HOLE:
		72	if (!tmp->active)
		73	tmp->play_sound (tmp->sound
		74	? tmp->sound
		75	: sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
72	tmp->value = tmp->stats.maxsp ? !state : state;	76	tmp->value = tmp->stats.maxsp ? !state : state;
73	tmp->speed = 0.5;	77	tmp->set_speed (0.5);
74	update_ob_speed (tmp);
75	break;	78	break;
76		79
77	case CF_HANDLE:	80	case CF_HANDLE:
78	SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));	81	SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
79	update_object (tmp, UP_OBJ_FACE);	82	update_object (tmp, UP_OBJ_FACE);
80	break;	83	break;
81		84
82	case SIGN:	85	case SIGN:
83	if (!tmp->stats.food \|\| tmp->last_eat < tmp->stats.food)	86	if (!tmp->stats.food \|\| tmp->last_eat < tmp->stats.food)
84	{	87	{
		88	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
85	new_info_map (NDI_UNIQUE \| NDI_NAVY, tmp->map, tmp->msg);	89	new_info_map (NDI_UNIQUE \| NDI_NAVY, tmp->map, tmp->msg);
86	if (tmp->stats.food)	90	if (tmp->stats.food)
87	tmp->last_eat++;	91	tmp->last_eat++;
88	}	92	}
89	break;	93	break;
90		94
91	case ALTAR:	95	case ALTAR:
		96	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
92	tmp->value = 1;	97	tmp->value = 1;
93	SET_ANIMATION (tmp, tmp->value);	98	SET_ANIMATION (tmp, tmp->value);
94	update_object (tmp, UP_OBJ_FACE);	99	update_object (tmp, UP_OBJ_FACE);
95	break;	100	break;
96		101
97	case BUTTON:	102	case BUTTON:
98	case PEDESTAL:	103	case PEDESTAL:
		104	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
99	tmp->value = state;	105	tmp->value = state;
100	SET_ANIMATION (tmp, tmp->value);	106	SET_ANIMATION (tmp, tmp->value);
101	update_object (tmp, UP_OBJ_FACE);	107	update_object (tmp, UP_OBJ_FACE);
102	break;	108	break;
103		109
104	case MOOD_FLOOR:	110	case MOOD_FLOOR:
105	do_mood_floor (tmp, source);	111	do_mood_floor (tmp, activator);
106	break;	112	break;
107		113
108	case TIMED_GATE:	114	case TIMED_GATE:
		115	if (!tmp->active)
		116	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
		117
109	tmp->speed = tmp->arch->clone.speed;	118	tmp->set_speed (tmp->arch->speed);
110	update_ob_speed (tmp); /* original values */
111	tmp->value = tmp->arch->clone.value;	119	tmp->value = tmp->arch->value;
112	tmp->stats.sp = 1;	120	tmp->stats.sp = 1;
113	tmp->stats.hp = tmp->stats.maxhp;	121	tmp->stats.hp = tmp->stats.maxhp;
114	/* Handle multipart gates. We copy the value for the other parts	122	/* Handle multipart gates. We copy the value for the other parts
115	* from the head - this ensures that the data will consistent	123	* from the head - this ensures that the data will consistent
116	*/	124	*/
117	for (tmp = tmp->more; tmp != NULL; tmp = tmp->more)	125	for (object *part = tmp->more; part; part = part->more)
118	{	126	{
119	tmp->speed = tmp->head->speed;	127	part->value = tmp->value;
120	tmp->value = tmp->head->value;	128	part->stats.sp = tmp->stats.sp;
121	tmp->stats.sp = tmp->head->stats.sp;	129	part->stats.hp = tmp->stats.hp;
122	tmp->stats.hp = tmp->head->stats.hp;
123	update_ob_speed (tmp);	130	part->set_speed (tmp->speed);
124	}	131	}
125	break;	132	break;
126		133
127	case DIRECTOR:	134	case DIRECTOR:
128	case FIREWALL:	135	case FIREWALL:
129	if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)	136	if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
130	move_firewall (tmp);	137	move_firewall (tmp);
131	else	138	else
132	{	139	{
133	if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */	140	tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
134	tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
135	animate_turning (tmp);	141	animate_turning (tmp);
136	}	142	}
137	break;	143	break;
138		144
139	case TELEPORTER:	145	case TELEPORTER:
140	move_teleporter (tmp);	146	move_teleporter (tmp);
141	break;	147	break;
142		148
143	case CREATOR:	149	case CREATOR:
144	move_creator (tmp);	150	move_creator (tmp);
145	break;	151	break;
146		152
147	case TRIGGER_MARKER:	153	case TRIGGER_MARKER:
		154	//tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
148	move_marker (tmp);	155	move_marker (tmp);
149	break;	156	break;
150		157
151	case DUPLICATOR:	158	case DUPLICATOR:
152	move_duplicator (tmp);	159	move_duplicator (tmp);
153	break;	160	break;
		161
		162	case MAPSCRIPT:
		163	cfperl_mapscript_activate (tmp, state, activator, originator);
		164	break;
154	}	165	}
155	}	166	}
156	}	167	}
157		168
158	/*	169	/*
…		…
166	* Changed the routine to loop through _all_ objects.	177	* Changed the routine to loop through _all_ objects.
167	* Better hurry with that linked list...	178	* Better hurry with that linked list...
168	*	179	*
169	*/	180	*/
170	void	181	void
171	push_button (object *op)	182	push_button (object op, object originator)
172	{	183	{
173	oblinkpt *obp = get_button_links (op);	184	if (oblinkpt *obp = op->find_link ())
174		185	{
175	if (!obp)	186	if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
176	return;	187	return;
177		188
178	if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
179	return;
180
181	activate_connection_link (obp->link, op->value, op);	189	activate_connection_link (obp->link, op->value, op, originator);
		190	}
182	}	191	}
183		192
184	/*	193	/*
185	* elmex:	194	* elmex:
186	* This activates a connection, similar to push_button (object *op) but it takes	195	* This activates a connection, similar to push_button (object *op) but it takes
…		…
188	* the connection was 'state' or 'released'. So that you can activate objects	197	* the connection was 'state' or 'released'. So that you can activate objects
189	* who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.	198	* who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
190	*	199	*
191	*/	200	*/
192	void	201	void
193	activate_connection (maptile *map, long connection, bool state)	202	maptile::trigger (shstr_tmp id, int state, object activator, object originator)
194	{	203	{
195	if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))	204	if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
196	return;	205	return;
197		206
198	oblinkpt *obp = get_connection_links (map, connection);	207	if (oblinkpt *obp = find_link (id))
199
200	if (obp)
201	activate_connection_link (obp->link, state);	208	activate_connection_link (obp->link, state, activator, originator);
202	}	209	}
203		210
204	/*	211	/*
205	* Updates everything connected with the button op.	212	* Updates everything connected with the button op.
206	* After changing the state of a button, this function must be called	213	* After changing the state of a button, this function must be called
207	* to make sure that all gates and other buttons connected to the	214	* to make sure that all gates and other buttons connected to the
208	* button reacts to the (eventual) change of state.	215	* button reacts to the (eventual) change of state.
209	*/	216	*/
210
211	void	217	void
212	update_button (object *op)	218	update_button (object op, object originator)
213	{	219	{
214	object ab, tmp, *head;
215	int tot, any_down = 0, old_value = op->value;	220	int any_down = 0, old_value = op->value;
216	oblinkpt *obp = 0;
217	objectlink *ol;
218		221
219	obp = get_button_links (op);	222	if (oblinkpt *obp = op->find_link ())
220	/* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
221	if (obp)
222	for (ol = obp->link; ol; ol = ol->next)	223	for (objectlink *ol = obp->link; ol; ol = ol->next)
223	{	224	{
224	if (!ol->ob)	225	if (!ol->ob)
225	{	226	{
226	LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);	227	LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
227	continue;	228	continue;
228	}	229	}
229		230
230	tmp = ol->ob;	231	object *tmp = ol->ob;
		232
231	if (tmp->type == BUTTON)	233	if (tmp->type == BUTTON)
232	{	234	{
		235	sint32 total = 0;
		236
233	for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)	237	for (object *ab = tmp->above; ab; ab = ab->above)
234	/* Bug? The pedestal code below looks for the head of
235	* the object, this bit doesn't. I'd think we should check
236	* for head here also. Maybe it also makese sense to
237	* make the for ab=tmp->above loop common, and alter
238	* behaviour based on object within that loop?
239	*/
240
241	/* Basically, if the move_type matches that on what the	238	/* Basically, if the move_type matches that on what the
242	* button wants, we count it. The second check is so that	239	* button wants, we count it. The second check is so that
243	* objects don't move (swords, etc) will count. Note that	240	* objects who don't move (swords, etc) will count. Note that
244	* this means that more work is needed to make buttons	241	* this means that more work is needed to make buttons
245	* that are only triggered by flying objects.	242	* that are only triggered by flying objects.
246	*/	243	*/
247	if ((ab->move_type & tmp->move_on) \|\| ab->move_type == 0)	244	if ((ab->move_type & tmp->move_on) \|\| ab->move_type == 0)
248	tot += ab->weight * (ab->nrof ? ab->nrof : 1) + ab->carrying;	245	total += ab->head_ ()->total_weight ();
249		246
250	tmp->value = (tot >= tmp->weight) ? 1 : 0;	247	tmp->value = total >= tmp->weight;
251	if (tmp->value)	248
252	any_down = 1;	249	any_down = any_down \|\| tmp->value;
253	}	250	}
254	else if (tmp->type == PEDESTAL)	251	else if (tmp->type == PEDESTAL)
255	{	252	{
256	tmp->value = 0;	253	tmp->value = 0;
		254
257	for (ab = tmp->above; ab != NULL; ab = ab->above)	255	for (object *ab = tmp->above; ab; ab = ab->above)
258	{	256	{
259	head = ab->head ? ab->head : ab;	257	object *head = ab->head_ ();
		258
260	/* Same note regarding move_type for buttons above apply here. */	259	/* Same note regarding move_type for buttons above apply here. */
261	if (((head->move_type & tmp->move_on) \|\| ab->move_type == 0) &&	260	if (((ab->move_type & tmp->move_on) \|\| ab->move_type == 0)
262	(head->race == tmp->slaying \|\|	261	&& (head->race == tmp->slaying
263	((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) \|\|	262	\|\| (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
264	(!strcmp (tmp->slaying, "player") && head->type == PLAYER)))	263	\|\| (tmp->slaying == shstr_player && head->type == PLAYER)))
265	tmp->value = 1;	264	tmp->value = 1;
266	}	265	}
267	if (tmp->value)	266
268	any_down = 1;	267	any_down = any_down \|\| tmp->value;
269	}	268	}
270	}	269	}
		270
271	if (any_down) /* If any other buttons were down, force this to remain down */	271	if (any_down) /* If any other buttons were down, force this to remain down */
272	op->value = 1;	272	op->value = 1;
273		273
		274	//LOG(llevDebug, "update_button: %s (%d, %d=%d)\n", &op->name, op->count, op->value, old_value);
		275
274	/* If this button hasn't changed, don't do anything */	276	/* If this button hasn't changed, don't do anything */
275	if (op->value != old_value)	277	if (op->value != old_value)
276	{	278	{
277	SET_ANIMATION (op, op->value);	279	SET_ANIMATION (op, op->value);
278	update_object (op, UP_OBJ_FACE);	280	update_object (op, UP_OBJ_FACE);
279	push_button (op); /* Make all other buttons the same */	281	push_button (op, originator); /* Make all other buttons the same */
280	}
281	}
282
283	/*
284	* Updates every button on the map (by calling update_button() for them).
285	*/
286
287	void
288	update_buttons (maptile *m)
289	{
290	objectlink *ol;
291	oblinkpt *obp;
292
293	for (obp = m->buttons; obp; obp = obp->next)
294	for (ol = obp->link; ol; ol = ol->next)
295	{
296	if (!ol->ob)
297	{
298	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
299	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
300	continue;
301	}
302
303	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
304	{
305	update_button (ol->ob);
306	break;
307	}
308	}	282	}
309	}	283	}
310		284
311	void	285	void
312	use_trigger (object *op)	286	use_trigger (object op, object originator)
313	{	287	{
314
315	/* Toggle value */	288	/* Toggle value */
316	op->value = !op->value;	289	op->value = !op->value;
		290
317	push_button (op);	291	push_button (op, originator);
318	}	292	}
319		293
320	/*	294	/*
321	* Note: animate_object should be used instead of this,	295	* Note: animate_object should be used instead of this,
322	* but it can't handle animations in the 8 directions	296	* but it can't handle animations in the 8 directions
323	*/	297	*/
324
325	void	298	void
326	animate_turning (object op) / only one part objects */	299	animate_turning (object op) / only one part objects */
327	{	300	{
328	if (++op->state >= NUM_ANIMATIONS (op) / 8)	301	if (++op->state >= NUM_ANIMATIONS (op) / 8)
329	op->state = 0;	302	op->state = 0;
…		…
344	* sacrificed. This fixes a bug of trying to put multiple altars/related	317	* sacrificed. This fixes a bug of trying to put multiple altars/related
345	* objects on the same space that take the same sacrifice.	318	* objects on the same space that take the same sacrifice.
346	*/	319	*/
347		320
348	int	321	int
349	check_altar_sacrifice (const object altar, const object sacrifice)	322	check_altar_sacrifice (object altar, object sacrifice, object *originator)
350	{	323	{
351	if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER)	324	if (sacrifice->flag [FLAG_UNPAID])
		325	return 0;
		326
		327	if (is_match_expr (ARCH_SACRIFICE (altar)))
		328	return match (ARCH_SACRIFICE (altar), altar, originator);
		329
		330	if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
		331	&& !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
		332	&& sacrifice->type != PLAYER)
352	{	333	{
353	if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name \|\|	334	if (ARCH_SACRIFICE (altar) == shstr_money
354	ARCH_SACRIFICE (altar) == sacrifice->name \|\|	335	&& sacrifice->type == MONEY
355	ARCH_SACRIFICE (altar) == sacrifice->slaying \|\|	336	&& sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
356	(!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
357	&& NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
358	return 1;	337	return 1;
359	if (strcmp (ARCH_SACRIFICE (altar), "money") == 0	338
360	&& sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))	339	if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
		340	\|\| ARCH_SACRIFICE (altar) == sacrifice->name
		341	\|\| ARCH_SACRIFICE (altar) == sacrifice->slaying
		342	\|\| strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
		343	&& NROF_SACRIFICE (altar) <= sacrifice->number_of ())
361	return 1;	344	return 1;
362	}	345	}
		346
363	return 0;	347	return 0;
364	}	348	}
365		349
366	/*	350	/*
367	* operate_altar checks if sacrifice was accepted and removes sacrificed	351	* operate_altar checks if sacrifice was accepted and removes sacrificed
…		…
371	*	355	*
372	* If this function returns 1, '*sacrifice' is modified to point to the	356	* If this function returns 1, '*sacrifice' is modified to point to the
373	* remaining sacrifice, or is set to NULL if the sacrifice was used up.	357	* remaining sacrifice, or is set to NULL if the sacrifice was used up.
374	*/	358	*/
375	int	359	int
376	operate_altar (object altar, object *sacrifice)	360	operate_altar (object altar, object sacrifice, object originator)
377	{	361	{
378	if (!altar->map)	362	if (!altar->map)
379	{	363	{
380	LOG (llevError, "BUG: operate_altar(): altar has no map\n");	364	LOG (llevError, "BUG: operate_altar(): altar has no map\n");
381	return 0;	365	return 0;
382	}	366	}
383		367
384	if (!altar->slaying \|\| altar->value)	368	if (!altar->slaying \|\| altar->value)
385	return 0;	369	return 0;
386		370
387	if (!check_altar_sacrifice (altar, *sacrifice))	371	if (!check_altar_sacrifice (altar, *sacrifice, originator))
388	return 0;	372	return 0;
389		373
390	/* check_altar_sacrifice should have already verified that enough money	374	/* check_altar_sacrifice should have already verified that enough money
391	* has been dropped.	375	* has been dropped.
392	*/	376	*/
393	if (!strcmp (ARCH_SACRIFICE (altar), "money"))	377	if (ARCH_SACRIFICE (altar) == shstr_money)
394	{	378	{
395	int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;	379	int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
396		380
397	/* Round up any sacrifices. Altars don't make change either */	381	/* Round up any sacrifices. Altars don't make change either */
398	if (NROF_SACRIFICE (altar) % (*sacrifice)->value)	382	if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
399	number++;	383	number++;
400		384
401	sacrifice = decrease_ob_nr (sacrifice, number);	385	if (!(*sacrifice)->decrease (number))
		386	*sacrifice = 0;
402	}	387	}
403	else	388	else
404	sacrifice = decrease_ob_nr (sacrifice, NROF_SACRIFICE (altar));	389	if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar)))
		390	*sacrifice = 0;
405		391
406	if (altar->msg)	392	if (altar->msg)
407	new_info_map (NDI_BLACK, altar->map, altar->msg);	393	new_info_map (NDI_BLACK, altar->map, altar->msg);
408		394
409	return 1;	395	return 1;
410	}	396	}
411		397
412	void	398	void
413	trigger_move (object op, int state) / 1 down and 0 up */	399	trigger_move (object op, int state, object originator) /* 1 down and 0 up */
414	{	400	{
415	op->stats.wc = state;	401	op->stats.wc = state;
		402
416	if (state)	403	if (state)
417	{	404	{
418	use_trigger (op);	405	use_trigger (op, originator);
419	if (op->stats.exp > 0) /* check sanity */	406	op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
420	op->speed = 1.0 / op->stats.exp;
421	else
422	op->speed = 1.0;
423	update_ob_speed (op);
424	op->speed_left = -1;	407	op->speed_left = -1;
425	}	408	}
426	else	409	else
427	{	410	{
428	use_trigger (op);	411	use_trigger (op, originator);
429	op->speed = 0;	412	op->set_speed (0);
430	update_ob_speed (op);
431	}	413	}
432	}	414	}
433		415
434		416
435	/*	417	/*
…		…
443	* TRIGGER: Returns 1 if handle could be moved, 0 if not.	425	* TRIGGER: Returns 1 if handle could be moved, 0 if not.
444	*	426	*
445	* TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.	427	* TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
446	*/	428	*/
447	int	429	int
448	check_trigger (object op, object cause)	430	check_trigger (object op, object cause, object *originator)
449	{	431	{
450	object *tmp;	432	object *tmp;
451	int push = 0, tot = 0;	433	int push = 0, tot = 0;
452	int in_movement = op->stats.wc \|\| op->speed;	434	int in_movement = op->stats.wc \|\| op->speed;
453		435
454	switch (op->type)	436	switch (op->type)
455	{	437	{
456	case TRIGGER_BUTTON:	438	case TRIGGER_BUTTON:
457	if (op->weight > 0)	439	if (op->weight > 0)
458	{	440	{
459	if (cause)	441	if (cause)
460	{	442	{
461	for (tmp = op->above; tmp; tmp = tmp->above)	443	for (tmp = op->above; tmp; tmp = tmp->above)
462	/* Comment reproduced from update_buttons(): */	444	/* Comment reproduced from update_buttons(): */
463	/* Basically, if the move_type matches that on what the	445	/* Basically, if the move_type matches that on what the
464	* button wants, we count it. The second check is so that	446	* button wants, we count it. The second check is so that
465	* objects that don't move (swords, etc) will count. Note that	447	* objects that don't move (swords, etc) will count. Note that
466	* this means that more work is needed to make buttons	448	* this means that more work is needed to make buttons
467	* that are only triggered by flying objects.	449	* that are only triggered by flying objects.
		450	*/
		451	if ((tmp->move_type & op->move_on) \|\| tmp->move_type == 0)
		452	tot += tmp->head_ ()->total_weight ();
		453
		454	if (tot >= op->weight)
		455	push = 1;
		456
		457	if (op->stats.ac == push)
		458	return 0;
		459
		460	op->stats.ac = push;
		461	if (NUM_ANIMATIONS (op) > 1)
		462	{
		463	SET_ANIMATION (op, push);
		464	update_object (op, UP_OBJ_FACE);
		465	}
		466
		467	if (in_movement \|\| !push)
		468	return 0;
		469	}
		470
		471	trigger_move (op, push, cause);
		472	}
		473
		474	return 0;
		475
		476	case TRIGGER_PEDESTAL:
		477	if (cause)
		478	{
		479	for (tmp = op->above; tmp; tmp = tmp->above)
		480	{
		481	object *head = tmp->head_ ();
		482
		483	/* See comment in TRIGGER_BUTTON about move_types */
		484	if (((head->move_type & op->move_on) \|\| head->move_type == 0)
		485	&& (head->race == op->slaying \|\| (op->slaying == shstr_player && head->type == PLAYER)))
		486	{
		487	push = 1;
		488	break;
		489	}
		490	}
		491
		492	if (op->stats.ac == push)
		493	return 0;
		494
		495	op->stats.ac = push;
		496
		497	if (NUM_ANIMATIONS (op) > 1)
		498	{
		499	SET_ANIMATION (op, push);
		500	update_object (op, UP_OBJ_FACE);
		501	}
		502
		503	update_object (op, UP_OBJ_FACE);
		504
		505	if (in_movement \|\| !push)
		506	return 0;
		507	}
		508
		509	trigger_move (op, push, cause);
		510	return 0;
		511
		512	case TRIGGER_ALTAR:
		513	if (cause)
		514	{
		515	if (in_movement)
		516	return 0;
		517
		518	if (operate_altar (op, &cause)) /* TODO: originator? */
		519	{
		520	if (NUM_ANIMATIONS (op) > 1)
		521	{
		522	SET_ANIMATION (op, 1);
		523	update_object (op, UP_OBJ_FACE);
		524	}
		525
		526	if (op->last_sp >= 0)
		527	{
		528	trigger_move (op, 1, cause);
		529
		530	if (op->last_sp > 0)
		531	op->last_sp = -op->last_sp;
		532	}
		533	else
		534	{
		535	/* for trigger altar with last_sp, the ON/OFF
		536	* status (-> +/- value) is "simulated":
468	*/	537	*/
469		538	op->value = !op->value;
470	if ((tmp->move_type & op->move_on) \|\| tmp->move_type == 0)	539	trigger_move (op, 1, cause);
471	{	540	op->last_sp = -op->last_sp;
472	tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1) + tmp->carrying;	541	op->value = !op->value;
473	}
474	if (tot >= op->weight)
475	push = 1;
476	if (op->stats.ac == push)
477	return 0;
478	op->stats.ac = push;
479	if (NUM_ANIMATIONS (op) > 1)
480	{
481	SET_ANIMATION (op, push);
482	update_object (op, UP_OBJ_FACE);
483	}	542	}
484	if (in_movement \|\| !push)	543
485	return 0;	544	return cause == NULL;
486	}	545	}
487	trigger_move (op, push);
488	}	546	else
489	return 0;
490
491	case TRIGGER_PEDESTAL:
492	if (cause)
493	{
494	for (tmp = op->above; tmp; tmp = tmp->above)
495	{
496	object *head = tmp->head ? tmp->head : tmp;
497
498	/* See comment in TRIGGER_BUTTON about move_types */
499	if (((head->move_type & op->move_on) \|\| head->move_type == 0)
500	&& (head->race == op->slaying \|\| (!strcmp (op->slaying, "player") && head->type == PLAYER)))
501	{
502	push = 1;
503	break;
504	}
505	}
506	if (op->stats.ac == push)
507	return 0;	547	return 0;
508	op->stats.ac = push;	548	}
		549	else
		550	{
509	if (NUM_ANIMATIONS (op) > 1)	551	if (NUM_ANIMATIONS (op) > 1)
510	{	552	{
511	SET_ANIMATION (op, push);	553	SET_ANIMATION (op, 0);
512	update_object (op, UP_OBJ_FACE);	554	update_object (op, UP_OBJ_FACE);
513	}	555	}
514	update_object (op, UP_OBJ_FACE);
515	if (in_movement \|\| !push)
516	return 0;
517	}
518	trigger_move (op, push);
519	return 0;
520		556
521	case TRIGGER_ALTAR:
522	if (cause)
523	{
524	if (in_movement)
525	return 0;
526	if (operate_altar (op, &cause))
527	{
528	if (NUM_ANIMATIONS (op) > 1)
529	{
530	SET_ANIMATION (op, 1);
531	update_object (op, UP_OBJ_FACE);
532	}
533	if (op->last_sp >= 0)
534	{
535	trigger_move (op, 1);
536	if (op->last_sp > 0)
537	op->last_sp = -op->last_sp;
538	}
539	else
540	{
541	/* for trigger altar with last_sp, the ON/OFF
542	* status (-> +/- value) is "simulated":
543	*/
544	op->value = !op->value;
545	trigger_move (op, 1);
546	op->last_sp = -op->last_sp;
547	op->value = !op->value;
548	}
549	return cause == NULL;
550	}
551	else
552	{
553	return 0;
554	}
555	}
556	else
557	{
558	if (NUM_ANIMATIONS (op) > 1)
559	{
560	SET_ANIMATION (op, 0);
561	update_object (op, UP_OBJ_FACE);
562	}
563
564	/* If trigger_altar has "last_sp > 0" set on the map,	557	/* If trigger_altar has "last_sp > 0" set on the map,
565	* it will push the connected value only once per sacrifice.	558	* it will push the connected value only once per sacrifice.
566	* Otherwise (default), the connected value will be	559	* Otherwise (default), the connected value will be
567	* pushed twice: First by sacrifice, second by reset! -AV	560	* pushed twice: First by sacrifice, second by reset! -AV
568	*/	561	*/
569	if (!op->last_sp)	562	if (!op->last_sp)
570	trigger_move (op, 0);	563	trigger_move (op, 0, cause);
571	else	564	else
572	{	565	{
573	op->stats.wc = 0;	566	op->stats.wc = 0;
574	op->value = !op->value;	567	op->value = !op->value;
575	op->speed = 0;	568	op->set_speed (0);
576	update_ob_speed (op);
577	}	569	}
578	}	570	}
579	return 0;	571	return 0;
580		572
581	case TRIGGER:	573	case TRIGGER:
582	if (cause)	574	if (cause)
583	{	575	{
584	if (in_movement)	576	if (in_movement)
585	return 0;	577	return 0;
		578
586	push = 1;	579	push = 1;
587	}	580	}
		581
588	if (NUM_ANIMATIONS (op) > 1)	582	if (NUM_ANIMATIONS (op) > 1)
589	{	583	{
590	SET_ANIMATION (op, push);	584	SET_ANIMATION (op, push);
591	update_object (op, UP_OBJ_FACE);	585	update_object (op, UP_OBJ_FACE);
592	}	586	}
		587
593	trigger_move (op, push);	588	trigger_move (op, push, cause);
594	return 1;	589	return 1;
595		590
596	default:	591	default:
597	LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);	592	LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
598	return 0;	593	return 0;
599	}	594	}
600	}	595	}
601		596
602	void	597	void
603	add_button_link (object button, maptile map, int connected)	598	object::add_link (maptile *map, shstr_tmp id)
604	{	599	{
605	oblinkpt *obp;
606	objectlink *ol = get_objectlink ();
607
608	if (!map)	600	if (!map)
609	{	601	{
610	LOG (llevError, "Tried to add button-link without map.\n");	602	LOG (llevError, "Tried to add button-link without map.\n");
611	return;	603	return;
612	}	604	}
613	if (!editor)
614	button->path_attuned = connected; /* peterm: I need this so I can rebuild
615	a connected map from a template map. */
616		605
617	/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/	606	flag [FLAG_IS_LINKED] = true;
618		607
619	SET_FLAG (button, FLAG_IS_LINKED);	608	objectlink *ol = get_objectlink ();
620
621	ol->ob = button;	609	ol->ob = this;
622		610
623	for (obp = map->buttons; obp && obp->value != connected; obp = obp->next);	611	for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
624		612	if (obp->id == id)
625	if (obp)
626	{	613	{
627	ol->next = obp->link;	614	ol->next = obp->link;
628	obp->link = ol;	615	obp->link = ol;
		616	return;
629	}	617	}
630	else	618
631	{
632	obp = get_objectlinkpt ();	619	oblinkpt *obp = get_objectlinkpt ();
633	obp->value = connected;	620	obp->id = id;
634		621
635	obp->next = map->buttons;	622	obp->next = map->buttons;
636	map->buttons = obp;	623	map->buttons = obp;
637	obp->link = ol;	624	obp->link = ol;
638	}
639	}	625	}
640		626
641	/*	627	/*
642	* Remove the object from the linked lists of buttons in the map.	628	* Remove the object from the linked lists of buttons in the map.
643	* This is only needed by editors.	629	* This is only needed by editors.
644	*/	630	*/
645
646	void	631	void
647	remove_button_link (object *op)	632	object::remove_link ()
648	{	633	{
649	oblinkpt *obp;	634	if (!map)
650	objectlink *olp, ol;
651
652	if (op->map == NULL)
653	{	635	{
654	LOG (llevError, "remove_button_link() in object without map.\n");	636	LOG (llevError, "remove_button_link() in object without map.\n");
655	return;	637	return;
656	}	638	}
657		639
658	if (!QUERY_FLAG (op, FLAG_IS_LINKED))	640	if (!flag [FLAG_IS_LINKED])
659	{	641	{
660	LOG (llevError, "remove_button_linked() in unlinked object.\n");	642	LOG (llevError, "remove_button_linked() in unlinked object.\n");
661	return;	643	return;
662	}	644	}
663		645
		646	flag [FLAG_IS_LINKED] = false;
		647
664	for (obp = op->map->buttons; obp; obp = obp->next)	648	for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
665	for (olp = &obp->link; (ol = *olp); olp = &ol->next)	649	for (objectlink *olp = &obp->link; olp; olp = &(*olp)->next)
666	if (ol->ob == op)	650	if ((*olp)->ob == this)
667	{	651	{
668		652	objectlink ol = olp;
669	/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
670	obp->value, op->name, op->map->path);
671	*/
672	*olp = ol->next;	653	*olp = ol->next;
673	delete ol;	654	delete ol;
674	return;	655	return;
675	}	656	}
676		657
677	LOG (llevError, "remove_button_linked(): couldn't find object.\n");	658	LOG (llevError, "remove_button_linked(): couldn't find object.\n");
678	CLEAR_FLAG (op, FLAG_IS_LINKED);	659	}
		660
		661	/*
		662	* Updates every button on the map (by calling update_button() for them).
		663	*/
		664	void
		665	maptile::update_buttons ()
		666	{
		667	for (oblinkpt *obp = buttons; obp; obp = obp->next)
		668	for (objectlink *ol = obp->link; ol; ol = ol->next)
		669	{
		670	if (!ol->ob)
		671	{
		672	LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
		673	ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
		674	continue;
		675	}
		676
		677	if (ol->ob->type == BUTTON \|\| ol->ob->type == PEDESTAL)
		678	{
		679	update_button (ol->ob, 0);
		680	break;
		681	}
		682	}
679	}	683	}
680		684
681	/*	685	/*
682	* Gets the objectlink for this connection from the map.	686	* Gets the objectlink for this connection from the map.
683	*/	687	*/
684	oblinkpt *	688	oblinkpt *
685	get_connection_links (maptile *map, long connection)	689	maptile::find_link (shstr_tmp id)
686	{	690	{
687	for (oblinkpt * obp = map->buttons; obp; obp = obp->next)	691	for (oblinkpt *obp = buttons; obp; obp = obp->next)
688	if (obp->value == connection)	692	if (obp->id == id)
689	return obp;	693	return obp;
690		694
691	return 0;	695	return 0;
692	}	696	}
693		697
694	/*	698	/*
695	* Return the first objectlink in the objects linked to this one	699	* Return the first objectlink in the objects linked to this one
696	*/	700	*/
697
698	oblinkpt *	701	oblinkpt *
699	get_button_links (const object *button)	702	object::find_link () const
700	{	703	{
701	oblinkpt *obp;	704	if (map)
702	objectlink *ol;
703
704	if (!button->map)
705	return NULL;
706
707	for (obp = button->map->buttons; obp; obp = obp->next)	705	for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
708	for (ol = obp->link; ol; ol = ol->next)	706	for (objectlink *ol = obp->link; ol; ol = ol->next)
709	if (ol->ob == button)	707	if (ol->ob == this)
710	return obp;	708	return obp;
711		709
712	return NULL;
713	}
714
715	/*
716	* Made as a separate function to increase efficiency
717	*/
718
719	int
720	get_button_value (const object *button)
721	{
722	oblinkpt *obp;
723	objectlink *ol;
724
725	if (!button->map)
726	return 0;
727	for (obp = button->map->buttons; obp; obp = obp->next)
728	for (ol = obp->link; ol; ol = ol->next)
729	if (ol->ob == button)
730	return obp->value;
731	return 0;	710	return 0;
732	}	711	}
733		712
734	/* This routine makes monsters who are	713	/* This routine makes monsters who are
735	* standing on the 'mood floor' change their	714	* standing on the 'mood floor' change their
…		…
737	* If floor is to be triggered must have	716	* If floor is to be triggered must have
738	* a speed of zero (default is 1 for all	717	* a speed of zero (default is 1 for all
739	* but the charm floor type).	718	* but the charm floor type).
740	* by b.t. thomas@nomad.astro.psu.edu	719	* by b.t. thomas@nomad.astro.psu.edu
741	*/	720	*/
742
743	void	721	void
744	do_mood_floor (object op, object source)	722	do_mood_floor (object op, object source)
745	{	723	{
746	object *tmp;
747	object *tmp2;
748
749	if (!source)	724	if (!source)
750	source = op;	725	source = op;
751		726
752	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)	727	mapspace &ms = op->ms ();
		728
		729	if (!(ms.flags () & P_IS_ALIVE))
		730	return;
		731
		732	object *tmp;
		733
		734	for (tmp = ms.top; tmp; tmp = tmp->below)
753	if (QUERY_FLAG (tmp, FLAG_MONSTER))	735	if (QUERY_FLAG (tmp, FLAG_MONSTER))
754	break;	736	break;
755		737
756	/* doesn't effect players, and if there is a player on this space, won't also	738	/* doesn't effect players, and if there is a player on this space, won't also
757	* be a monster here.	739	* be a monster here.
758	*/	740	*/
		741	//TODO: have players really FLAG_MONSTER? kept it for safety
759	if (!tmp \|\| tmp->type == PLAYER)	742	if (!tmp \|\| tmp->type == PLAYER)
760	return;	743	return;
761		744
762	switch (op->last_sp)	745	switch (op->last_sp)
763	{	746	{
764	case 0: /* furious--make all monsters mad */	747	case 0: /* furious--make all monsters mad */
765	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	748	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
766	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);	749	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
		750
767	if (QUERY_FLAG (tmp, FLAG_FRIENDLY))	751	if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
768	{	752	{
769	CLEAR_FLAG (tmp, FLAG_FRIENDLY);
770	remove_friendly_object (tmp);
771	tmp->attack_movement = 0;	753	tmp->attack_movement = 0;
772	/* lots of checks here, but want to make sure we don't	754	/* lots of checks here, but want to make sure we don't
773	* dereference a null value	755	* dereference a null value
774	*/	756	*/
775	if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp)	757	if (tmp->type == GOLEM
		758	&& tmp->owner
		759	&& tmp->owner->type == PLAYER
		760	&& tmp->owner->contr->golem == tmp)
776	tmp->owner->contr->ranges[range_golem] = 0;	761	tmp->owner->contr->golem = 0;
777		762
778	tmp->owner = 0;	763	tmp->owner = 0;
		764
		765	remove_friendly_object (tmp);
779	}	766	}
780	break;	767	break;
		768
781	case 1: /* angry -- get neutral monsters mad */	769	case 1: /* angry -- get neutral monsters mad */
782	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))	770	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
783	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);	771	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
784	break;	772	break;
		773
785	case 2: /* calm -- pacify unfriendly monsters */	774	case 2: /* calm -- pacify unfriendly monsters */
786	if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
787	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);	775	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
788	break;	776	break;
		777
789	case 3: /* make all monsters fall asleep */	778	case 3: /* make all monsters fall asleep */
790	if (!QUERY_FLAG (tmp, FLAG_SLEEP))
791	SET_FLAG (tmp, FLAG_SLEEP);	779	SET_FLAG (tmp, FLAG_SLEEP);
792	break;	780	break;
		781
793	case 4: /* charm all monsters */	782	case 4: /* charm all monsters */
794	if (op == source)	783	if (op == source)
795	break; /* only if 'connected' */	784	break; /* only if 'connected' */
796		785
797	for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */	786	if (object *pl = source->ms ().player ())
798	tmp2->type != PLAYER; tmp2 = tmp2->above)	787	{
799	if (tmp2->above == NULL)	788	tmp->set_owner (pl);
		789	SET_FLAG (tmp, FLAG_MONSTER);
		790
		791	tmp->stats.exp = 0;
		792
		793	add_friendly_object (tmp);
		794	tmp->attack_movement = PETMOVE;
		795	}
800	break;	796	break;
801		797
802	if (tmp2->type != PLAYER)	798	case 6: // kill monsters
		799	if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
803	break;	800	break;
804	set_owner (tmp, tmp2);	801
805	SET_FLAG (tmp, FLAG_MONSTER);	802	// FALL THROUGH
806	tmp->stats.exp = 0;	803	case 5: // kill all alives
807	SET_FLAG (tmp, FLAG_FRIENDLY);	804	if (!tmp->flag [FLAG_PRECIOUS])
808	add_friendly_object (tmp);	805	{
809	tmp->attack_movement = PETMOVE;	806	archetype::get (shstr_burnout)->insert_at (tmp, source);
		807	tmp->destroy ();
		808	}
810	break;	809	break;
811		810
812	default:	811	default:
813	break;	812	break;
814	}	813	}
…		…
818	* It will descend through containers to find the object.	817	* It will descend through containers to find the object.
819	* slaying = match object slaying flag	818	* slaying = match object slaying flag
820	* race = match object archetype name flag	819	* race = match object archetype name flag
821	* hp = match object type (excpt type '0'== PLAYER)	820	* hp = match object type (excpt type '0'== PLAYER)
822	*/	821	*/
823
824	object *	822	object *
825	check_inv_recursive (object op, const object trig)	823	check_inv_recursive (object op, const object trig)
826	{	824	{
827	object tmp, ret = NULL;	825	object tmp, ret = NULL;
828		826
829	/* First check the object itself. */	827	/* First check the object itself. */
830	if ((trig->stats.hp && (op->type == trig->stats.hp))	828	if ((trig->stats.hp && (op->type == trig->stats.hp))
831	\|\| (trig->slaying && (op->slaying == trig->slaying)) \|\| (trig->race && (op->arch->name == trig->race)))	829	\|\| (trig->slaying && (op->slaying == trig->slaying))
		830	\|\| (trig->race && (op->arch->archname == trig->race)))
832	return op;	831	return op;
833		832
834	for (tmp = op->inv; tmp; tmp = tmp->below)	833	for (tmp = op->inv; tmp; tmp = tmp->below)
835	{	834	{
836	if (tmp->inv)	835	if (tmp->inv)
…		…
838	ret = check_inv_recursive (tmp, trig);	837	ret = check_inv_recursive (tmp, trig);
839	if (ret)	838	if (ret)
840	return ret;	839	return ret;
841	}	840	}
842	else if ((trig->stats.hp && (tmp->type == trig->stats.hp))	841	else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
843	\|\| (trig->slaying && (tmp->slaying == trig->slaying)) \|\| (trig->race && (tmp->arch->name == trig->race)))	842	\|\| (trig->slaying && (tmp->slaying == trig->slaying))
		843	\|\| (trig->race && (tmp->arch->archname == trig->race)))
844	return tmp;	844	return tmp;
845	}	845	}
846	return NULL;	846	return NULL;
847	}	847	}
848		848
…		…
851	* the square will activate connected items.	851	* the square will activate connected items.
852	* Monsters can't trigger this square (for now)	852	* Monsters can't trigger this square (for now)
853	* Values are: last_sp = 1/0 obj/no obj triggers	853	* Values are: last_sp = 1/0 obj/no obj triggers
854	* last_heal = 1/0 remove/dont remove obj if triggered	854	* last_heal = 1/0 remove/dont remove obj if triggered
855	* -b.t. (thomas@nomad.astro.psu.edu	855	* -b.t. (thomas@nomad.astro.psu.edu
856	*/	856	*
857		857	* Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
		858	* because the check-inventory semantic essentially only applies when
		859	* something is above the inventory checker.
		860	* The semantic prior this change was: trigger if something has moved on or off
		861	* and has a matching item. Imagine what happens if someone steps on the inventory
		862	* checker with a matching item, has it, activates the connection, throws the item
		863	* away, and then leaves the inventory checker. That would've caused an always-enabled
		864	* state in the inventory checker. This won't happen anymore now.
		865	*
		866	* Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
		867	* whether op is on this mapspace or not, because the value (1\|0) depends
		868	* on this information. also make sure to only push_button if op has
		869	* a matching item (because when we do a push_button with value=0 timed gates
		870	* will still open)! (i hope i got the semantics right this time)
		871	*
		872	*/
858	void	873	void
859	check_inv (object op, object trig)	874	check_inv (object op, object trig)
860	{	875	{
861	object *match;	876	trig->value = 0; // deactivate if none of the following conditions apply
862		877
863	if (op->type != PLAYER)	878	object *pl = trig->ms ().player ();
864	return;
865	match = check_inv_recursive (op, trig);	879	object *match = check_inv_recursive (op, trig);
		880
		881	// elmex: a note about (pl == op):
		882	// if pl == 0 then the player has left this space
		883	// if pl != 0 then a player is on this mapspace, but then
		884	// we still have to check whether it's the player that triggered
		885	// this inv-checker, because if not, then the op left this inv-checker
		886	// and we have to set the value to 0
		887
866	if (match && trig->last_sp)	888	if (match && trig->last_sp) // match == having
867	{	889	{
868	if (trig->last_heal)	890	if (trig->last_heal)
869	decrease_ob (match);	891	match->decrease ();
870	use_trigger (trig);	892
		893	trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
		894	push_button (trig, op);
		895	}
		896	else if (!match && !trig->last_sp) // match == not having
871	}	897	{
872	else if (!match && !trig->last_sp)	898	trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
873	use_trigger (trig);	899	push_button (trig, op);
		900	}
874	}	901	}
875		902

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/button.C (file contents): Revision 1.13 by root, Sat Dec 9 16:11:08 2006 UTC vs. Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.13 by root, Sat Dec 9 16:11:08 2006 UTC vs.
Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC