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

Diff Legend

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