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

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

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.11 by root, Sat Sep 16 22:24:12 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.11 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.63 by root, Tue Nov 10 20:57:56 2009 UTC