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

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

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.19 by root, Mon Dec 25 11:25:49 2006 UTC vs. Revision 1.58 by root, Thu Oct 15 21:40:42 2009 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.19 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.58 by root, Thu Oct 15 21:40:42 2009 UTC