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.45 by root, Sun Apr 22 13:06:45 2007 UTC vs.
Revision 1.112 by root, Mon May 31 17:47:30 2010 UTC

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

Diff Legend

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