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

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

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.21 by root, Sat Dec 30 10:16:10 2006 UTC vs. Revision 1.63 by root, Tue Nov 10 20:57:56 2009 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.21 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.63 by root, Tue Nov 10 20:57:56 2009 UTC