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

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

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.17 by root, Wed Dec 20 09:14:21 2006 UTC vs. Revision 1.59 by root, Wed Oct 21 00:44:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.17 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.59 by root, Wed Oct 21 00:44:39 2009 UTC