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

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

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.20 by root, Wed Dec 20 09:14:22 2006 UTC vs. Revision 1.82 by root, Mon Sep 29 10:32:51 2008 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.20 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.82 by root, Mon Sep 29 10:32:51 2008 UTC