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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.18 by root, Thu Dec 21 01:33:49 2006 UTC vs.
Revision 1.64 by root, Fri Mar 26 00:59:20 2010 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 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 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 ("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
85	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
86	if (tmp->stats.food)	96	if (tmp->stats.food)
87	tmp->last_eat++;	97	tmp->last_eat++;
88	}	98	}
89	break;	99	break;
90		100
91	case ALTAR:	101	case ALTAR:
		102	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
92	tmp->value = 1;	103	tmp->value = 1;
93	SET_ANIMATION (tmp, tmp->value);	104	SET_ANIMATION (tmp, tmp->value);
94	update_object (tmp, UP_OBJ_FACE);	105	update_object (tmp, UP_OBJ_FACE);
95	break;	106	break;
96		107
97	case BUTTON:	108	case BUTTON:
98	case PEDESTAL:	109	case PEDESTAL:
		110	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
99	tmp->value = state;	111	tmp->value = state;
100	SET_ANIMATION (tmp, tmp->value);	112	SET_ANIMATION (tmp, tmp->value);
101	update_object (tmp, UP_OBJ_FACE);	113	update_object (tmp, UP_OBJ_FACE);
102	break;	114	break;
103		115
104	case MOOD_FLOOR:	116	case MOOD_FLOOR:
105	do_mood_floor (tmp, source);	117	do_mood_floor (tmp, activator);
106	break;	118	break;
107		119
108	case TIMED_GATE:	120	case TIMED_GATE:
		121	if (!tmp->active)
		122	tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
		123
109	tmp->speed = tmp->arch->clone.speed;	124	tmp->set_speed (tmp->arch->speed);
110	update_ob_speed (tmp); /* original values */
111	tmp->value = tmp->arch->clone.value;	125	tmp->value = tmp->arch->value;
112	tmp->stats.sp = 1;	126	tmp->stats.sp = 1;
113	tmp->stats.hp = tmp->stats.maxhp;	127	tmp->stats.hp = tmp->stats.maxhp;
114	/* Handle multipart gates. We copy the value for the other parts	128	/* Handle multipart gates. We copy the value for the other parts
115	* from the head - this ensures that the data will consistent	129	* from the head - this ensures that the data will consistent
116	*/	130	*/
117	for (tmp = tmp->more; tmp != NULL; tmp = tmp->more)	131	for (object *part = tmp->more; part; part = part->more)
118	{	132	{
119	tmp->speed = tmp->head->speed;	133	part->value = tmp->value;
120	tmp->value = tmp->head->value;	134	part->stats.sp = tmp->stats.sp;
121	tmp->stats.sp = tmp->head->stats.sp;	135	part->stats.hp = tmp->stats.hp;
122	tmp->stats.hp = tmp->head->stats.hp;
123	update_ob_speed (tmp);	136	part->set_speed (tmp->speed);
124	}	137	}
125	break;	138	break;
126		139
127	case DIRECTOR:	140	case DIRECTOR:
128	case FIREWALL:	141	case FIREWALL:
129	if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)	142	if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
130	move_firewall (tmp);	143	move_firewall (tmp);
131	else	144	else
132	{	145	{
133	if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */	146	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);	147	animate_turning (tmp);
136	}	148	}
137	break;	149	break;
138		150
139	case TELEPORTER:	151	case TELEPORTER:
140	move_teleporter (tmp);	152	move_teleporter (tmp);
141	break;	153	break;
142		154
143	case CREATOR:	155	case CREATOR:
144	move_creator (tmp);	156	move_creator (tmp);
145	break;	157	break;
146		158
147	case TRIGGER_MARKER:	159	case TRIGGER_MARKER:
		160	//tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
148	move_marker (tmp);	161	move_marker (tmp);
149	break;	162	break;
150		163
151	case DUPLICATOR:	164	case DUPLICATOR:
152	move_duplicator (tmp);	165	move_duplicator (tmp);
153	break;	166	break;
		167
		168	case MAPSCRIPT:
		169	cfperl_mapscript_activate (tmp, state, activator, originator);
		170	break;
154	}	171	}
155	}	172	}
156	}	173	}
157		174
158	/*	175	/*
…		…
166	* Changed the routine to loop through _all_ objects.	183	* Changed the routine to loop through _all_ objects.
167	* Better hurry with that linked list...	184	* Better hurry with that linked list...
168	*	185	*
169	*/	186	*/
170	void	187	void
171	push_button (object *op)	188	push_button (object op, object originator)
172	{	189	{
173	oblinkpt *obp = get_button_links (op);	190	if (oblinkpt *obp = op->find_link ())
174		191	{
175	if (!obp)	192	if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
176	return;	193	return;
177		194
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);	195	activate_connection_link (obp->link, op->value, op, originator);
		196	}
182	}	197	}
183		198
184	/*	199	/*
185	* elmex:	200	* elmex:
186	* 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
…		…
188	* 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
189	* who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.	204	* who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
190	*	205	*
191	*/	206	*/
192	void	207	void
193	activate_connection (maptile *map, long connection, bool state)	208	maptile::trigger (shstr_tmp id, int state, object activator, object originator)
194	{	209	{
195	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)))
196	return;	211	return;
197		212
198	oblinkpt *obp = get_connection_links (map, connection);	213	if (oblinkpt *obp = find_link (id))
199
200	if (obp)
201	activate_connection_link (obp->link, state);	214	activate_connection_link (obp->link, state, activator, originator);
202	}	215	}
203		216
204	/*	217	/*
205	* Updates everything connected with the button op.	218	* Updates everything connected with the button op.
206	* 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
207	* 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
208	* button reacts to the (eventual) change of state.	221	* button reacts to the (eventual) change of state.
209	*/	222	*/
210	void	223	void
211	update_button (object *op)	224	update_button (object op, object originator)
212	{	225	{
213	object ab, tmp, *head;
214	int tot, any_down = 0, old_value = op->value;	226	int any_down = 0, old_value = op->value;
215	oblinkpt *obp = 0;
216	objectlink *ol;
217		227
218	obp = get_button_links (op);	228	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)	229	for (objectlink *ol = obp->link; ol; ol = ol->next)
222	{	230	{
223	if (!ol->ob)	231	if (!ol->ob)
224	{	232	{
225	LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);	233	LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
226	continue;	234	continue;
227	}	235	}
228		236
229	tmp = ol->ob;	237	object *tmp = ol->ob;
		238
230	if (tmp->type == BUTTON)	239	if (tmp->type == BUTTON)
231	{	240	{
		241	sint32 total = 0;
		242
232	for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)	243	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	244	/* Basically, if the move_type matches that on what the
241	* button wants, we count it. The second check is so that	245	* button wants, we count it. The second check is so that
242	* objects don't move (swords, etc) will count. Note that	246	* objects who don't move (swords, etc) will count. Note that
243	* this means that more work is needed to make buttons	247	* this means that more work is needed to make buttons
244	* that are only triggered by flying objects.	248	* that are only triggered by flying objects.
245	*/	249	*/
246	if ((ab->move_type & tmp->move_on) \|\| ab->move_type == 0)	250	if ((ab->move_type & tmp->move_on) \|\| ab->move_type == 0)
247	tot += ab->weight * (ab->nrof ? ab->nrof : 1) + ab->carrying;	251	total += ab->head_ ()->total_weight ();
248		252
249	tmp->value = (tot >= tmp->weight) ? 1 : 0;	253	tmp->value = total >= tmp->weight;
250	if (tmp->value)	254
251	any_down = 1;	255	any_down = any_down \|\| tmp->value;
252	}	256	}
253	else if (tmp->type == PEDESTAL)	257	else if (tmp->type == PEDESTAL)
254	{	258	{
		259	bool is_match = is_match_expr (tmp->slaying);
255	tmp->value = 0;	260	tmp->value = 0;
		261
256	for (ab = tmp->above; ab != NULL; ab = ab->above)	262	for (object *ab = tmp->above; ab; ab = ab->above)
257	{	263	{
258	head = ab->head ? ab->head : ab;	264	object *head = ab->head_ ();
		265
259	/* Same note regarding move_type for buttons above apply here. */	266	/* Same note regarding move_type for buttons above apply here. */
260	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)
261	(head->race == tmp->slaying \|\|	270	: (head->race == tmp->slaying
262	((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) \|\|	271	\|\| (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
263	(!strcmp (tmp->slaying, "player") && head->type == PLAYER)))	272	\|\| (tmp->slaying == shstr_player && head->type == PLAYER)))
		273	{
264	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)
265	}	286	{
266	if (tmp->value)	287	object *head = ab->head_ ();
267	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;
268	}	299	}
269	}	300	}
		301
270	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 */
271	op->value = 1;	303	op->value = 1;
272		304
		305	//LOG(llevDebug, "update_button: %s (%d, %d=%d)\n", &op->name, op->count, op->value, old_value);
		306
273	/* If this button hasn't changed, don't do anything */	307	/* If this button hasn't changed, don't do anything */
274	if (op->value != old_value)	308	if (op->value != old_value)
275	{	309	{
276	SET_ANIMATION (op, op->value);	310	SET_ANIMATION (op, op->value);
277	update_object (op, UP_OBJ_FACE);	311	update_object (op, UP_OBJ_FACE);
278	push_button (op); /* Make all other buttons the same */	312	push_button (op, originator); /* Make all other buttons the same */
279	}	313	}
280	}	314	}
281
282	/*
283	* Updates every button on the map (by calling update_button() for them).
284	*/
285		315
286	void	316	void
287	update_buttons (maptile *m)	317	use_trigger (object op, object originator)
288	{	318	{
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	}
309
310	void
311	use_trigger (object *op)
312	{
313
314	/* Toggle value */	319	/* Toggle value */
315	op->value = !op->value;	320	op->value = !op->value;
		321
316	push_button (op);	322	push_button (op, originator);
317	}	323	}
318		324
319	/*	325	/*
320	* Note: animate_object should be used instead of this,	326	* Note: animate_object should be used instead of this,
321	* but it can't handle animations in the 8 directions	327	* but it can't handle animations in the 8 directions
322	*/	328	*/
323
324	void	329	void
325	animate_turning (object op) / only one part objects */	330	animate_turning (object op) / only one part objects */
326	{	331	{
327	if (++op->state >= NUM_ANIMATIONS (op) / 8)	332	if (++op->state >= NUM_ANIMATIONS (op) / 8)
328	op->state = 0;	333	op->state = 0;
…		…
341	*	346	*
342	* 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
343	* 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
344	* objects on the same space that take the same sacrifice.	349	* objects on the same space that take the same sacrifice.
345	*/	350	*/
346
347	int	351	int
348	check_altar_sacrifice (const object altar, const object sacrifice)	352	check_altar_sacrifice (object altar, object sacrifice, object *originator)
349	{	353	{
350	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)
351	{	363	{
352	if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name \|\|	364	if (ARCH_SACRIFICE (altar) == shstr_money
353	ARCH_SACRIFICE (altar) == sacrifice->name \|\|	365	&& sacrifice->type == MONEY
354	ARCH_SACRIFICE (altar) == sacrifice->slaying \|\|	366	&& 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;	367	return 1;
358		368
359	if (strcmp (ARCH_SACRIFICE (altar), "money") == 0	369	if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
360	&& 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 ())
361	return 1;	374	return 1;
362	}	375	}
363		376
364	return 0;	377	return 0;
365	}	378	}
…		…
372	*	385	*
373	* 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
374	* 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.
375	*/	388	*/
376	int	389	int
377	operate_altar (object altar, object *sacrifice)	390	operate_altar (object altar, object sacrifice, object originator)
378	{	391	{
379	if (!altar->map)	392	if (!altar->map)
380	{	393	{
381	LOG (llevError, "BUG: operate_altar(): altar has no map\n");	394	LOG (llevError, "BUG: operate_altar(): altar has no map\n");
382	return 0;	395	return 0;
383	}	396	}
384		397
385	if (!altar->slaying \|\| altar->value)	398	if (!altar->slaying \|\| altar->value)
386	return 0;	399	return 0;
387		400
388	if (!check_altar_sacrifice (altar, *sacrifice))	401	if (!check_altar_sacrifice (altar, *sacrifice, originator))
389	return 0;	402	return 0;
390		403
391	/* check_altar_sacrifice should have already verified that enough money	404	/* check_altar_sacrifice should have already verified that enough money
392	* has been dropped.	405	* has been dropped.
393	*/	406	*/
394	if (!strcmp (ARCH_SACRIFICE (altar), "money"))	407	if (ARCH_SACRIFICE (altar) == shstr_money)
395	{	408	{
396	int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;	409	int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
397		410
398	/* Round up any sacrifices. Altars don't make change either */	411	/* Round up any sacrifices. Altars don't make change either */
399	if (NROF_SACRIFICE (altar) % (*sacrifice)->value)	412	if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
400	number++;	413	number++;
401		414
402	sacrifice = decrease_ob_nr (sacrifice, number);	415	if (!(*sacrifice)->decrease (number))
		416	*sacrifice = 0;
403	}	417	}
404	else	418	else
405	sacrifice = decrease_ob_nr (sacrifice, NROF_SACRIFICE (altar));	419	if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar)))
		420	*sacrifice = 0;
406		421
407	if (altar->msg)	422	if (altar->msg)
408	new_info_map (NDI_BLACK, altar->map, altar->msg);	423	new_info_map (NDI_BLACK, altar->map, altar->msg);
409		424
410	return 1;	425	return 1;
411	}	426	}
412		427
413	void	428	static void
414	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 */
415	{	430	{
416	op->stats.wc = state;	431	op->stats.wc = state;
		432
417	if (state)	433	if (state)
418	{	434	{
419	use_trigger (op);	435	use_trigger (op, originator);
420	if (op->stats.exp > 0) /* check sanity */	436	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;	437	op->speed_left = -1;
426	}	438	}
427	else	439	else
428	{	440	{
429	use_trigger (op);	441	use_trigger (op, originator);
430	op->speed = 0;	442	op->set_speed (0);
431	update_ob_speed (op);
432	}	443	}
433	}	444	}
434		445
435		446
436	/*	447	/*
…		…
444	* TRIGGER: Returns 1 if handle could be moved, 0 if not.	455	* TRIGGER: Returns 1 if handle could be moved, 0 if not.
445	*	456	*
446	* TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.	457	* TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
447	*/	458	*/
448	int	459	int
449	check_trigger (object op, object cause)	460	check_trigger (object op, object cause, object *originator)
450	{	461	{
451	object *tmp;	462	object *tmp;
452	int push = 0, tot = 0;	463	int push = 0, tot = 0;
453	int in_movement = op->stats.wc \|\| op->speed;	464	int in_movement = op->stats.wc \|\| op->has_active_speed ();
454		465
455	switch (op->type)	466	switch (op->type)
456	{	467	{
457	case TRIGGER_BUTTON:	468	case TRIGGER_BUTTON:
458	if (op->weight > 0)	469	if (op->weight > 0)
459	{	470	{
460	if (cause)	471	if (cause)
461	{	472	{
462	for (tmp = op->above; tmp; tmp = tmp->above)	473	for (tmp = op->above; tmp; tmp = tmp->above)
463	/* Comment reproduced from update_buttons(): */	474	/* Comment reproduced from update_buttons(): */
464	/* Basically, if the move_type matches that on what the	475	/* Basically, if the move_type matches that on what the
465	* button wants, we count it. The second check is so that	476	* button wants, we count it. The second check is so that
466	* objects that don't move (swords, etc) will count. Note that	477	* objects that don't move (swords, etc) will count. Note that
467	* this means that more work is needed to make buttons	478	* this means that more work is needed to make buttons
468	* 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":
469	*/	567	*/
470		568	op->value = !op->value;
471	if ((tmp->move_type & op->move_on) \|\| tmp->move_type == 0)	569	trigger_move (op, 1, cause);
472	{	570	op->last_sp = -op->last_sp;
473	tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1) + tmp->carrying;	571	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	}	572	}
485	if (in_movement \|\| !push)	573
486	return 0;	574	return cause == NULL;
487	}	575	}
488	trigger_move (op, push);
489	}	576	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;	577	return 0;
509	op->stats.ac = push;	578	}
		579	else
		580	{
510	if (NUM_ANIMATIONS (op) > 1)	581	if (NUM_ANIMATIONS (op) > 1)
511	{	582	{
512	SET_ANIMATION (op, push);	583	SET_ANIMATION (op, 0);
513	update_object (op, UP_OBJ_FACE);	584	update_object (op, UP_OBJ_FACE);
514	}	585	}
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		586
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,	587	/* If trigger_altar has "last_sp > 0" set on the map,
566	* it will push the connected value only once per sacrifice.	588	* it will push the connected value only once per sacrifice.
567	* Otherwise (default), the connected value will be	589	* Otherwise (default), the connected value will be
568	* pushed twice: First by sacrifice, second by reset! -AV	590	* pushed twice: First by sacrifice, second by reset! -AV
569	*/	591	*/
570	if (!op->last_sp)	592	if (!op->last_sp)
571	trigger_move (op, 0);	593	trigger_move (op, 0, cause);
572	else	594	else
573	{	595	{
574	op->stats.wc = 0;	596	op->stats.wc = 0;
575	op->value = !op->value;	597	op->value = !op->value;
576	op->speed = 0;	598	op->set_speed (0);
577	update_ob_speed (op);
578	}	599	}
579	}	600	}
580	return 0;	601	return 0;
581		602
582	case TRIGGER:	603	case TRIGGER:
583	if (cause)	604	if (cause)
584	{	605	{
585	if (in_movement)	606	if (in_movement)
586	return 0;	607	return 0;
		608
587	push = 1;	609	push = 1;
588	}	610	}
		611
589	if (NUM_ANIMATIONS (op) > 1)	612	if (NUM_ANIMATIONS (op) > 1)
590	{	613	{
591	SET_ANIMATION (op, push);	614	SET_ANIMATION (op, push);
592	update_object (op, UP_OBJ_FACE);	615	update_object (op, UP_OBJ_FACE);
593	}	616	}
		617
594	trigger_move (op, push);	618	trigger_move (op, push, cause);
595	return 1;	619	return 1;
596		620
597	default:	621	default:
598	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);
599	return 0;	623	return 0;
600	}	624	}
601	}	625	}
602		626
603	void	627	void
604	add_button_link (object button, maptile map, int connected)	628	object::add_link (maptile *map, shstr_tmp id)
605	{	629	{
606	oblinkpt *obp;
607	objectlink *ol = get_objectlink ();
608
609	if (!map)	630	if (!map)
610	{	631	{
611	LOG (llevError, "Tried to add button-link without map.\n");	632	LOG (llevError, "Tried to add button-link without map.\n");
612	return;	633	return;
613	}	634	}
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		635
618	/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/	636	flag [FLAG_IS_LINKED] = true;
619		637
620	SET_FLAG (button, FLAG_IS_LINKED);	638	objectlink *ol = get_objectlink ();
621
622	ol->ob = button;	639	ol->ob = this;
623		640
624	for (obp = map->buttons; obp && obp->value != connected; obp = obp->next);	641	for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
625		642	if (obp->id == id)
626	if (obp)
627	{	643	{
628	ol->next = obp->link;	644	ol->next = obp->link;
629	obp->link = ol;	645	obp->link = ol;
		646	return;
630	}	647	}
631	else	648
632	{
633	obp = get_objectlinkpt ();	649	oblinkpt *obp = get_objectlinkpt ();
634	obp->value = connected;	650	obp->id = id;
635		651
636	obp->next = map->buttons;	652	obp->next = map->buttons;
637	map->buttons = obp;	653	map->buttons = obp;
638	obp->link = ol;	654	obp->link = ol;
639	}
640	}	655	}
641		656
642	/*	657	/*
643	* 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.
644	* This is only needed by editors.	659	* This is only needed by editors.
645	*/	660	*/
646
647	void	661	void
648	remove_button_link (object *op)	662	object::remove_link ()
649	{	663	{
650	oblinkpt *obp;	664	if (!map)
651	objectlink *olp, ol;
652
653	if (op->map == NULL)
654	{	665	{
655	LOG (llevError, "remove_button_link() in object without map.\n");	666	LOG (llevError, "remove_button_link() in object without map.\n");
656	return;	667	return;
657	}	668	}
658		669
659	if (!QUERY_FLAG (op, FLAG_IS_LINKED))	670	if (!flag [FLAG_IS_LINKED])
660	{	671	{
661	LOG (llevError, "remove_button_linked() in unlinked object.\n");	672	LOG (llevError, "remove_button_linked() in unlinked object.\n");
662	return;	673	return;
663	}	674	}
664		675
		676	flag [FLAG_IS_LINKED] = false;
		677
665	for (obp = op->map->buttons; obp; obp = obp->next)	678	for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
666	for (olp = &obp->link; (ol = *olp); olp = &ol->next)	679	for (objectlink *olp = &obp->link; olp; olp = &(*olp)->next)
667	if (ol->ob == op)	680	if ((*olp)->ob == this)
668	{	681	{
669		682	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;	683	*olp = ol->next;
674	delete ol;	684	delete ol;
675	return;	685	return;
676	}	686	}
677		687
678	LOG (llevError, "remove_button_linked(): couldn't find object.\n");	688	LOG (llevError, "remove_button_linked(): couldn't find object.\n");
679	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	}
680	}	713	}
681		714
682	/*	715	/*
683	* Gets the objectlink for this connection from the map.	716	* Gets the objectlink for this connection from the map.
684	*/	717	*/
685	oblinkpt *	718	oblinkpt *
686	get_connection_links (maptile *map, long connection)	719	maptile::find_link (shstr_tmp id)
687	{	720	{
688	for (oblinkpt * obp = map->buttons; obp; obp = obp->next)	721	for (oblinkpt *obp = buttons; obp; obp = obp->next)
689	if (obp->value == connection)	722	if (obp->id == id)
690	return obp;	723	return obp;
691		724
692	return 0;	725	return 0;
693	}	726	}
694		727
695	/*	728	/*
696	* Return the first objectlink in the objects linked to this one	729	* Return the first objectlink in the objects linked to this one
697	*/	730	*/
698
699	oblinkpt *	731	oblinkpt *
700	get_button_links (const object *button)	732	object::find_link () const
701	{	733	{
702	oblinkpt *obp;	734	if (map)
703	objectlink *ol;
704
705	if (!button->map)
706	return NULL;
707
708	for (obp = button->map->buttons; obp; obp = obp->next)	735	for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
709	for (ol = obp->link; ol; ol = ol->next)	736	for (objectlink *ol = obp->link; ol; ol = ol->next)
710	if (ol->ob == button)	737	if (ol->ob == this)
711	return obp;	738	return obp;
712		739
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;	740	return 0;
733	}	741	}
734		742
735	/* This routine makes monsters who are	743	/* This routine makes monsters who are
736	* standing on the 'mood floor' change their	744	* standing on the 'mood floor' change their
…		…
738	* If floor is to be triggered must have	746	* If floor is to be triggered must have
739	* a speed of zero (default is 1 for all	747	* a speed of zero (default is 1 for all
740	* but the charm floor type).	748	* but the charm floor type).
741	* by b.t. thomas@nomad.astro.psu.edu	749	* by b.t. thomas@nomad.astro.psu.edu
742	*/	750	*/
743
744	void	751	void
745	do_mood_floor (object op, object source)	752	do_mood_floor (object op, object source)
746	{	753	{
747	object *tmp;
748	object *tmp2;
749
750	if (!source)	754	if (!source)
751	source = op;	755	source = op;
752		756
753	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)
754	if (QUERY_FLAG (tmp, FLAG_MONSTER))	765	if (QUERY_FLAG (tmp, FLAG_MONSTER))
755	break;	766	break;
756		767
757	/* 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
758	* be a monster here.	769	* be a monster here.
759	*/	770	*/
		771	//TODO: have players really FLAG_MONSTER? kept it for safety
760	if (!tmp \|\| tmp->type == PLAYER)	772	if (!tmp \|\| tmp->type == PLAYER)
761	return;	773	return;
762		774
763	switch (op->last_sp)	775	switch (op->last_sp)
764	{	776	{
765	case 0: /* furious--make all monsters mad */	777	case 0: /* furious--make all monsters mad */
766	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	778	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
767	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);	779	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
		780
768	if (QUERY_FLAG (tmp, FLAG_FRIENDLY))	781	if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
769	{	782	{
770	CLEAR_FLAG (tmp, FLAG_FRIENDLY);
771	remove_friendly_object (tmp);
772	tmp->attack_movement = 0;	783	tmp->attack_movement = 0;
773	/* 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
774	* dereference a null value	785	* dereference a null value
775	*/	786	*/
776	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)
777	tmp->owner->contr->ranges[range_golem] = 0;	791	tmp->owner->contr->golem = 0;
778		792
779	tmp->owner = 0;	793	tmp->owner = 0;
		794
		795	remove_friendly_object (tmp);
780	}	796	}
781	break;	797	break;
		798
782	case 1: /* angry -- get neutral monsters mad */	799	case 1: /* angry -- get neutral monsters mad */
783	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))	800	if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
784	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);	801	CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
785	break;	802	break;
		803
786	case 2: /* calm -- pacify unfriendly monsters */	804	case 2: /* calm -- pacify unfriendly monsters */
787	if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
788	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);	805	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
789	break;	806	break;
		807
790	case 3: /* make all monsters fall asleep */	808	case 3: /* make all monsters fall asleep */
791	if (!QUERY_FLAG (tmp, FLAG_SLEEP))
792	SET_FLAG (tmp, FLAG_SLEEP);	809	SET_FLAG (tmp, FLAG_SLEEP);
793	break;	810	break;
		811
794	case 4: /* charm all monsters */	812	case 4: /* charm all monsters */
795	if (op == source)	813	if (op == source)
796	break; /* only if 'connected' */	814	break; /* only if 'connected' */
797		815
798	for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */	816	if (object *pl = source->ms ().player ())
799	tmp2->type != PLAYER; tmp2 = tmp2->above)	817	{
800	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	}
801	break;	826	break;
802		827
803	if (tmp2->type != PLAYER)	828	case 6: // kill monsters
		829	if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
804	break;	830	break;
805		831
806	tmp->set_owner (tmp2);	832	// FALL THROUGH
807	SET_FLAG (tmp, FLAG_MONSTER);	833	case 5: // kill all alives
808		834	if (!tmp->flag [FLAG_PRECIOUS])
809	tmp->stats.exp = 0;	835	{
810	SET_FLAG (tmp, FLAG_FRIENDLY);	836	archetype::get (shstr_burnout)->insert_at (tmp, source);
811		837	tmp->destroy ();
812	add_friendly_object (tmp);	838	}
813	tmp->attack_movement = PETMOVE;
814	break;	839	break;
815		840
816	default:	841	default:
817	break;	842	break;
818	}	843	}
…		…
830	object tmp, ret = NULL;	855	object tmp, ret = NULL;
831		856
832	/* First check the object itself. */	857	/* First check the object itself. */
833	if ((trig->stats.hp && (op->type == trig->stats.hp))	858	if ((trig->stats.hp && (op->type == trig->stats.hp))
834	\|\| (trig->slaying && (op->slaying == trig->slaying))	859	\|\| (trig->slaying && (op->slaying == trig->slaying))
835	\|\| (trig->race && (op->arch->name == trig->race)))	860	\|\| (trig->race && (op->arch->archname == trig->race)))
836	return op;	861	return op;
837		862
838	for (tmp = op->inv; tmp; tmp = tmp->below)	863	for (tmp = op->inv; tmp; tmp = tmp->below)
839	{	864	{
840	if (tmp->inv)	865	if (tmp->inv)
…		…
843	if (ret)	868	if (ret)
844	return ret;	869	return ret;
845	}	870	}
846	else if ((trig->stats.hp && (tmp->type == trig->stats.hp))	871	else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
847	\|\| (trig->slaying && (tmp->slaying == trig->slaying))	872	\|\| (trig->slaying && (tmp->slaying == trig->slaying))
848	\|\| (trig->race && (tmp->arch->name == trig->race)))	873	\|\| (trig->race && (tmp->arch->archname == trig->race)))
849	return tmp;	874	return tmp;
850	}	875	}
851	return NULL;	876	return NULL;
852	}	877	}
853		878
…		…
866	* 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
867	* 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
868	* 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
869	* state in the inventory checker. This won't happen anymore now.	894	* state in the inventory checker. This won't happen anymore now.
870	*	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	*
871	*/	902	*/
872	void	903	void
873	check_inv (object op, object trig)	904	check_inv (object op, object trig)
874	{	905	{
875	trig->value = 0; // deactivate if none of the following conditions apply	906	trig->value = 0; // deactivate if none of the following conditions apply
876		907
877	if (object *pl = trig->ms ().player ())	908	object *pl = trig->ms ().player ();
878	{
879	object *match = check_inv_recursive (pl, trig);	909	object *match = check_inv_recursive (op, trig);
880		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
881	if (match && trig->last_sp) // match == having	918	if (match && trig->last_sp) // match == having
882	{	919	{
883	if (trig->last_heal)	920	if (trig->last_heal)
884	decrease_ob (match);	921	match->decrease ();
885		922
886	trig->value = 1;	923	trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
887	}	924	push_button (trig, op);
		925	}
888	else if (!match && !trig->last_sp) // match == not having	926	else if (!match && !trig->last_sp) // match == not having
889	trig->value = 1;
890	}	927	{
891		928	trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
892	push_button (trig);	929	push_button (trig, op);
		930	}
893	}	931	}
894		932

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.18 by root, Thu Dec 21 01:33:49 2006 UTC vs. Revision 1.64 by root, Fri Mar 26 00:59:20 2010 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.18 by root, Thu Dec 21 01:33:49 2006 UTC vs.
Revision 1.64 by root, Fri Mar 26 00:59:20 2010 UTC