ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/time.C

Comparing deliantra/server/server/time.C (file contents):
Revision 1.32 by elmex, Wed Jan 3 00:56:40 2007 UTC vs.
Revision 1.118 by root, Fri Jan 27 22:00:40 2012 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,2010,2011,2012 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	/*	25	/*
25	* Routines that is executed from objects based on their speed have been	26	* Routines that is executed from objects based on their speed have been
26	* collected in this file.	27	* collected in this file.
27	*/	28	*/
28
29	#include <global.h>	29	#include <global.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <sproto.h>	31	#include <sproto.h>
32		32
33	/* The following removes doors. The functions check to see if similar	33	/* The following removes doors. The functions check to see if similar
34	* doors are next to the one that is being removed, and if so, set it	34	* doors are next to the one that is being removed, and if so, set it
35	* so those will be removed shortly (in a cascade like fashion.)	35	* so those will be removed shortly (in a cascade like fashion.)
36	*/	36	*/
37
38	void	37	void
39	remove_door (object *op)	38	remove_door (object *op)
40	{	39	{
41	int i;	40	for (int i = 1; i < SIZEOFFREE1 + 1; i += 2)
		41	{
42	object *tmp;	42	object *tmp;
43		43	mapxy pos (op);
44	for (i = 1; i < 9; i += 2)	44	pos.move (i);
45	if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL)	45	if (pos.normalise ()
		46	&& (tmp = present (DOOR, pos.m, pos.x, pos.y)))
46	{	47	{
47	tmp->set_speed (0.1);	48	tmp->set_speed (0.1f);
48	tmp->speed_left = -0.2;	49	tmp->speed_left = -0.2f;
49	}	50	}
		51	}
50		52
51	if (op->other_arch)	53	if (op->other_arch)
52	{	54	{
53	tmp = arch_to_object (op->other_arch);	55	object *tmp = op->other_arch->instance ();
54	tmp->x = op->x;	56	tmp->x = op->x;
55	tmp->y = op->y;	57	tmp->y = op->y;
56	tmp->map = op->map;	58	tmp->map = op->map;
57	tmp->level = op->level;	59	tmp->level = op->level;
58	insert_ob_in_map (tmp, op->map, op, 0);	60	insert_ob_in_map (tmp, op->map, op, 0);
59	}	61	}
60		62
61	op->destroy ();	63	op->drop_and_destroy ();
62	}	64	}
63		65
64	void	66	void
65	remove_door2 (object *op)	67	remove_door2 (object *op)
66	{	68	{
…		…
70	for (i = 1; i < 9; i += 2)	72	for (i = 1; i < 9; i += 2)
71	{	73	{
72	tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);	74	tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);
73	if (tmp && tmp->slaying == op->slaying)	75	if (tmp && tmp->slaying == op->slaying)
74	{ /* same key both doors */	76	{ /* same key both doors */
75	tmp->set_speed (0.1);	77	tmp->set_speed (0.1f);
76	tmp->speed_left = -0.2;	78	tmp->speed_left = -0.2f;
77	}	79	}
78	}	80	}
79		81
80	if (op->other_arch)	82	if (op->other_arch)
81	{	83	{
82	tmp = arch_to_object (op->other_arch);	84	tmp = op->other_arch->instance ();
83	tmp->x = op->x;	85	tmp->x = op->x;
84	tmp->y = op->y;	86	tmp->y = op->y;
85	tmp->map = op->map;	87	tmp->map = op->map;
86	tmp->level = op->level;	88	tmp->level = op->level;
87	insert_ob_in_map (tmp, op->map, op, 0);	89	insert_ob_in_map (tmp, op->map, op, 0);
88	}	90	}
89		91
90	op->destroy ();	92	op->drop_and_destroy ();
91	}	93	}
92		94
93	/* Will generate a monster according to content	95	static void
94	* of generator.
95	*/
96	void
97	generate_monster_inv (object *gen)	96	generate_monster (object *gen)
98	{	97	{
99	int i;
100	object *op, *head = NULL;
101
102	int qty = 0;
103
104	/* Code below assumes the generator is on a map, as it tries
105	* to place the monster on the map. So if the generator
106	* isn't on a map, complain and exit.
107	*/
108	if (gen->map == NULL)
109	{
110	//LOG(llevError,"Generator (%s) not on a map?\n", gen->name);
111	return;
112	}
113	/*First count numer of objects in inv */
114	for (op = gen->inv; op; op = op->below)
115	qty++;
116	if (!qty)
117	{
118	LOG (llevError, "Generator (%s) has no inventory in generate_monster_inv?\n", &gen->name);
119	return; /*No inventory */
120	}
121	qty = rndm (0, qty - 1);
122	for (op = gen->inv; qty; qty--)
123	op = op->below;
124	i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
125	if (i == -1)
126	return;
127	head = object_create_clone (op);
128	CLEAR_FLAG (head, FLAG_IS_A_TEMPLATE);
129	unflag_inv (head, FLAG_IS_A_TEMPLATE);
130	if (rndm (0, 9))
131	generate_artifact (head, gen->map->difficulty);
132	insert_ob_in_map_at (head, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]);
133	if (QUERY_FLAG (head, FLAG_FREED))
134	return;
135	if (head->has_random_items ())
136	create_treasure (head->randomitems, head, GT_APPLY, gen->map->difficulty, 0);
137	}
138
139	void
140	generate_monster_arch (object *gen)
141	{
142	int i;
143	object *op, *head = NULL, *prev = NULL;
144	archetype *at = gen->other_arch;
145
146	if (!gen->other_arch)
147	return;
148
149	/* Code below assumes the generator is on a map, as it tries
150	* to place the monster on the map. So if the generator
151	* isn't on a map, complain and exit.
152	*/
153	if (!gen->map)	98	if (!gen->map)
154	return;	99	return;
155		100
156	i = find_free_spot (&at->clone, gen->map, gen->x, gen->y, 1, 9);	101	if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
157	if (i == -1)
158	return;	102	return;
159		103
160	while (at)	104	// sleeping generators won't generate, this will make monsters like
		105	// centipedes not generate more centipedes when being asleep.
		106	if (gen->flag [FLAG_SLEEP])
		107	return;
		108
		109	object *op;
		110	int dir;
		111
		112	if (gen->flag [FLAG_CONTENT_ON_GEN])
		113	{
		114	// either copy one item from the inventory...
		115	if (!gen->inv)
		116	return;
		117
		118	// first select one item from the inventory
		119	int index = 0;
		120	for (object *tmp = gen->inv; tmp; tmp = tmp->below)
		121	if (!rndm (++index))
		122	op = tmp;
		123
		124	dir = find_free_spot (op, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
		125	if (dir < 0)
		126	return;
		127
		128	op = op->deep_clone ();
		129
		130	op->clr_flag (FLAG_IS_A_TEMPLATE);
		131	unflag_inv (op, FLAG_IS_A_TEMPLATE);
161	{	132	}
162	op = arch_to_object (at);	133	else if (gen->other_arch)
163	op->x = gen->x + freearr_x[i] + at->clone.x;	134	{
164	op->y = gen->y + freearr_y[i] + at->clone.y;	135	// ...or use other_arch
		136	dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
		137	if (dir < 0)
		138	return;
165		139
166	if (head)	140	op = gen->other_arch->instance ();
167	op->head = head, prev->more = op;	141	}
		142	else
		143	return;
168		144
		145	op->expand_tail ();
		146
		147	mapxy pos (gen); pos.move (dir);
		148
		149	if (pos.insert (op, gen))
		150	{
169	if (rndm (0, 9))	151	if (rndm (0, 9))
170	generate_artifact (op, gen->map->difficulty);	152	generate_artifact (op, gen->map->difficulty);
171		153
172	insert_ob_in_map (op, gen->map, gen, 0);
173	if (QUERY_FLAG (op, FLAG_FREED))
174	return;
175
176	if (op->has_random_items ())	154	if (op->has_random_items ())
177	create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty, 0);	155	create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
178		156
179	if (head == NULL)
180	head = op;
181
182	prev = op;
183	at = at->more;
184	}
185	}
186
187	void
188	generate_monster (object *gen)
189	{
190
191	if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
192	return;	157	return;
		158	}
193		159
194	if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))	160	op->destroy ();
195	generate_monster_inv (gen);
196	else
197	generate_monster_arch (gen);
198
199	}	161	}
200		162
201	void	163	static void
202	remove_force (object *op)	164	remove_force (object *op)
203	{	165	{
204	if (--op->duration > 0)	166	if (--op->duration > 0)
205	return;	167	return;
206		168
207	if (op->env)	169	if (op->env)
208	switch (op->subtype)	170	switch (op->subtype)
209	{	171	{
210	case FORCE_CONFUSION:	172	case FORCE_CONFUSION:
211	CLEAR_FLAG (op->env, FLAG_CONFUSED);	173	op->env->clr_flag (FLAG_CONFUSED);
212	new_draw_info (NDI_UNIQUE, 0, op->env, "You regain your senses.\n");	174	new_draw_info (NDI_UNIQUE, 0, op->env, "You regain your senses.\n");
213		175
214	default:	176	default:
215	CLEAR_FLAG (op, FLAG_APPLIED);	177	op->clr_flag (FLAG_APPLIED);
216	change_abil (op->env, op);	178	change_abil (op->env, op);
217	op->env->update_stats ();	179	op->env->update_stats ();
218	}	180	}
219		181
220	op->destroy ();	182	op->destroy ();
221	}	183	}
222		184
223	void	185	static void
224	remove_blindness (object *op)	186	remove_blindness (object *op)
225	{	187	{
226	if (--op->stats.food > 0)	188	if (--op->stats.food > 0)
227	return;	189	return;
228		190
229	CLEAR_FLAG (op, FLAG_APPLIED);	191	op->clr_flag (FLAG_APPLIED);
230		192
231	if (op->env)	193	if (op->env)
232	{	194	{
233	change_abil (op->env, op);	195	change_abil (op->env, op);
234	op->env->update_stats ();	196	op->env->update_stats ();
235	}	197	}
236		198
237	op->destroy ();	199	op->destroy ();
238	}	200	}
239		201
240	void	202	static void
241	poison_more (object *op)	203	poison_more (object *op)
242	{	204	{
243	if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0)	205	if (op->env == NULL || !op->env->flag [FLAG_ALIVE] || op->env->stats.hp < 0)
244	{	206	{
245	op->destroy ();	207	op->destroy ();
246	return;	208	return;
247	}	209	}
248		210
249	if (op->stats.food == 1)	211	if (op->stats.food == 1)
250	{	212	{
251	/* need to remove the object before fix_player is called, else fix_player	213	/* need to unapply the object before update_stats is called, else fix_player
252	* will not do anything.	214	* will not do anything.
253	*/	215	*/
254	if (op->env->type == PLAYER)	216	if (op->env->type == PLAYER)
255	{	217	{
256	CLEAR_FLAG (op, FLAG_APPLIED);	218	op->clr_flag (FLAG_APPLIED);
257	op->env->update_stats ();	219	op->env->update_stats ();
258	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");	220	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");
259	}	221	}
260		222
261	op->destroy ();	223	op->destroy ();
…		…
270		232
271	hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);	233	hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);
272	}	234	}
273		235
274		236
275	void	237	static void
276	move_gate (object *op)	238	move_gate (object *op)
277	{ /* 1 = going down, 0 = goind up */	239	{ /* 1 = going down, 0 = going up */
278	object *tmp;	240	object *tmp;
279		241
280	if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op))	242	if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op))
281	{	243	{
282	LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op));	244	LOG (llevError, "%s: gate error: animation was %d, max=%d\n", op->debug_desc (), op->stats.wc, NUM_ANIMATIONS (op));
283	op->stats.wc = 0;	245	op->stats.wc = 0;
284	}	246	}
285		247
286	/* We're going down */	248	/* We're going down */
287	if (op->value)	249	if (op->value)
288	{	250	{
289	if (--op->stats.wc <= 0)	251	if (--op->stats.wc <= 0)
290	{ /* Reached bottom, let's stop */	252	{ /* Reached bottom, let's stop */
291	op->stats.wc = 0;	253	op->stats.wc = 0;
292	if (op->arch->clone.speed)	254	if (op->arch->has_active_speed ())
293	op->value = 0;	255	op->value = 0;
294	else	256	else
295	op->set_speed (0);	257	op->set_speed (0);
296	}	258	}
297		259
298	if ((int) op->stats.wc < (NUM_ANIMATIONS (op) / 2 + 1))	260	if ((int) op->stats.wc < (NUM_ANIMATIONS (op) / 2 + 1))
299	{	261	{
300	op->move_block = 0;	262	op->move_block = 0;
301	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);	263	op->clr_flag (FLAG_BLOCKSVIEW);
302	update_all_los (op->map, op->x, op->y);	264	update_all_los (op->map, op->x, op->y);
303	}	265	}
304		266
305	SET_ANIMATION (op, op->stats.wc);	267	SET_ANIMATION (op, op->stats.wc);
306	update_object (op, UP_OBJ_CHANGE);	268	update_object (op, UP_OBJ_CHANGE);
…		…
310	/* We're going up */	272	/* We're going up */
311		273
312	/* First, lets see if we are already at the top */	274	/* First, lets see if we are already at the top */
313	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))	275	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))
314	{	276	{
315
316	/* Check to make sure that only non pickable and non rollable	277	/* Check to make sure that only non pickable and non rollable
317	* objects are above the gate. If so, we finish closing the gate,	278	* objects are above the gate. If so, we finish closing the gate,
318	* otherwise, we fall through to the code below which should lower	279	* otherwise, we fall through to the code below which should lower
319	* the gate slightly.	280	* the gate slightly.
320	*/	281	*/
321		282
322	for (tmp = op->above; tmp != NULL; tmp = tmp->above)	283	for (tmp = op->above; tmp; tmp = tmp->above)
323	if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))	284	if (!tmp->flag [FLAG_NO_PICK] || tmp->flag [FLAG_CAN_ROLL] || tmp->flag [FLAG_ALIVE])
324	break;	285	break;
325		286
326	if (tmp == NULL)	287	if (!tmp)
327	{	288	{
328	if (op->arch->clone.speed)	289	if (op->arch->has_active_speed ())
329	op->value = 1;	290	op->value = 1;
330	else	291	else
331	op->set_speed (0);	292	op->set_speed (0);
332		293
333	return;	294	return;
…		…
344	}	305	}
345	else	306	else
346	{ /* The gate is still going up */	307	{ /* The gate is still going up */
347	op->stats.wc++;	308	op->stats.wc++;
348		309
349	if ((int) op->stats.wc >= (NUM_ANIMATIONS (op)))	310	if (op->stats.wc >= NUM_ANIMATIONS (op))
350	op->stats.wc = (signed char) NUM_ANIMATIONS (op) - 1;	311	op->stats.wc = NUM_ANIMATIONS (op) - 1;
351		312
352	/* If there is something on top of the gate, we try to roll it off.	313	/* If there is something on top of the gate, we try to roll it off.
353	* If a player/monster, we don't roll, we just hit them with damage	314	* If a player/monster, we don't roll, we just hit them with damage
354	*/	315	*/
355	if ((int) op->stats.wc >= NUM_ANIMATIONS (op) / 2)	316	if (op->stats.wc >= NUM_ANIMATIONS (op) / 2)
356	{	317	{
357	/* Halfway or further, check blocks */	318	/* Halfway or further, check blocks */
358	/* First, get the top object on the square. */	319	/* First, get the top object on the square. */
359	for (tmp = op->above; tmp != NULL && tmp->above != NULL; tmp = tmp->above);	320	for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)
360
361	if (tmp != NULL)
362	{	321	;
363	if (QUERY_FLAG (tmp, FLAG_ALIVE))	322
		323	if (tmp)
		324	{
		325	if (tmp->flag [FLAG_ALIVE])
364	{	326	{
365	hit_player (tmp, random_roll (1, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);	327	hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
		328	op->play_sound (sound_find ("blocked_gate"));
		329
366	if (tmp->type == PLAYER)	330	if (tmp->type == PLAYER)
367	new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);	331	new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);
368	}	332	}
369	else
370	/* If the object is not alive, and the object either can	333	/* If the object is not alive, and the object either can
371	* be picked up or the object rolls, move the object	334	* be picked up or the object rolls, move the object
372	* off the gate.	335	* off the gate.
373	*/	336	*/
374	if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL)))	337	else if (!tmp->flag [FLAG_ALIVE] && (!tmp->flag [FLAG_NO_PICK] || tmp->flag [FLAG_CAN_ROLL]))
375	{	338	{
376	/* If it has speed, it should move itself, otherwise: */	339	/* If it has speed, it should move itself, otherwise: */
377	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);	340	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
378		341
379	/* If there is a free spot, move the object someplace */	342	/* If there is a free spot, move the object someplace */
380	if (i != -1)	343	if (i > 0)
381	{	344	{
		345	mapxy pos (tmp);
		346	pos.move (i);
		347	if (pos.normalise ())
382	tmp->remove ();	348	tmp->move_to (pos);
383	tmp->x += freearr_x[i], tmp->y += freearr_y[i];
384	insert_ob_in_map (tmp, op->map, op, 0);
385	}	349	}
386	}	350	}
387	}	351	}
388		352
389	/* See if there is still anything blocking the gate */	353	/* See if there is still anything blocking the gate */
390	for (tmp = op->above; tmp != NULL; tmp = tmp->above)	354	for (tmp = op->above; tmp; tmp = tmp->above)
391	if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))	355	if (!tmp->flag [FLAG_NO_PICK] || tmp->flag [FLAG_CAN_ROLL] || tmp->flag [FLAG_ALIVE])
392	break;	356	break;
393		357
394	/* IF there is, start putting the gate down */	358	/* IF there is, start putting the gate down */
395	if (tmp)	359	if (tmp)
396	{
397	op->stats.food = 1;	360	op->stats.food = 1;
398	}
399	else	361	else
400	{	362	{
401	op->move_block = MOVE_ALL;	363	op->move_block = MOVE_ALL;
		364
402	if (!op->arch->clone.stats.ac)	365	if (!op->arch->stats.ac)
403	SET_FLAG (op, FLAG_BLOCKSVIEW);	366	op->set_flag (FLAG_BLOCKSVIEW);
404	update_all_los (op->map, op->x, op->y);	367	update_all_los (op->map, op->x, op->y);
405	}	368	}
406	} /* gate is halfway up */	369	} /* gate is halfway up */
407		370
408	SET_ANIMATION (op, op->stats.wc);	371	SET_ANIMATION (op, op->stats.wc);
…		…
412		375
413	/* hp : how long door is open/closed	376	/* hp : how long door is open/closed
414	* maxhp : initial value for hp	377	* maxhp : initial value for hp
415	* sp : 1 = open, 0 = close	378	* sp : 1 = open, 0 = close
416	*/	379	*/
417	void	380	static void
418	move_timed_gate (object *op)	381	move_timed_gate (object *op)
419	{	382	{
420	int v = op->value;	383	int v = op->value;
421		384
422	if (op->stats.sp)	385	if (op->stats.sp)
423	{	386	{
424	move_gate (op);	387	move_gate (op);
		388
425	if (op->value != v) /* change direction ? */	389	if (op->value != v) /* change direction ? */
426	op->stats.sp = 0;	390	op->stats.sp = 0;
427	return;	391	return;
428	}	392	}
		393
429	if (--op->stats.hp <= 0)	394	if (--op->stats.hp <= 0)
430	{ /* keep gate down */	395	{ /* keep gate down */
431	move_gate (op);	396	move_gate (op);
		397
432	if (op->value != v)	398	if (op->value != v)
433	op->set_speed (0);	399	op->set_speed (0);
434	}	400	}
435	}	401	}
436		402
…		…
438	* speed: frequency of 'glances'	404	* speed: frequency of 'glances'
439	* connected: connected value of detector	405	* connected: connected value of detector
440	* sp: 1 if detection sets buttons	406	* sp: 1 if detection sets buttons
441	* -1 if detection unsets buttons	407	* -1 if detection unsets buttons
442	*/	408	*/
443		409	static void
444	void
445	move_detector (object *op)	410	move_detector (object *op)
446	{	411	{
447	object *tmp;	412	object *tmp;
448	int last = op->value;	413	int last = op->value;
449	int detected;	414	int detected;
450		415
451	detected = 0;	416	detected = 0;
452		417
453	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above)	418	for (tmp = op->ms ().bot; tmp && !detected; tmp = tmp->above)
454	{	419	{
455	object *tmp2;	420	object *tmp2;
456		421
457	if (op->stats.hp)	422	if (op->stats.hp)
458	{	423	{
459	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)	424	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
460	{	425	{
461	if (op->slaying && !strcmp (op->slaying, tmp->name))	426	if (op->slaying && op->slaying == tmp->name)
462	detected = 1;	427	detected = 1;
		428
463	if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->slaying))	429	if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
464	detected = 1;	430	detected = 1;
465	}	431	}
466	}	432	}
		433
467	if (op->slaying && !strcmp (op->slaying, tmp->name))	434	if (op->slaying && op->slaying == tmp->name)
468	{
469	detected = 1;	435	detected = 1;
470	}
471	else if (tmp->type == SPECIAL_KEY && tmp->slaying == op->slaying)	436	else if (tmp->type == SPECIAL_KEY && tmp->slaying == op->slaying)
472	detected = 1;	437	detected = 1;
473	}	438	}
474		439
475	/* the detector sets the button if detection is found */	440	/* the detector sets the button if detection is found */
476	if (op->stats.sp == 1)	441	if (op->stats.sp == 1)
477	{	442	{
478	if (detected && last == 0)	443	if (detected && last == 0)
479	{	444	{
480	op->value = 1;	445	op->value = 1;
481	push_button (op);	446	push_button (op, tmp);
482	}	447	}
		448
483	if (!detected && last == 1)	449	if (!detected && last == 1)
484	{	450	{
485	op->value = 0;	451	op->value = 0;
486	push_button (op);	452	push_button (op, tmp);
487	}	453	}
488	}	454	}
489	else	455	else
490	{ /* in this case, we unset buttons */	456	{ /* in this case, we unset buttons */
491	if (detected && last == 1)	457	if (detected && last == 1)
492	{	458	{
493	op->value = 0;	459	op->value = 0;
494	push_button (op);	460	push_button (op, tmp);
495	}	461	}
		462
496	if (!detected && last == 0)	463	if (!detected && last == 0)
497	{	464	{
498	op->value = 1;	465	op->value = 1;
499	push_button (op);	466	push_button (op, tmp);
500	}	467	}
501	}	468	}
502	}	469	}
503
504		470
505	void	471	void
506	animate_trigger (object *op)	472	animate_trigger (object *op)
507	{	473	{
508	if ((unsigned char) ++op->stats.wc >= NUM_ANIMATIONS (op))	474	if ((unsigned char) ++op->stats.wc >= NUM_ANIMATIONS (op))
…		…
515	SET_ANIMATION (op, op->stats.wc);	481	SET_ANIMATION (op, op->stats.wc);
516	update_object (op, UP_OBJ_FACE);	482	update_object (op, UP_OBJ_FACE);
517	}	483	}
518	}	484	}
519		485
520	void	486	static void
521	move_hole (object *op)	487	move_hole (object *op)
522	{ /* 1 = opening, 0 = closing */	488	{ /* 1 = opening, 0 = closing */
523	object *next, *tmp;
524
525	if (op->value)	489	if (op->value)
526	{ /* We're opening */	490	{ /* We're opening */
527	if (--op->stats.wc <= 0)	491	if (--op->stats.wc <= 0)
528	{ /* Opened, let's stop */	492	{ /* Opened, let's stop */
529	op->stats.wc = 0;	493	op->stats.wc = 0;
530	op->set_speed (0);	494	op->set_speed (0);
531		495
532	/* Hard coding this makes sense for holes I suppose */	496	/* Hard coding this makes sense for holes I suppose */
533	op->move_on = MOVE_WALK;	497	op->move_on = MOVE_WALK;
534	for (tmp = op->above; tmp != NULL; tmp = next)	498	for (object *next, *tmp = op->above; tmp; tmp = next)
535	{	499	{
536	next = tmp->above;	500	next = tmp->above;
537	move_apply (op, tmp, tmp);	501	move_apply (op, tmp, tmp);
538	}	502	}
539	}	503	}
540		504
541	SET_ANIMATION (op, op->stats.wc);	505	SET_ANIMATION (op, op->stats.wc);
542	update_object (op, UP_OBJ_FACE);	506	update_object (op, UP_OBJ_CHANGE);
543	return;	507	return;
544	}	508	}
		509
545	/* We're closing */	510	/* We're closing */
546	op->move_on = 0;	511	op->move_on = 0;
547		512
548	op->stats.wc++;	513	op->stats.wc++;
549	if ((int) op->stats.wc >= NUM_ANIMATIONS (op))	514	if (op->stats.wc >= NUM_ANIMATIONS (op))
550	op->stats.wc = NUM_ANIMATIONS (op) - 1;	515	op->stats.wc = NUM_ANIMATIONS (op) - 1;
551		516
552	SET_ANIMATION (op, op->stats.wc);	517	SET_ANIMATION (op, op->stats.wc);
553	update_object (op, UP_OBJ_FACE);	518	update_object (op, UP_OBJ_CHANGE);
554	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))	519	if (op->stats.wc == (NUM_ANIMATIONS (op) - 1))
555	op->set_speed (0); /* closed, let's stop */	520	op->set_speed (0); /* closed, let's stop */
556	}	521	}
557		522
558		523
559	/* stop_item() returns a pointer to the stopped object. The stopped object	524	/* stop_item() returns a pointer to the stopped object. The stopped object
…		…
580	{	545	{
581	object *payload = op->inv;	546	object *payload = op->inv;
582		547
583	if (payload == NULL)	548	if (payload == NULL)
584	return NULL;	549	return NULL;
		550
585	payload->remove ();	551	payload->remove ();
586	op->destroy ();	552	op->destroy ();
587	return payload;	553	return payload;
588	}	554	}
589		555
…		…
605	void	571	void
606	fix_stopped_item (object *op, maptile *map, object *originator)	572	fix_stopped_item (object *op, maptile *map, object *originator)
607	{	573	{
608	if (map == NULL)	574	if (map == NULL)
609	return;	575	return;
610	if (QUERY_FLAG (op, FLAG_REMOVED))	576
		577	if (op->flag [FLAG_REMOVED])
611	insert_ob_in_map (op, map, originator, 0);	578	insert_ob_in_map (op, map, originator, 0);
612	else if (op->type == ARROW)	579	else if (op->type == ARROW)
613	merge_ob (op, NULL); /* only some arrows actually need this */	580	merge_ob (op, NULL); /* only some arrows actually need this */
614	}	581	}
615		582
616
617	object *	583	object *
618	fix_stopped_arrow (object *op)	584	fix_stopped_arrow (object *op)
619	{	585	{
620	if (rndm (0, 99) < op->stats.food)	586	if (rndm (0, 99) < op->stats.food)
621	{	587	{
…		…
624	return NULL;	590	return NULL;
625	}	591	}
626		592
627	op->set_speed (0);	593	op->set_speed (0);
628	op->direction = 0;	594	op->direction = 0;
629	op->move_on = 0;	595	op->move_on = 0;
630	op->move_type = 0;	596	op->move_type = 0;
		597	op->skill = 0; // really?
		598
		599	// restore original wc, dam, attacktype and slaying
631	op->stats.wc = op->stats.sp;	600	op->stats.wc = op->stats.sp;
632	op->stats.dam = op->stats.hp;	601	op->stats.dam = op->stats.hp;
633	op->attacktype = op->stats.grace;	602	op->attacktype = op->stats.grace;
634	op->slaying = 0;	603	op->slaying = op->custom_name;
635	op->skill = 0;
636		604
637	if (op->spellarg != NULL)
638	{
639	op->slaying = op->spellarg;
640	free (op->spellarg);
641	op->spellarg = NULL;
642	}
643	else
644	op->slaying = NULL;
645
646	/* Reset these to zero, so that object::can_merge will work properly */	605	/* Reset these to defaults, so that object::can_merge will work properly */
647	op->spellarg = NULL;	606	op->custom_name = 0;
648	op->stats.sp = 0;	607	op->stats.sp = 0;
649	op->stats.hp = 0;	608	op->stats.hp = 0;
650	op->stats.grace = 0;	609	op->stats.grace = 0;
651	op->level = 0;	610	op->level = 0;
652	op->face = op->arch->clone.face;	611	op->face = op->arch->face;
653	op->owner = NULL; /* So that stopped arrows will be saved */	612	op->owner = 0;
		613
654	update_object (op, UP_OBJ_FACE);	614	update_object (op, UP_OBJ_CHANGE);
		615
655	return op;	616	return op;
656	}	617	}
657		618
658	/* stop_arrow() - what to do when a non-living flying object	619	/* stop_arrow() - what to do when a non-living flying object
659	* has to stop. Sept 96 - I added in thrown object code in	620	* has to stop. Sept 96 - I added in thrown object code in
…		…
668	if (INVOKE_OBJECT (STOP, op))	629	if (INVOKE_OBJECT (STOP, op))
669	return;	630	return;
670		631
671	if (op->inv)	632	if (op->inv)
672	{	633	{
		634	// replace this by straightforward drop to ground?
673	object *payload = op->inv;	635	object *payload = op->inv;
674		636
675	payload->remove ();
676	payload->owner = 0;	637	payload->owner = 0;
677	insert_ob_in_map (payload, op->map, payload, 0);	638	insert_ob_in_map (payload, op->map, payload, 0);
678	op->destroy ();	639	op->destroy ();
679	}	640	}
680	else	641	else
681	{	642	{
682	op = fix_stopped_arrow (op);	643	op = fix_stopped_arrow (op);
		644
683	if (op)	645	if (op)
684	merge_ob (op, NULL);	646	merge_ob (op, 0);
685	}	647	}
686	}	648	}
687		649
688	/* Move an arrow along its course. op is the arrow or thrown object.	650	/* Move an arrow or throwen_obj along its course. op is the arrow or thrown object.
689	*/	651	*/
690
691	void	652	void
692	move_arrow (object *op)	653	move_arrow (object *op)
693	{	654	{
694	object *tmp;
695	sint16 new_x, new_y;
696	int was_reflected, mflags;	655	int was_reflected;
697	maptile *m;
698		656
699	if (op->map == NULL)	657	if (!op->map)
700	{	658	{
701	LOG (llevError, "BUG: Arrow had no map.\n");	659	LOG (llevError | logBacktrace, "BUG: Arrow %s had no map.\n", op->debug_desc ());
702	op->destroy ();	660	op->destroy ();
703	return;	661	return;
704	}	662	}
705		663
706	/* we need to stop thrown objects at some point. Like here. */	664	/* we need to stop thrown objects at some point. Like here. */
…		…
712	* is if the player throws a bomb - the bomb explodes on its own,	670	* is if the player throws a bomb - the bomb explodes on its own,
713	* but this object sticks around. We could handle the cleanup in the	671	* but this object sticks around. We could handle the cleanup in the
714	* bomb code, but there are potential other cases where that could happen,	672	* bomb code, but there are potential other cases where that could happen,
715	* and it is easy enough to clean it up here.	673	* and it is easy enough to clean it up here.
716	*/	674	*/
717	if (op->inv == NULL)	675	if (!op->inv)
718	{	676	{
719	op->destroy ();	677	op->destroy ();
720	return;	678	return;
721	}	679	}
722		680
…		…
725	stop_arrow (op);	683	stop_arrow (op);
726	return;	684	return;
727	}	685	}
728	}	686	}
729		687
		688	/* decrease the speed as it flies. 0.05 means a standard bow will shoot
		689	* about 17 squares. Tune as needed.
		690	*/
		691	op->set_speed (op->speed - 0.05);
		692
730	/* if the arrow is moving too slow.. stop it. 0.5 was chosen as lower	693	/* if the arrow is moving too slow.. stop it. 0.5 was chosen as lower
731	values look rediculous. */	694	values look rediculous. */
732	if (op->speed < 0.5 && op->type == ARROW)	695	if (op->speed < (op->type == ARROW ? 0.5 : MIN_ACTIVE_SPEED))
733	{	696	{
734	stop_arrow (op);	697	stop_arrow (op);
735	return;	698	return;
736	}	699	}
737		700
738	/* Calculate target map square */	701	/* Calculate target map square */
739	new_x = op->x + DIRX (op);
740	new_y = op->y + DIRY (op);
741	was_reflected = 0;	702	was_reflected = 0;
742		703
743	m = op->map;	704	mapxy pos (op); pos.move (op->direction);
744	mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
745		705
746	if (mflags & P_OUT_OF_MAP)	706	if (!pos.normalise ())
747	{	707	{
748	stop_arrow (op);	708	stop_arrow (op);
749	return;	709	return;
750	}	710	}
751		711
752	/* only need to look for living creatures if this flag is set */	712	/* only need to look for living creatures if this flag is set */
753	if (mflags & P_IS_ALIVE)	713	if (pos->flags () & P_IS_ALIVE)
754	{	714	{
755	for (tmp = GET_MAP_OB (m, new_x, new_y); tmp != NULL; tmp = tmp->above)	715	object *tmp;
756	if (QUERY_FLAG (tmp, FLAG_ALIVE))	716
		717	for (tmp = pos->bot; tmp; tmp = tmp->above)
		718	if (tmp->flag [FLAG_ALIVE])
757	break;	719	break;
758		720
759	/* Not really fair, but don't let monsters hit themselves with	721	/* Not really fair, but don't let monsters hit themselves with
760	* their own arrow - this can be because they fire it then	722	* their own arrow - this can be because they fire it then
761	* move into it.	723	* move into it.
…		…
764	{	726	{
765	/* Found living object, but it is reflecting the missile. Update	727	/* Found living object, but it is reflecting the missile. Update
766	* as below. (Note that for living creatures there is a small	728	* as below. (Note that for living creatures there is a small
767	* chance that reflect_missile fails.)	729	* chance that reflect_missile fails.)
768	*/	730	*/
769	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE) && (rndm (0, 99)) < (90 - op->level / 10))	731	if (tmp->flag [FLAG_REFL_MISSILE] && (rndm (0, 99)) < (90 - op->level / 10))
770	{	732	{
771	int number = op->face->number;
772
773	op->direction = absdir (op->direction + 4);	733	op->direction = absdir (op->direction + 4);
774	op->state = 0;	734	update_turn_face (op);
775
776	if (GET_ANIM_ID (op))
777	{
778	number += 4;
779
780	if (number > GET_ANIMATION (op, 8))
781	number -= 8;
782
783	op->face = &new_faces[number];
784	}
785
786	was_reflected = 1; /* skip normal movement calculations */	735	was_reflected = 1; /* skip normal movement calculations */
787	}	736	}
788	else	737	else
789	{	738	{
790	/* Attack the object. */	739	/* Attack the object. */
…		…
794	return;	743	return;
795	}	744	}
796	} /* if this is not hitting its owner */	745	} /* if this is not hitting its owner */
797	} /* if there is something alive on this space */	746	} /* if there is something alive on this space */
798		747
799	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))	748	if (OB_TYPE_MOVE_BLOCK (op, pos->move_block))
800	{	749	{
801	int retry = 0;	750	int retry = 0;
802		751
803	/* if the object doesn't reflect, stop the arrow from moving	752	/* if the object doesn't reflect, stop the arrow from moving
804	* note that this code will now catch cases where a monster is	753	* note that this code will now catch cases where a monster is
805	* on a wall but has reflecting - the arrow won't reflect.	754	* on a wall but has reflecting - the arrow won't reflect.
806	* Mapmakers shouldn't put monsters on top of wall in the first	755	* Mapmakers shouldn't put monsters on top of wall in the first
807	* place, so I don't consider that a problem.	756	* place, so I don't consider that a problem.
808	*/	757	*/
809	if (!QUERY_FLAG (op, FLAG_REFLECTING) || !(rndm (0, 19)))	758	if (!op->flag [FLAG_REFLECTING] || !rndm (0, 19))
810	{	759	{
811	stop_arrow (op);	760	stop_arrow (op);
812	return;	761	return;
813	}	762	}
814	else	763	else
…		…
817	if (op->direction & 1)	766	if (op->direction & 1)
818	{	767	{
819	op->direction = absdir (op->direction + 4);	768	op->direction = absdir (op->direction + 4);
820	retry = 1;	769	retry = 1;
821	}	770	}
		771
822	/* There were two blocks with identical code -	772	/* There were two blocks with identical code -
823	* use this retry here to make this one block	773	* use this retry here to make this one block
824	* that did the same thing.	774	* that did the same thing.
825	*/	775	*/
826	while (retry < 2)	776	while (retry < 2)
827	{	777	{
828	int left, right, mflags;
829	maptile *m1;
830	sint16 x1, y1;
831
832	retry++;	778	retry++;
833		779
834	/* Need to check for P_OUT_OF_MAP: if the arrow is tavelling	780	/* Need to check for P_OUT_OF_MAP: if the arrow is travelling
835	* over a corner in a tiled map, it is possible that	781	* over a corner in a tiled map, it is possible that
836	* op->direction is within an adjacent map but either	782	* op->direction is within an adjacent map but either
837	* op->direction-1 or op->direction+1 does not exist.	783	* op->direction-1 or op->direction+1 does not exist.
838	*/	784	*/
839	mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction - 1)],	785	mapxy pos1 (pos); pos1.move (absdir (op->direction - 1));
840	op->y + freearr_y[absdir (op->direction - 1)], &x1, &y1);	786	bool left = pos1.normalise () && OB_TYPE_MOVE_BLOCK (op, pos1->move_block);
841	left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
842		787
843	mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction + 1)],	788	mapxy pos2 (pos); pos2.move (absdir (op->direction + 1));
844	op->y + freearr_y[absdir (op->direction + 1)], &x1, &y1);	789	bool right = pos2.normalise () && OB_TYPE_MOVE_BLOCK (op, pos2->move_block);
845	right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
846		790
847	if (left == right)	791	if (left == right)
848	op->direction = absdir (op->direction + 4);	792	op->direction = absdir (op->direction + 4);
849	else if (left)	793	else if (left)
850	op->direction = absdir (op->direction + 2);	794	op->direction = absdir (op->direction + 2);
851	else if (right)	795	else if (right)
852	op->direction = absdir (op->direction - 2);	796	op->direction = absdir (op->direction - 2);
853		797
854	mflags = get_map_flags (op->map, &m1, op->x + DIRX (op), op->y + DIRY (op), &x1, &y1);
855
856	/* If this space is not out of the map and not blocked, valid space -	798	/* If this space is not out of the map and not blocked, valid space -
857	* don't need to retry again.	799	* don't need to retry again.
858	*/	800	*/
859	if (!(mflags & P_OUT_OF_MAP) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m1, x1, y1)))	801	mapxy pos3 (pos); pos3.move (op->direction);
		802	if (pos3.normalise () && !OB_TYPE_MOVE_BLOCK (op, pos3->move_block))
860	break;	803	break;
861
862	}	804	}
		805
863	/* Couldn't find a direction to move the arrow to - just	806	/* Couldn't find a direction to move the arrow to - just
864	* top it from moving.	807	* stop it from moving.
865	*/	808	*/
866	if (retry == 2)	809	if (retry == 2)
867	{	810	{
868	stop_arrow (op);	811	stop_arrow (op);
869	return;	812	return;
870	}	813	}
		814
871	/* update object image for new facing */	815	/* update object image for new facing */
872	/* many thrown objects *don't* have more than one face */	816	/* many thrown objects *don't* have more than one face */
873	if (GET_ANIM_ID (op))	817	if (op->has_anim ())
874	SET_ANIMATION (op, op->direction);	818	op->set_anim_frame (op->direction);
875	} /* object is reflected */	819	} /* object is reflected */
876	} /* object ran into a wall */	820	} /* object ran into a wall */
877		821
878	/* Move the arrow. */	822	/* Move the arrow. */
879	op->remove ();	823	op->move_to (pos);
880	op->x = new_x;
881	op->y = new_y;
882
883	/* decrease the speed as it flies. 0.05 means a standard bow will shoot
884	* about 17 squares. Tune as needed.
885	*/
886	op->speed -= 0.05;
887	insert_ob_in_map (op, m, op, 0);
888	}	824	}
889		825
890	/* This routine doesnt seem to work for "inanimate" objects that	826	static void
891	* are being carried, ie a held torch leaps from your hands!.
892	* Modified this routine to allow held objects. b.t. */
893
894	void
895	change_object (object *op)	827	change_object (object *op)
896	{ /* Doesn`t handle linked objs yet */	828	{ /* Doesn`t handle linked objs yet */
897	int i, j;
898
899	if (op->other_arch == NULL)	829	if (!op->other_arch)
900	{	830	{
901	LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name);	831	LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
902	return;	832	return;
903	}	833	}
904		834
905	/* In non-living items only change when food value is 0 */	835	/* In non-living items only change when food value is 0 */
906	if (!QUERY_FLAG (op, FLAG_ALIVE))	836	if (!op->flag [FLAG_ALIVE])
907	{	837	{
908	if (op->stats.food-- > 0)	838	if (op->stats.food-- > 0)
909	return;	839	return;
		840
		841	op->stats.food = 1; /* so 1 other_arch is made */
		842	}
		843
		844	object *env = op->env;
		845
		846	op->remove ();
		847	for (int i = 0; i < op->stats.food; i++)
		848	{
		849	object *tmp = op->other_arch->instance ();
		850
		851	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
		852
		853	if (env)
		854	env->insert (tmp);
910	else	855	else
911	op->stats.food = 1; /* so 1 other_arch is made */
912	}
913
914	object *pl = op->in_player ();
915	object *env = op->env;
916
917	op->remove ();
918	for (i = 0; i < NROFNEWOBJS (op); i++)
919	{
920	object *tmp = arch_to_object (op->other_arch);
921
922	if (op->type == LAMP)
923	tmp->stats.food = op->stats.food - 1;
924
925	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
926	if (env)
927	{
928	tmp->x = env->x, tmp->y = env->y;
929	tmp = insert_ob_in_ob (tmp, env);
930
931	/* If this object is the players inventory, we need to tell the
932	* client of the change. Insert_ob_in_map takes care of the
933	* updating the client, so we don't need to do that below.
934	*/
935	if (pl)
936	{
937	esrv_del_item (pl->contr, op->count);
938	esrv_send_item (pl, tmp);
939	}
940	}	856	{
941	else
942	{
943	j = find_first_free_spot (tmp, op->map, op->x, op->y);	857	int j = find_first_free_spot (tmp, op->map, op->x, op->y);
		858
944	if (j == -1) /* No free spot */	859	if (j < 0) /* No free spot */
945	tmp->destroy ();	860	tmp->destroy ();
946	else	861	else
947	{	862	{
948	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];	863	mapxy pos (op); pos.move (j);
949	insert_ob_in_map (tmp, op->map, op, 0);	864
		865	if (pos.normalise ())
		866	pos.insert (tmp, op);
950	}	867	}
951	}	868	}
952	}	869	}
953		870
954	op->destroy ();	871	op->destroy ();
…		…
970	move_teleporter (op->more);	887	move_teleporter (op->more);
971		888
972	if (op->head)	889	if (op->head)
973	head = op->head;	890	head = op->head;
974		891
975	for (tmp = op->above; tmp != NULL; tmp = tmp->above)	892	for (tmp = op->above; tmp; tmp = tmp->above)
976	if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))	893	if (!tmp->flag [FLAG_IS_FLOOR])
977	break;	894	break;
978		895
979	/* If nothing above us to move, nothing to do */	896	/* If nothing above us to move, nothing to do */
980	if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS))	897	if (!tmp || tmp->flag [FLAG_WIZPASS])
981	return;	898	return;
982		899
983	if (EXIT_PATH (head))	900	if (EXIT_PATH (head))
984	{	901	{
985	if (tmp->type == PLAYER)	902	if (tmp->type == PLAYER)
…		…
1010	else	927	else
1011	{	928	{
1012	/* Random teleporter */	929	/* Random teleporter */
1013	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))	930	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
1014	return;	931	return;
		932
1015	teleport (head, TELEPORTER, tmp);	933	teleport (head, TELEPORTER, tmp);
1016	}	934	}
1017	}	935	}
1018
1019		936
1020	/* This object will teleport someone to a different map	937	/* This object will teleport someone to a different map
1021	and will also apply changes to the player from its inventory.	938	and will also apply changes to the player from its inventory.
1022	This was invented for giving classes, but there's no reason it	939	This was invented for giving classes, but there's no reason it
1023	can't be generalized.	940	can't be generalized.
1024	*/	941	*/
1025	void	942	static void
1026	move_player_changer (object *op)	943	move_player_changer (object *op)
1027	{	944	{
1028	object *player;
1029	object *walk;
1030	char c;
1031
1032	if (!op->above || !EXIT_PATH (op))	945	if (!op->above || !EXIT_PATH (op))
1033	return;	946	return;
1034		947
1035	/* This isn't all that great - means that the player_mover	948	/* This isn't all that great - means that the player_mover
1036	* needs to be on top.	949	* needs to be on top.
1037	*/	950	*/
1038	if (op->above->type == PLAYER)	951	if (op->above->type == PLAYER)
1039	{	952	{
		953	object *player = op->above;
		954
1040	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))	955	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))
1041	return;	956	return;
1042	player = op->above;
1043		957
1044	for (walk = op->inv; walk != NULL; walk = walk->below)	958	for (object *walk = op->inv; walk; walk = walk->below)
1045	apply_changes_to_player (player, walk);	959	apply_changes_to_player (player, walk);
1046		960
1047	player->update_stats ();	961	player->update_stats ();
1048		962
1049	esrv_send_inventory (op->above, op->above);	963	esrv_send_inventory (op->above, op->above);
1050	esrv_update_item (UPD_FACE, op->above, op->above);	964	esrv_update_item (UPD_FACE, op->above, op->above);
1051		965
1052	/* update players death & WoR home-position */	966	/* update players death & WoR home-position */
1053	sscanf (EXIT_PATH (op), "%c", &c);	967	if (*EXIT_PATH (op) == '/')
1054	if (c == '/')
1055	{	968	{
1056	player->contr->savebed_map = EXIT_PATH (op);	969	player->contr->savebed_map = EXIT_PATH (op);
1057	player->contr->bed_x = EXIT_X (op);	970	player->contr->bed_x = EXIT_X (op);
1058	player->contr->bed_y = EXIT_Y (op);	971	player->contr->bed_y = EXIT_Y (op);
1059	}	972	}
1060	else	973	else
1061	LOG (llevDebug, "WARNING: destination '%s' in player_changer must be an absolute path!\n", &EXIT_PATH (op));	974	LOG (llevDebug, "WARNING: destination '%s' in player_changer must be an absolute path!\n", &EXIT_PATH (op));
1062		975
1063	op->above->enter_exit (op);	976	op->above->enter_exit (op);
1064	player->contr->save ();
1065	}	977	}
1066	}	978	}
1067		979
1068	/* firewalls fire other spells.	980	/* firewalls fire other spells.
1069	* The direction of the wall is stored in op->stats.sp.	981	* The direction of the wall is stored in op->stats.sp.
…		…
1078	return; /* dm has created a firewall in his inventory */	990	return; /* dm has created a firewall in his inventory */
1079		991
1080	spell = op->inv;	992	spell = op->inv;
1081		993
1082	if (!spell || spell->type != SPELL)	994	if (!spell || spell->type != SPELL)
1083	spell = &op->other_arch->clone;	995	spell = op->other_arch;
1084		996
1085	if (!spell)	997	if (!spell)
1086	{	998	{
1087	LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);	999	LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
1088	return;	1000	return;
1089	}	1001	}
1090		1002
1091	cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);	1003	cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);
1092	}	1004	}
1093		1005
1094	/* move_player_mover: this function takes a "player mover" as an	1006	/* move_player_mover: this function takes a "player mover" as an
1095	* argument, and performs the function of a player mover, which is:	1007	* argument, and performs the function of a player mover, which is:
1096	*	1008	*
1097	* a player mover finds any players that are sitting on it. It	1009	* a player mover finds any players that are sitting on it. It
1098	* moves them in the op->stats.sp direction. speed is how often it'll move.	1010	* moves them in the op->stats.sp direction. speed is how often it'll move.
1099	* If attacktype is nonzero it will paralyze the player. If lifesave is set,	1011	* If attacktype is nonzero it will paralyze the player. If lifesave is set,
1100	* it'll dissapear after hp+1 moves. If hp is set and attacktype is set,	1012	* it'll dissapear after hp+1 moves. If hp is set and attacktype is set,
1101	* it'll paralyze the victim for hp*his speed/op->speed	1013	* it'll paralyze the victim for hp*his speed/op->speed
1102	*/	1014	*/
1103	void	1015	static void
1104	move_player_mover (object *op)	1016	move_player_mover (object *op)
1105	{	1017	{
1106	object *victim, *nextmover;	1018	int dir = 0;
1107	int dir = op->stats.sp;
1108	sint16 nx, ny;
1109	maptile *m;
1110		1019
1111	/* Determine direction now for random movers so we do the right thing */	1020	for (object *victim = op->ms ().bot; victim; victim = victim->above)
1112	if (!dir)
1113	dir = rndm (1, 8);
1114
1115	for (victim = GET_MAP_OB (op->map, op->x, op->y); victim != NULL; victim = victim->above)
1116	{	1021	{
1117	if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&	1022	if (victim->flag [FLAG_ALIVE]
		1023	&& !victim->flag [FLAG_WIZPASS]
1118	(victim->move_type & op->move_type || !victim->move_type))	1024	&& (victim->move_type & op->move_type || !victim->move_type))
		1025	{
		1026	if (op->flag [FLAG_LIFESAVE] && op->stats.hp-- < 0)
1119	{	1027	{
		1028	op->destroy ();
		1029	return;
		1030	}
		1031
		1032	/* Determine direction only once so we do the right thing */
		1033	// why is it the right thing, though?
		1034	if (!dir)
		1035	dir = op->stats.sp ? op->stats.sp : rndm (1, 8);
		1036
		1037	sint16 nx = op->x + freearr_x[dir];
		1038	sint16 ny = op->y + freearr_y[dir];
		1039	maptile *m = op->map;
		1040	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
		1041	{
		1042	LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
		1043	return;
		1044	}
1120		1045
1121	if (victim->head)	1046	if (victim->head)
1122	victim = victim->head;	1047	victim = victim->head;
1123		1048
1124	if (QUERY_FLAG (op, FLAG_LIFESAVE) && op->stats.hp-- < 0)
1125	{
1126	op->remove ();
1127	return;
1128	}
1129
1130	nx = op->x + freearr_x[dir];
1131	ny = op->y + freearr_y[dir];
1132	m = op->map;
1133	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
1134	{
1135	LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
1136	return;
1137	}
1138
1139	if (should_director_abort (op, victim))	1049	if (should_director_abort (op, victim))
1140	return;	1050	return;
1141		1051
1142	for (nextmover = GET_MAP_OB (m, nx, ny); nextmover != NULL; nextmover = nextmover->above)	1052	for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)
1143	{	1053	{
1144	if (nextmover->type == PLAYERMOVER)	1054	if (nextmover->type == PLAYERMOVER)
1145	nextmover->speed_left = -.99;	1055	nextmover->speed_left = -.99f;
		1056
1146	if (QUERY_FLAG (nextmover, FLAG_ALIVE))	1057	if (nextmover->flag [FLAG_ALIVE])
1147	{
1148	op->speed_left = -1.1; /* wait until the next thing gets out of the way */	1058	op->speed_left = -1.1f; /* wait until the next thing gets out of the way */
1149	}
1150	}	1059	}
1151		1060
1152	if (victim->type == PLAYER)	1061	if (victim->type == PLAYER)
1153	{	1062	{
1154	/* only level >=1 movers move people */	1063	/* only level >=1 movers move people */
1155	if (op->level)	1064	if (op->level)
1156	{	1065	{
1157	/* Following is a bit of hack. We need to make sure it	1066	/* Following is a bit of hack. We need to make sure it
1158	* is cleared, otherwise the player will get stuck in	1067	* is cleared, otherwise the player will get stuck in
1159	* place. This can happen if the player used a spell to	1068	* place. This can happen if the player used a spell to
1160	* get to this space.	1069	* get to this space.
1161	*/	1070	*/
1162	victim->contr->fire_on = 0;	1071	victim->contr->fire_on = 0;
1163	victim->speed_left = -FABS (victim->speed);	1072	victim->speed_left = 1.f;
1164	move_player (victim, dir);	1073	move_player (victim, dir);
1165	}	1074	}
1166	else	1075	else
1167	return;	1076	return;
1168	}	1077	}
1169	else	1078	else
1170	move_object (victim, dir);	1079	victim->move (dir);
1171		1080
1172	if (!op->stats.maxsp && op->attacktype)	1081	if (!op->stats.maxsp && op->attacktype)
1173	op->stats.maxsp = 2;	1082	op->stats.maxsp = 2;
1174		1083
1175	if (op->attacktype)	1084	if (op->attacktype)
1176	{ /* flag to paralyze the player */	1085	{ /* flag to paralyze the player */
1177
1178	victim->speed_left = -FABS (op->stats.maxsp * victim->speed / op->speed);	1086	victim->speed_left = max (-5.f, -op->stats.maxsp * victim->speed / op->speed);
1179	/* Not sure why, but for some chars on metalforge, they
1180	* would sometimes get -inf speed_left, and from the
1181	* description, it could only happen here, so just put
1182	* a lower sanity limit. My only guess is that the
1183	* mover has 0 speed.
1184	*/
1185	if (victim->speed_left < -5.0)
1186	victim->speed_left = -5.0;
1187	}	1087	}
1188	}	1088	}
1189	}	1089	}
1190	}	1090	}
1191		1091
…		…
1207	return;	1107	return;
1208	}	1108	}
1209		1109
1210	if (op->above == NULL)	1110	if (op->above == NULL)
1211	return;	1111	return;
		1112
1212	for (tmp = op->above; tmp != NULL; tmp = tmp->above)	1113	for (tmp = op->above; tmp; tmp = tmp->above)
1213	{	1114	{
1214	if (strcmp (op->other_arch->name, tmp->arch->name) == 0)	1115	if (op->other_arch->archname == tmp->arch->archname)
1215	{	1116	{
1216	if (op->level <= 0)	1117	if (op->level <= 0)
1217	tmp->destroy ();	1118	tmp->destroy ();
1218	else	1119	else
1219	{	1120	{
…		…
1241	* has to make sure that there is in fact space for the object.	1142	* has to make sure that there is in fact space for the object.
1242	* It should really do this for small objects also, but there is	1143	* It should really do this for small objects also, but there is
1243	* more concern with large objects, most notably a part being placed	1144	* more concern with large objects, most notably a part being placed
1244	* outside of the map which would cause the server to crash	1145	* outside of the map which would cause the server to crash
1245	*/	1146	*/
1246
1247	void	1147	void
1248	move_creator (object *creator)	1148	move_creator (object *creator)
1249	{	1149	{
1250	object *new_ob;	1150	object *new_ob;
1251		1151
1252	if (!QUERY_FLAG (creator, FLAG_LIFESAVE) && --creator->stats.hp < 0)	1152	if (!creator->flag [FLAG_LIFESAVE] && --creator->stats.hp < 0)
1253	{	1153	{
1254	creator->stats.hp = -1;	1154	creator->stats.hp = -1;
1255	return;	1155	return;
1256	}	1156	}
1257		1157
1258	if (creator->inv != NULL)	1158	if (creator->inv)
1259	{	1159	{
1260	object *ob;	1160	object *ob;
1261	int i;	1161	int i;
1262	object *ob_to_copy;	1162	object *ob_to_copy;
1263		1163
1264	/* select random object from inventory to copy */	1164	/* select random object from inventory to copy */
1265	ob_to_copy = creator->inv;	1165	ob_to_copy = creator->inv;
1266	for (ob = creator->inv->below, i = 1; ob != NULL; ob = ob->below, i++)	1166	for (ob = creator->inv->below, i = 1; ob; ob = ob->below, i++)
1267	{	1167	{
1268	if (rndm (0, i) == 0)	1168	if (rndm (0, i) == 0)
1269	{	1169	{
1270	ob_to_copy = ob;	1170	ob_to_copy = ob;
1271	}	1171	}
1272	}	1172	}
1273	new_ob = object_create_clone (ob_to_copy);	1173
1274	CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE);	1174	new_ob = ob_to_copy->deep_clone ();
		1175	new_ob->clr_flag (FLAG_IS_A_TEMPLATE);
1275	unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);	1176	unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
1276	}	1177	}
1277	else	1178	else
1278	{	1179	{
1279	if (creator->other_arch == NULL)	1180	if (!creator->other_arch)
1280	{	1181	{
1281	LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",	1182	LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",
1282	&creator->name, &creator->map->path, creator->x, creator->y);	1183	&creator->name, &creator->map->path, creator->x, creator->y);
1283	return;	1184	return;
1284	}	1185	}
…		…
1286	new_ob = object_create_arch (creator->other_arch);	1187	new_ob = object_create_arch (creator->other_arch);
1287	fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);	1188	fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);
1288	}	1189	}
1289		1190
1290	/* Make sure this multipart object fits */	1191	/* Make sure this multipart object fits */
1291	if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y))	1192	if (new_ob->arch->more && new_ob->blocked (creator->map, creator->x, creator->y))
1292	{	1193	{
1293	new_ob->destroy ();	1194	new_ob->destroy ();
1294	return;	1195	return;
1295	}	1196	}
1296		1197
		1198	// for now lets try to identify everything generated here, it mostly
		1199	// happens automated, so this will at least fix many identify-experience holes
		1200	if (new_ob->need_identify ())
		1201	new_ob->set_flag (FLAG_IDENTIFIED);
		1202
1297	insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);	1203	insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
1298	if (QUERY_FLAG (new_ob, FLAG_FREED))	1204	if (new_ob->flag [FLAG_FREED])
1299	return;	1205	return;
1300		1206
1301	if (creator->slaying)	1207	if (creator->slaying)
1302	{
1303	new_ob->name = new_ob->title = creator->slaying;	1208	new_ob->name = new_ob->title = creator->slaying;
1304	}
1305	}	1209	}
1306		1210
1307	/* move_marker --peterm@soda.csua.berkeley.edu	1211	/* move_marker --peterm@soda.csua.berkeley.edu
1308	when moved, a marker will search for a player sitting above	1212	when moved, a marker will search for a player sitting above
1309	it, and insert an invisible, weightless force into him	1213	it, and insert an invisible, weightless force into him
1310	with a specific code as the slaying field.	1214	with a specific code as the slaying field.
1311	At that time, it writes the contents of its own message	1215	At that time, it writes the contents of its own message
1312	field to the player. The marker will decrement hp to	1216	field to the player. The marker will decrement hp to
1313	0 and then delete itself every time it grants a mark.	1217	0 and then delete itself every time it grants a mark.
1314	unless hp was zero to start with, in which case it is infinite.*/	1218	unless hp was zero to start with, in which case it is infinite.*/
1315
1316	void	1219	void
1317	move_marker (object *op)	1220	move_marker (object *op)
1318	{	1221	{
1319	if (object *tmp = op->ms ().player ())	1222	if (object *tmp = op->ms ().player ())
1320	{	1223	{
1321	object *tmp2;
1322
1323	/* remove an old force with a slaying field == op->name */	1224	/* remove an old force with a slaying field == op->name */
1324	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)	1225	if (object *force = tmp->force_find (op->name))
1325	if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->name))	1226	force->destroy ();
		1227
		1228	if (op->slaying && !tmp->force_find (op->slaying))
1326	{	1229	{
1327	tmp2->destroy ();	1230	tmp->force_add (op->slaying, op->stats.food);
1328	break;
1329	}
1330		1231
1331	/* cycle through his inventory to look for the MARK we want to
1332	* place
1333	*/
1334	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1335	if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->slaying))
1336	break;
1337
1338	/* if we didn't find our own MARK */
1339	if (tmp2 == NULL)
1340	{
1341	object *force = get_archetype (FORCE_NAME);
1342
1343	if (op->stats.food)
1344	{
1345	force->set_speed (0.01);
1346	force->speed_left = -op->stats.food;
1347	}
1348	else
1349	force->set_speed (0);
1350
1351	/* put in the lock code */
1352	force->slaying = op->slaying;
1353
1354	if (op->lore)
1355	force->lore = op->lore;
1356
1357	insert_ob_in_ob (force, tmp);
1358	if (op->msg)	1232	if (op->msg)
1359	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);	1233	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
1360		1234
1361	if (op->stats.hp > 0)	1235	if (op->stats.hp > 0)
1362	{	1236	{
1363	op->stats.hp--;	1237	op->stats.hp--;
		1238
1364	if (op->stats.hp == 0)	1239	if (op->stats.hp == 0)
1365	{	1240	{
1366	/* marker expires--granted mark number limit */	1241	/* marker expires--granted mark number limit */
1367	op->destroy ();	1242	op->destroy ();
1368	return;	1243	return;
…		…
1370	}	1245	}
1371	}	1246	}
1372	}	1247	}
1373	}	1248	}
1374		1249
1375	int	1250	// mapscript objects activate themselves (only) then their timer fires
		1251	// TODO: maybe they should simply trigger the link like any other object?
		1252	static void
		1253	move_mapscript (object *op)
		1254	{
		1255	op->set_speed (0);
		1256	cfperl_mapscript_activate (op, true, op, 0);
		1257	}
		1258
		1259	static void
		1260	move_lamp (object *op)
		1261	{
		1262	// if the lamp/torch is off, we should disable it.
		1263	if (!op->glow_radius)
		1264	{
		1265	op->set_speed (0);
		1266	return;
		1267	}
		1268	else
		1269	{
		1270	// check whether the face might need to be updated
		1271	// (currently this is needed to have already switched on torches
		1272	// on maps, as they just set the glow_radius in the archetype)
		1273	if (op->other_arch
		1274	&& (
		1275	(op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
		1276	|| (op->flag [FLAG_ANIMATE]
		1277	? (op->animation_id != op->other_arch->animation_id)
		1278	: (op->face != op->other_arch->face))
		1279	))
		1280	get_animation_from_arch (op, op->other_arch);
		1281	}
		1282
		1283	// lamps and torches on maps don't use up their fuel
		1284	if (op->is_on_map ())
		1285	return;
		1286
		1287	if (op->stats.food > 0)
		1288	{
		1289	op->stats.food--;
		1290	return;
		1291	}
		1292
		1293	apply_lamp (op, false);
		1294	}
		1295
		1296	void
1376	process_object (object *op)	1297	process_object (object *op)
1377	{	1298	{
1378	if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1299	if (expect_false (op->flag [FLAG_IS_A_TEMPLATE]))
1379	return 0;	1300	return;
1380		1301
1381	if (INVOKE_OBJECT (TICK, op))	1302	if (expect_false (INVOKE_OBJECT (TICK, op)))
1382	return 0;	1303	return;
1383		1304
1384	if (QUERY_FLAG (op, FLAG_MONSTER))	1305	if (op->flag [FLAG_MONSTER])
1385	if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))	1306	if (move_monster (op) || op->flag [FLAG_FREED])
1386	return 1;	1307	return;
1387		1308
1388	if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0)	1309	if (op->flag [FLAG_ANIMATE] && op->anim_speed == 0)
1389	{	1310	{
1390	if (op->type == PLAYER)
1391	animate_object (op, op->facing);
1392	else
1393	animate_object (op, op->direction);	1311	animate_object (op, op->contr ? op->facing : op->direction);
1394		1312
1395	if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))	1313	if (op->flag [FLAG_SEE_ANYWHERE])
1396	make_sure_seen (op);	1314	make_sure_seen (op);
1397	}	1315	}
1398		1316
1399	if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)	1317	if (expect_false (
		1318	op->flag [FLAG_GENERATOR]
		1319	|| op->flag [FLAG_CHANGING]
		1320	|| op->flag [FLAG_IS_USED_UP]
		1321	))
1400	{	1322	{
		1323	if (op->flag [FLAG_CHANGING] && !op->state)
		1324	{
1401	change_object (op);	1325	change_object (op);
1402	return 1;	1326	return;
1403	}	1327	}
1404		1328
1405	if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY))	1329	if (op->flag [FLAG_GENERATOR] && !op->flag [FLAG_FRIENDLY])
1406	generate_monster (op);	1330	generate_monster (op);
1407		1331
1408	if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0)	1332	if (op->flag [FLAG_IS_USED_UP] && --op->stats.food <= 0)
1409	{	1333	{
1410	if (QUERY_FLAG (op, FLAG_APPLIED))	1334	if (op->flag [FLAG_APPLIED])
1411	remove_force (op);	1335	remove_force (op);
1412	else	1336	else
1413	{	1337	{
1414	/* IF necessary, delete the item from the players inventory */	1338	op->remove (); // TODO: really necessary?
1415	object *pl = op->in_player ();
1416		1339
1417	if (pl)	1340	if (op->flag [FLAG_SEE_ANYWHERE])
1418	esrv_del_item (pl->contr, op->count);
1419
1420	op->remove ();
1421
1422	if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1423	make_sure_not_seen (op);	1341	make_sure_not_seen (op);
1424		1342
1425	op->destroy ();	1343	op->drop_and_destroy ();
1426	}	1344	}
1427		1345
1428	return 1;	1346	return;
		1347	}
1429	}	1348	}
1430		1349
1431	switch (op->type)	1350	switch (op->type)
1432	{	1351	{
1433	case SPELL_EFFECT:	1352	case SPELL_EFFECT:
1434	move_spell_effect (op);	1353	move_spell_effect (op);
1435	return 1;	1354	break;
1436		1355
1437	case ROD:	1356	case ROD:
1438	case HORN:	1357	case HORN:
1439	regenerate_rod (op);	1358	regenerate_rod (op);
1440	return 1;	1359	break;
1441		1360
1442	case FORCE:	1361	case FORCE:
1443	case POTION_EFFECT:	1362	case POTION_EFFECT:
1444	remove_force (op);	1363	remove_force (op);
1445	return 1;	1364	break;
1446		1365
1447	case BLINDNESS:	1366	case BLINDNESS:
1448	remove_blindness (op);	1367	remove_blindness (op);
1449	return 0;	1368	break;
1450		1369
1451	case POISONING:	1370	case POISONING:
1452	poison_more (op);	1371	poison_more (op);
1453	return 0;	1372	break;
1454		1373
1455	case DISEASE:	1374	case DISEASE:
1456	move_disease (op);	1375	move_disease (op);
1457	return 0;	1376	break;
1458		1377
1459	case SYMPTOM:	1378	case SYMPTOM:
1460	move_symptom (op);	1379	move_symptom (op);
1461	return 0;	1380	break;
1462		1381
1463	case THROWN_OBJ:	1382	case THROWN_OBJ:
1464	case ARROW:	1383	case ARROW:
1465	move_arrow (op);	1384	move_arrow (op);
1466	return 0;	1385	break;
1467		1386
1468	case DOOR:	1387	case DOOR:
1469	remove_door (op);	1388	remove_door (op);
1470	return 0;	1389	break;
1471		1390
1472	case LOCKED_DOOR:	1391	case LOCKED_DOOR:
1473	remove_door2 (op);	1392	remove_door2 (op);
1474	return 0;	1393	break;
1475		1394
1476	case TELEPORTER:	1395	case TELEPORTER:
1477	move_teleporter (op);	1396	move_teleporter (op);
1478	return 0;	1397	break;
1479		1398
1480	case GOLEM:	1399	case GOLEM:
1481	move_golem (op);	1400	move_golem (op);
1482	return 0;	1401	break;
1483		1402
1484	case EARTHWALL:	1403	case EARTHWALL:
1485	hit_player (op, 2, op, AT_PHYSICAL, 1);	1404	hit_player (op, 2, op, AT_PHYSICAL, 1);
1486	return 0;	1405	break;
1487		1406
1488	case FIREWALL:	1407	case FIREWALL:
1489	move_firewall (op);	1408	move_firewall (op);
1490	if (op->stats.maxsp)	1409	if (op->stats.maxsp)
1491	animate_turning (op);	1410	animate_turning (op);
1492	return 0;	1411	break;
1493		1412
1494	case MOOD_FLOOR:	1413	case MOOD_FLOOR:
1495	do_mood_floor (op);	1414	do_mood_floor (op);
1496	return 0;	1415	break;
1497		1416
1498	case GATE:	1417	case GATE:
1499	move_gate (op);	1418	move_gate (op);
1500	return 0;	1419	break;
1501		1420
1502	case TIMED_GATE:	1421	case TIMED_GATE:
1503	move_timed_gate (op);	1422	move_timed_gate (op);
1504	return 0;	1423	break;
1505		1424
1506	case TRIGGER:	1425	case TRIGGER:
1507	case TRIGGER_BUTTON:	1426	case TRIGGER_BUTTON:
1508	case TRIGGER_PEDESTAL:	1427	case TRIGGER_PEDESTAL:
1509	case TRIGGER_ALTAR:	1428	case TRIGGER_ALTAR:
1510	animate_trigger (op);	1429	animate_trigger (op);
1511	return 0;	1430	break;
1512		1431
1513	case DETECTOR:	1432	case DETECTOR:
1514	move_detector (op);	1433	move_detector (op);
1515		1434
1516	case DIRECTOR:	1435	case DIRECTOR:
1517	if (op->stats.maxsp)	1436	if (op->stats.maxsp)
1518	animate_turning (op);	1437	animate_turning (op);
1519	return 0;	1438	break;
1520		1439
1521	case HOLE:	1440	case HOLE:
1522	move_hole (op);	1441	move_hole (op);
1523	return 0;	1442	break;
1524		1443
1525	case DEEP_SWAMP:	1444	case DEEP_SWAMP:
1526	move_deep_swamp (op);	1445	move_deep_swamp (op);
1527	return 0;	1446	break;
1528		1447
1529	case RUNE:	1448	case RUNE:
1530	case TRAP:	1449	case TRAP:
1531	move_rune (op);	1450	move_rune (op);
1532	return 0;	1451	break;
1533		1452
1534	case PLAYERMOVER:	1453	case PLAYERMOVER:
1535	move_player_mover (op);	1454	move_player_mover (op);
1536	return 0;	1455	break;
1537		1456
1538	case CREATOR:	1457	case CREATOR:
1539	move_creator (op);	1458	move_creator (op);
1540	return 0;	1459	break;
1541		1460
1542	case MARKER:	1461	case MARKER:
1543	move_marker (op);	1462	move_marker (op);
1544	return 0;	1463	break;
1545		1464
1546	case PLAYER_CHANGER:	1465	case PLAYER_CHANGER:
1547	move_player_changer (op);	1466	move_player_changer (op);
1548	return 0;	1467	break;
1549		1468
1550	case PEACEMAKER:	1469	case PEACEMAKER:
1551	move_peacemaker (op);	1470	move_peacemaker (op);
1552	return 0;	1471	break;
1553	}
1554		1472
1555	return 0;	1473	case PLAYER:
		1474	// players have their own speed-management, so undo the --speed_left
		1475	++op->speed_left;
		1476	break;
		1477
		1478	case MAPSCRIPT:
		1479	move_mapscript (op);
		1480	break;
		1481
		1482	case LAMP:
		1483	case TORCH:
		1484	move_lamp (op);
		1485	break;
		1486
		1487	case PHYSICS: // hmm, bad naming
		1488	move_physics (op);
		1489	break;
		1490	}
1556	}	1491	}
		1492

Diff Legend

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