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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.12 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.45 by root, Sun Apr 22 13:06:45 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/*	25	/*
25	* Routines that is executed from objects based on their speed have been	26	* Routines that is executed from objects based on their speed have been
26	* collected in this file.	27	* collected in this file.
27	*/	28	*/
28
29	#include <global.h>	29	#include <global.h>
30	#include <spells.h>	30	#include <spells.h>
31	#ifndef __CEXTRACT__
32	# include <sproto.h>	31	#include <sproto.h>
33	#endif
34		32
35	/* The following removes doors. The functions check to see if similar	33	/* 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	34	* 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.)	35	* so those will be removed shortly (in a cascade like fashion.)
38	*/	36	*/
39
40	void	37	void
41	remove_door (object *op)	38	remove_door (object *op)
42	{	39	{
43	int i;	40	int i;
44	object *tmp;	41	object *tmp;
45		42
46	for (i = 1; i < 9; i += 2)	43	for (i = 1; i < 9; i += 2)
47	if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL)	44	if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL)
48	{	45	{
49	tmp->speed = 0.1;	46	tmp->set_speed (0.1);
50	update_ob_speed (tmp);
51	tmp->speed_left = -0.2;	47	tmp->speed_left = -0.2;
52	}	48	}
53		49
54	if (op->other_arch)	50	if (op->other_arch)
55	{	51	{
58	tmp->y = op->y;	54	tmp->y = op->y;
59	tmp->map = op->map;	55	tmp->map = op->map;
60	tmp->level = op->level;	56	tmp->level = op->level;
61	insert_ob_in_map (tmp, op->map, op, 0);	57	insert_ob_in_map (tmp, op->map, op, 0);
62	}	58	}
63	remove_ob (op);	59
64	free_object (op);	60	op->destroy ();
65	}	61	}
66		62
67	void	63	void
68	remove_door2 (object *op)	64	remove_door2 (object *op)
69	{	65	{
…		…
73	for (i = 1; i < 9; i += 2)	69	for (i = 1; i < 9; i += 2)
74	{	70	{
75	tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);	71	tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);
76	if (tmp && tmp->slaying == op->slaying)	72	if (tmp && tmp->slaying == op->slaying)
77	{ /* same key both doors */	73	{ /* same key both doors */
78	tmp->speed = 0.1;	74	tmp->set_speed (0.1);
79	update_ob_speed (tmp);
80	tmp->speed_left = -0.2;	75	tmp->speed_left = -0.2;
81	}	76	}
82	}	77	}
		78
83	if (op->other_arch)	79	if (op->other_arch)
84	{	80	{
85	tmp = arch_to_object (op->other_arch);	81	tmp = arch_to_object (op->other_arch);
86	tmp->x = op->x;	82	tmp->x = op->x;
87	tmp->y = op->y;	83	tmp->y = op->y;
88	tmp->map = op->map;	84	tmp->map = op->map;
89	tmp->level = op->level;	85	tmp->level = op->level;
90	insert_ob_in_map (tmp, op->map, op, 0);	86	insert_ob_in_map (tmp, op->map, op, 0);
91	}	87	}
92	remove_ob (op);
93	free_object (op);
94	}
95		88
96	/* Will generate a monster according to content	89	op->destroy ();
97	* of generator.	90	}
98	*/	91
99	void	92	void
100	generate_monster_inv (object *gen)	93	generate_monster (object *gen)
101	{	94	{
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)	95	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;	96	return;
130	head = object_create_clone (op);
131	CLEAR_FLAG (head, FLAG_IS_A_TEMPLATE);
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;
138	if (HAS_RANDOM_ITEMS (head))
139	create_treasure (head->randomitems, head, GT_APPLY, gen->map->difficulty, 0);
140	}
141
142	void
143	generate_monster_arch (object *gen)
144	{
145	int i;
146	object op, head = NULL, *prev = NULL;
147	archetype *at = gen->other_arch;
148
149	if (gen->other_arch == NULL)
150	{
151	//LOG(llevError,"Generator without other_arch: %s\n",gen->name);
152	return;
153	}
154	/* Code below assumes the generator is on a map, as it tries
155	* to place the monster on the map. So if the generator
156	* isn't on a map, complain and exit.
157	*/
158	if (gen->map == NULL)
159	{
160	//LOG(llevError,"Generator (%s) not on a map?\n", gen->name);
161	return;
162	}
163	i = find_free_spot (&at->clone, gen->map, gen->x, gen->y, 1, 9);
164	if (i == -1)
165	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
172	if (head != NULL)
173	op->head = head, prev->more = op;
174
175	if (rndm (0, 9))
176	generate_artifact (op, gen->map->difficulty);
177	insert_ob_in_map (op, gen->map, gen, 0);
178	if (QUERY_FLAG (op, FLAG_FREED))
179	return;
180	if (HAS_RANDOM_ITEMS (op))
181	create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty, 0);
182	if (head == NULL)
183	head = op;
184	prev = op;
185	at = at->more;
186	}
187	}
188
189	void
190	generate_monster (object *gen)
191	{
192		97
193	if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))	98	if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
194	return;	99	return;
		100
		101	object *op;
		102
195	if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))	103	if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))
196	generate_monster_inv (gen);	104	{
		105	// either copy one item form the inventory...
		106	if (!gen->inv)
		107	return;
		108
		109	// first select one item from the inventory
		110	int index = 0;
		111	for (object *tmp = gen->inv; tmp; tmp = tmp->below)
		112	if (!rndm (++index))
		113	op = tmp;
		114
		115	op = object_create_clone (op);
		116
		117	CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
		118	unflag_inv (op, FLAG_IS_A_TEMPLATE);
		119	}
197	else	120	else
198	generate_monster_arch (gen);	121	{
		122	// ...or use other_arch
		123	if (archetype *at = gen->other_arch)
		124	op = arch_to_object (at);
		125	else
		126	return;
		127	}
199		128
		129	op->expand_tail ();
		130
		131	int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
		132	if (i >= 0)
		133	{
		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))
		137	generate_artifact (op, gen->map->difficulty);
		138
		139	if (op->has_random_items ())
		140	create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
		141
		142	return;
		143	}
		144	}
		145
		146	op->destroy ();
200	}	147	}
201		148
202	void	149	void
203	remove_force (object *op)	150	remove_force (object *op)
204	{	151	{
205	if (--op->duration > 0)	152	if (--op->duration > 0)
206	return;	153	return;
207		154
		155	if (op->env)
208	switch (op->subtype)	156	switch (op->subtype)
209	{	157	{
210	case FORCE_CONFUSION:	158	case FORCE_CONFUSION:
211	if (op->env != NULL)
212	{
213	CLEAR_FLAG (op->env, FLAG_CONFUSED);	159	CLEAR_FLAG (op->env, FLAG_CONFUSED);
214	new_draw_info (NDI_UNIQUE, 0, op->env, "You regain your senses.\n");	160	new_draw_info (NDI_UNIQUE, 0, op->env, "You regain your senses.\n");
215	}
216		161
217	default:	162	default:
218	if (op->env != NULL)
219	{
220	CLEAR_FLAG (op, FLAG_APPLIED);	163	CLEAR_FLAG (op, FLAG_APPLIED);
221	change_abil (op->env, op);	164	change_abil (op->env, op);
222	fix_player (op->env);	165	op->env->update_stats ();
223	}
224	}	166	}
225	remove_ob (op);	167
226	free_object (op);	168	op->destroy ();
227	}	169	}
228		170
229	void	171	void
230	remove_blindness (object *op)	172	remove_blindness (object *op)
231	{	173	{
232	if (--op->stats.food > 0)	174	if (--op->stats.food > 0)
233	return;	175	return;
		176
234	CLEAR_FLAG (op, FLAG_APPLIED);	177	CLEAR_FLAG (op, FLAG_APPLIED);
		178
235	if (op->env != NULL)	179	if (op->env)
236	{	180	{
237	change_abil (op->env, op);	181	change_abil (op->env, op);
238	fix_player (op->env);	182	op->env->update_stats ();
239	}	183	}
240	remove_ob (op);	184
241	free_object (op);	185	op->destroy ();
242	}	186	}
243		187
244	void	188	void
245	poison_more (object *op)	189	poison_more (object *op)
246	{	190	{
247	if (op->env == NULL \|\| !QUERY_FLAG (op->env, FLAG_ALIVE) \|\| op->env->stats.hp < 0)	191	if (op->env == NULL \|\| !QUERY_FLAG (op->env, FLAG_ALIVE) \|\| op->env->stats.hp < 0)
248	{	192	{
249	remove_ob (op);	193	op->destroy ();
250	free_object (op);
251	return;	194	return;
252	}	195	}
		196
253	if (op->stats.food == 1)	197	if (op->stats.food == 1)
254	{	198	{
255	/* need to remove the object before fix_player is called, else fix_player	199	/* need to unapply the object before update_stats is called, else fix_player
256	* will not do anything.	200	* will not do anything.
257	*/	201	*/
258	if (op->env->type == PLAYER)	202	if (op->env->type == PLAYER)
259	{	203	{
260	CLEAR_FLAG (op, FLAG_APPLIED);	204	CLEAR_FLAG (op, FLAG_APPLIED);
261	fix_player (op->env);	205	op->env->update_stats ();
262	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");	206	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");
263	}	207	}
264	remove_ob (op);	208
265	free_object (op);	209	op->destroy ();
266	return;	210	return;
267	}	211	}
		212
268	if (op->env->type == PLAYER)	213	if (op->env->type == PLAYER)
269	{	214	{
270	op->env->stats.food--;	215	op->env->stats.food--;
271	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel very sick...");	216	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel very sick...");
272	}	217	}
		218
273	(void) hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);	219	hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);
274	}	220	}
275		221
276		222
277	void	223	void
278	move_gate (object *op)	224	move_gate (object *op)
…		…
280	object *tmp;	226	object *tmp;
281		227
282	if (op->stats.wc < 0 \|\| (int) op->stats.wc >= NUM_ANIMATIONS (op))	228	if (op->stats.wc < 0 \|\| (int) op->stats.wc >= NUM_ANIMATIONS (op))
283	{	229	{
284	LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op));	230	LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op));
285	dump_object (op);
286	LOG (llevError, "%s\n", errmsg);
287	op->stats.wc = 0;	231	op->stats.wc = 0;
288	}	232	}
289		233
290	/* We're going down */	234	/* We're going down */
291	if (op->value)	235	if (op->value)
…		…
294	{ /* Reached bottom, let's stop */	238	{ /* Reached bottom, let's stop */
295	op->stats.wc = 0;	239	op->stats.wc = 0;
296	if (op->arch->clone.speed)	240	if (op->arch->clone.speed)
297	op->value = 0;	241	op->value = 0;
298	else	242	else
299	{
300	op->speed = 0;	243	op->set_speed (0);
301	update_ob_speed (op);
302	}	244	}
303	}	245
304	if ((int) op->stats.wc < (NUM_ANIMATIONS (op) / 2 + 1))	246	if ((int) op->stats.wc < (NUM_ANIMATIONS (op) / 2 + 1))
305	{	247	{
306	op->move_block = 0;	248	op->move_block = 0;
307	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);	249	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
308	update_all_los (op->map, op->x, op->y);	250	update_all_los (op->map, op->x, op->y);
309	}	251	}
		252
310	SET_ANIMATION (op, op->stats.wc);	253	SET_ANIMATION (op, op->stats.wc);
311	update_object (op, UP_OBJ_CHANGE);	254	update_object (op, UP_OBJ_CHANGE);
312	return;	255	return;
313	}	256	}
314		257
…		…
331	if (tmp == NULL)	274	if (tmp == NULL)
332	{	275	{
333	if (op->arch->clone.speed)	276	if (op->arch->clone.speed)
334	op->value = 1;	277	op->value = 1;
335	else	278	else
336	{
337	op->speed = 0;	279	op->set_speed (0);
338	update_ob_speed (op); /* Reached top, let's stop */	280
339	}
340	return;	281	return;
341	}	282	}
342	}	283	}
343		284
344	if (op->stats.food)	285	if (op->stats.food)
…		…
384	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);	325	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
385		326
386	/* If there is a free spot, move the object someplace */	327	/* If there is a free spot, move the object someplace */
387	if (i != -1)	328	if (i != -1)
388	{	329	{
389	remove_ob (tmp);	330	tmp->remove ();
390	tmp->x += freearr_x[i], tmp->y += freearr_y[i];	331	tmp->x += freearr_x[i], tmp->y += freearr_y[i];
391	insert_ob_in_map (tmp, op->map, op, 0);	332	insert_ob_in_map (tmp, op->map, op, 0);
392	}	333	}
393	}	334	}
394	}	335	}
…		…
435	}	376	}
436	if (--op->stats.hp <= 0)	377	if (--op->stats.hp <= 0)
437	{ /* keep gate down */	378	{ /* keep gate down */
438	move_gate (op);	379	move_gate (op);
439	if (op->value != v)	380	if (op->value != v)
440	{ /* ready ? */
441	op->speed = 0;	381	op->set_speed (0);
442	update_ob_speed (op);
443	}
444	}	382	}
445	}	383	}
446		384
447	/* slaying: name of the thing the detector is to look for	385	/* slaying: name of the thing the detector is to look for
448	* speed: frequency of 'glances'	386	* speed: frequency of 'glances'
…		…
458	int last = op->value;	396	int last = op->value;
459	int detected;	397	int detected;
460		398
461	detected = 0;	399	detected = 0;
462		400
463	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above)	401	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above)
464	{	402	{
465	object *tmp2;	403	object *tmp2;
466		404
467	if (op->stats.hp)	405	if (op->stats.hp)
468	{	406	{
469	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)	407	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
470	{	408	{
471	if (op->slaying && !strcmp (op->slaying, tmp->name))	409	if (op->slaying && op->slaying == tmp->name)
472	detected = 1;	410	detected = 1;
		411
473	if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->slaying))	412	if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
474	detected = 1;	413	detected = 1;
475	}	414	}
476	}	415	}
		416
477	if (op->slaying && !strcmp (op->slaying, tmp->name))	417	if (op->slaying && op->slaying == tmp->name)
478	{
479	detected = 1;	418	detected = 1;
480	}
481	else if (tmp->type == SPECIAL_KEY && tmp->slaying == op->slaying)	419	else if (tmp->type == SPECIAL_KEY && tmp->slaying == op->slaying)
482	detected = 1;	420	detected = 1;
483	}	421	}
484		422
485	/* the detector sets the button if detection is found */	423	/* the detector sets the button if detection is found */
…		…
535	if (op->value)	473	if (op->value)
536	{ /* We're opening */	474	{ /* We're opening */
537	if (--op->stats.wc <= 0)	475	if (--op->stats.wc <= 0)
538	{ /* Opened, let's stop */	476	{ /* Opened, let's stop */
539	op->stats.wc = 0;	477	op->stats.wc = 0;
540	op->speed = 0;	478	op->set_speed (0);
541	update_ob_speed (op);
542		479
543	/* Hard coding this makes sense for holes I suppose */	480	/* Hard coding this makes sense for holes I suppose */
544	op->move_on = MOVE_WALK;	481	op->move_on = MOVE_WALK;
545	for (tmp = op->above; tmp != NULL; tmp = next)	482	for (tmp = op->above; tmp != NULL; tmp = next)
546	{	483	{
547	next = tmp->above;	484	next = tmp->above;
548	move_apply (op, tmp, tmp);	485	move_apply (op, tmp, tmp);
549	}	486	}
550	}	487	}
		488
551	SET_ANIMATION (op, op->stats.wc);	489	SET_ANIMATION (op, op->stats.wc);
552	update_object (op, UP_OBJ_FACE);	490	update_object (op, UP_OBJ_FACE);
553	return;	491	return;
554	}	492	}
555	/* We're closing */	493	/* We're closing */
556	op->move_on = 0;	494	op->move_on = 0;
557		495
558	op->stats.wc++;	496	op->stats.wc++;
559	if ((int) op->stats.wc >= NUM_ANIMATIONS (op))	497	if ((int) op->stats.wc >= NUM_ANIMATIONS (op))
560	op->stats.wc = NUM_ANIMATIONS (op) - 1;	498	op->stats.wc = NUM_ANIMATIONS (op) - 1;
		499
561	SET_ANIMATION (op, op->stats.wc);	500	SET_ANIMATION (op, op->stats.wc);
562	update_object (op, UP_OBJ_FACE);	501	update_object (op, UP_OBJ_FACE);
563	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))	502	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))
564	{
565	op->speed = 0;
566	update_ob_speed (op); /* closed, let's stop */	503	op->set_speed (0); /* closed, let's stop */
567	return;
568	}
569	}	504	}
570		505
571		506
572	/* stop_item() returns a pointer to the stopped object. The stopped object	507	/* stop_item() returns a pointer to the stopped object. The stopped object
573	* may or may not have been removed from maps or inventories. It will not	508	* may or may not have been removed from maps or inventories. It will not
…		…
593	{	528	{
594	object *payload = op->inv;	529	object *payload = op->inv;
595		530
596	if (payload == NULL)	531	if (payload == NULL)
597	return NULL;	532	return NULL;
598	remove_ob (payload);	533	payload->remove ();
599	remove_ob (op);	534	op->destroy ();
600	free_object (op);
601	return payload;	535	return payload;
602	}	536	}
603		537
604	case ARROW:	538	case ARROW:
605	if (op->speed >= MIN_ACTIVE_SPEED)	539	if (op->has_active_speed ())
606	op = fix_stopped_arrow (op);	540	op = fix_stopped_arrow (op);
607	return op;	541	return op;
608		542
609	default:	543	default:
610	return op;	544	return op;
…		…
615	* Inserts item into the old map, or merges it if it already is on the map.	549	* Inserts item into the old map, or merges it if it already is on the map.
616	*	550	*
617	* 'map' must be the value of op->map before stop_item() was called.	551	* 'map' must be the value of op->map before stop_item() was called.
618	*/	552	*/
619	void	553	void
620	fix_stopped_item (object op, mapstruct map, object *originator)	554	fix_stopped_item (object op, maptile map, object *originator)
621	{	555	{
622	if (map == NULL)	556	if (map == NULL)
623	return;	557	return;
		558
624	if (QUERY_FLAG (op, FLAG_REMOVED))	559	if (QUERY_FLAG (op, FLAG_REMOVED))
625	insert_ob_in_map (op, map, originator, 0);	560	insert_ob_in_map (op, map, originator, 0);
626	else if (op->type == ARROW)	561	else if (op->type == ARROW)
627	merge_ob (op, NULL); /* only some arrows actually need this */	562	merge_ob (op, NULL); /* only some arrows actually need this */
628	}	563	}
629		564
630
631	object *	565	object *
632	fix_stopped_arrow (object *op)	566	fix_stopped_arrow (object *op)
633	{	567	{
634	if (rndm (0, 99) < op->stats.food)	568	if (rndm (0, 99) < op->stats.food)
635	{	569	{
636	/* Small chance of breaking */	570	/* Small chance of breaking */
637	remove_ob (op);	571	op->destroy ();
638	free_object (op);
639	return NULL;	572	return NULL;
640	}	573	}
641		574
		575	op->set_speed (0);
642	op->direction = 0;	576	op->direction = 0;
643	op->move_on = 0;	577	op->move_on = 0;
644	op->move_type = 0;	578	op->move_type = 0;
645	op->speed = 0;
646	update_ob_speed (op);
647	op->stats.wc = op->stats.sp;	579	op->stats.wc = op->stats.sp;
648	op->stats.dam = op->stats.hp;	580	op->stats.dam = op->stats.hp;
649	op->attacktype = op->stats.grace;	581	op->attacktype = op->stats.grace;
650	op->slaying = 0;	582	op->slaying = 0;
651	op->skill = 0;	583	op->skill = 0;
…		…
657	op->spellarg = NULL;	589	op->spellarg = NULL;
658	}	590	}
659	else	591	else
660	op->slaying = NULL;	592	op->slaying = NULL;
661		593
662	/* Reset these to zero, so that CAN_MERGE will work properly */	594	/* Reset these to zero, so that object::can_merge will work properly */
663	op->spellarg = NULL;	595	op->spellarg = NULL;
664	op->stats.sp = 0;	596	op->stats.sp = 0;
665	op->stats.hp = 0;	597	op->stats.hp = 0;
666	op->stats.grace = 0;	598	op->stats.grace = 0;
667	op->level = 0;	599	op->level = 0;
668	op->face = op->arch->clone.face;	600	op->face = op->arch->clone.face;
669	op->owner = NULL; /* So that stopped arrows will be saved */	601	op->owner = NULL; /* So that stopped arrows will be saved */
670	update_object (op, UP_OBJ_FACE);	602	update_object (op, UP_OBJ_CHANGE);
671	return op;	603	return op;
672	}	604	}
673		605
674	/* stop_arrow() - what to do when a non-living flying object	606	/* stop_arrow() - what to do when a non-living flying object
675	* has to stop. Sept 96 - I added in thrown object code in	607	* has to stop. Sept 96 - I added in thrown object code in
676	* here too. -b.t.	608	* here too. -b.t.
677	*	609	*
678	* Returns a pointer to the stopped object (which will have been removed	610	* Returns a pointer to the stopped object (which will have been removed
679	* from maps or inventories), or NULL if was destroyed.	611	* from maps or inventories), or NULL if was destroyed.
680	*/	612	*/
681
682	static void	613	static void
683	stop_arrow (object *op)	614	stop_arrow (object *op)
684	{	615	{
685	if (INVOKE_OBJECT (STOP, op))	616	if (INVOKE_OBJECT (STOP, op))
686	return;	617	return;
687		618
688	if (op->inv)	619	if (op->inv)
689	{	620	{
690	object *payload = op->inv;	621	object *payload = op->inv;
691		622
692	remove_ob (payload);	623	payload->remove ();
693	clear_owner (payload);	624	payload->owner = 0;
694	insert_ob_in_map (payload, op->map, payload, 0);	625	insert_ob_in_map (payload, op->map, payload, 0);
695	remove_ob (op);	626	op->destroy ();
696	free_object (op);
697	}	627	}
698	else	628	else
699	{	629	{
700	op = fix_stopped_arrow (op);	630	op = fix_stopped_arrow (op);
701	if (op)	631	if (op)
…		…
703	}	633	}
704	}	634	}
705		635
706	/* Move an arrow along its course. op is the arrow or thrown object.	636	/* Move an arrow along its course. op is the arrow or thrown object.
707	*/	637	*/
708
709	void	638	void
710	move_arrow (object *op)	639	move_arrow (object *op)
711	{	640	{
712	object *tmp;	641	object *tmp;
713	sint16 new_x, new_y;	642	sint16 new_x, new_y;
714	int was_reflected, mflags;	643	int was_reflected, mflags;
715	mapstruct *m;	644	maptile *m;
716		645
717	if (op->map == NULL)	646	if (op->map == NULL)
718	{	647	{
719	LOG (llevError, "BUG: Arrow had no map.\n");	648	LOG (llevError, "BUG: Arrow had no map.\n");
720	remove_ob (op);	649	op->destroy ();
721	free_object (op);
722	return;	650	return;
723	}	651	}
724		652
725	/* we need to stop thrown objects at some point. Like here. */	653	/* we need to stop thrown objects at some point. Like here. */
726	if (op->type == THROWN_OBJ)	654	if (op->type == THROWN_OBJ)
…		…
733	* bomb code, but there are potential other cases where that could happen,	661	* bomb code, but there are potential other cases where that could happen,
734	* and it is easy enough to clean it up here.	662	* and it is easy enough to clean it up here.
735	*/	663	*/
736	if (op->inv == NULL)	664	if (op->inv == NULL)
737	{	665	{
738	remove_ob (op);	666	op->destroy ();
739	free_object (op);
740	return;	667	return;
741	}	668	}
		669
742	if (op->last_sp-- < 0)	670	if (op->last_sp-- < 0)
743	{	671	{
744	stop_arrow (op);	672	stop_arrow (op);
745	return;	673	return;
746	}	674	}
…		…
769	}	697	}
770		698
771	/* only need to look for living creatures if this flag is set */	699	/* only need to look for living creatures if this flag is set */
772	if (mflags & P_IS_ALIVE)	700	if (mflags & P_IS_ALIVE)
773	{	701	{
774	for (tmp = get_map_ob (m, new_x, new_y); tmp != NULL; tmp = tmp->above)	702	for (tmp = GET_MAP_OB (m, new_x, new_y); tmp != NULL; tmp = tmp->above)
775	if (QUERY_FLAG (tmp, FLAG_ALIVE))	703	if (QUERY_FLAG (tmp, FLAG_ALIVE))
776	break;	704	break;
777
778		705
779	/* Not really fair, but don't let monsters hit themselves with	706	/* Not really fair, but don't let monsters hit themselves with
780	* their own arrow - this can be because they fire it then	707	* their own arrow - this can be because they fire it then
781	* move into it.	708	* move into it.
782	*/	709	*/
783
784	if (tmp != NULL && tmp != op->owner)	710	if (tmp && tmp != op->owner)
785	{	711	{
786	/* Found living object, but it is reflecting the missile. Update	712	/* Found living object, but it is reflecting the missile. Update
787	* as below. (Note that for living creatures there is a small	713	* as below. (Note that for living creatures there is a small
788	* chance that reflect_missile fails.)	714	* chance that reflect_missile fails.)
789	*/	715	*/
790
791	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE) && (rndm (0, 99)) < (90 - op->level / 10))	716	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE) && (rndm (0, 99)) < (90 - op->level / 10))
792	{	717	{
793
794	int number = op->face->number;	718	int number = op->face;
795		719
796	op->direction = absdir (op->direction + 4);	720	op->direction = absdir (op->direction + 4);
797	op->state = 0;	721	update_turn_face (op);
798	if (GET_ANIM_ID (op))
799	{
800	number += 4;
801	if (number > GET_ANIMATION (op, 8))
802	number -= 8;
803	op->face = &new_faces[number];
804	}
805	was_reflected = 1; /* skip normal movement calculations */	722	was_reflected = 1; /* skip normal movement calculations */
806	}	723	}
807	else	724	else
808	{	725	{
809	/* Attack the object. */	726	/* Attack the object. */
810	op = hit_with_arrow (op, tmp);	727	op = hit_with_arrow (op, tmp);
		728
811	if (op == NULL)	729	if (!op)
812	return;	730	return;
813	}	731	}
814	} /* if this is not hitting its owner */	732	} /* if this is not hitting its owner */
815	} /* if there is something alive on this space */	733	} /* if there is something alive on this space */
816
817		734
818	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))	735	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
819	{	736	{
820	int retry = 0;	737	int retry = 0;
821		738
…		…
843	* that did the same thing.	760	* that did the same thing.
844	*/	761	*/
845	while (retry < 2)	762	while (retry < 2)
846	{	763	{
847	int left, right, mflags;	764	int left, right, mflags;
848	mapstruct *m1;	765	maptile *m1;
849	sint16 x1, y1;	766	sint16 x1, y1;
850		767
851	retry++;	768	retry++;
852		769
853	/* Need to check for P_OUT_OF_MAP: if the arrow is tavelling	770	/* Need to check for P_OUT_OF_MAP: if the arrow is tavelling
…		…
893	SET_ANIMATION (op, op->direction);	810	SET_ANIMATION (op, op->direction);
894	} /* object is reflected */	811	} /* object is reflected */
895	} /* object ran into a wall */	812	} /* object ran into a wall */
896		813
897	/* Move the arrow. */	814	/* Move the arrow. */
898	remove_ob (op);	815	op->remove ();
899	op->x = new_x;	816	op->x = new_x;
900	op->y = new_y;	817	op->y = new_y;
901		818
902	/* decrease the speed as it flies. 0.05 means a standard bow will shoot	819	/* decrease the speed as it flies. 0.05 means a standard bow will shoot
903	* about 17 squares. Tune as needed.	820	* about 17 squares. Tune as needed.
…		…
911	* Modified this routine to allow held objects. b.t. */	828	* Modified this routine to allow held objects. b.t. */
912		829
913	void	830	void
914	change_object (object *op)	831	change_object (object *op)
915	{ /* Doesn`t handle linked objs yet */	832	{ /* Doesn`t handle linked objs yet */
916	object tmp, env, *pl;
917	int i, j;	833	int i, j;
918		834
919	if (op->other_arch == NULL)	835	if (op->other_arch == NULL)
920	{	836	{
921	LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name);	837	LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name);
…		…
928	if (op->stats.food-- > 0)	844	if (op->stats.food-- > 0)
929	return;	845	return;
930	else	846	else
931	op->stats.food = 1; /* so 1 other_arch is made */	847	op->stats.food = 1; /* so 1 other_arch is made */
932	}	848	}
		849
		850	object *pl = op->in_player ();
933	env = op->env;	851	object *env = op->env;
934	remove_ob (op);	852
		853	op->remove ();
935	for (i = 0; i < NROFNEWOBJS (op); i++)	854	for (i = 0; i < NROFNEWOBJS (op); i++)
936	{	855	{
937	tmp = arch_to_object (op->other_arch);	856	object *tmp = arch_to_object (op->other_arch);
		857
938	if (op->type == LAMP)	858	if (op->type == LAMP)
939	tmp->stats.food = op->stats.food - 1;	859	tmp->stats.food = op->stats.food - 1;
		860
940	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */	861	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
941	if (env)	862	if (env)
942	{	863	{
943	tmp->x = env->x, tmp->y = env->y;	864	tmp->x = env->x, tmp->y = env->y;
944	tmp = insert_ob_in_ob (tmp, env);	865	tmp = insert_ob_in_ob (tmp, env);
		866
945	/* If this object is the players inventory, we need to tell the	867	/* If this object is the players inventory, we need to tell the
946	* client of the change. Insert_ob_in_map takes care of the	868	* client of the change. Insert_ob_in_map takes care of the
947	* updating the client, so we don't need to do that below.	869	* updating the client, so we don't need to do that below.
948	*/	870	*/
949	if ((pl = is_player_inv (env)) != NULL)	871	if (pl)
950	{	872	{
951	esrv_del_item (pl->contr, op->count);	873	esrv_del_item (pl->contr, op->count);
952	esrv_send_item (pl, tmp);	874	esrv_send_item (pl, tmp);
953	}	875	}
954	}	876	}
955	else	877	else
956	{	878	{
957	j = find_first_free_spot (tmp, op->map, op->x, op->y);	879	j = find_first_free_spot (tmp, op->map, op->x, op->y);
958	if (j == -1) /* No free spot */	880	if (j == -1) /* No free spot */
959	free_object (tmp);	881	tmp->destroy ();
960	else	882	else
961	{	883	{
962	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];	884	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
963	insert_ob_in_map (tmp, op->map, op, 0);	885	insert_ob_in_map (tmp, op->map, op, 0);
964	}	886	}
965	}	887	}
966	}	888	}
967	free_object (op);	889
		890	op->destroy ();
968	}	891	}
969		892
970	void	893	void
971	move_teleporter (object *op)	894	move_teleporter (object *op)
972	{	895	{
…		…
977	* there is an old multipart teleporter in which the other parts	900	* there is an old multipart teleporter in which the other parts
978	* have speed, we don't really want to call it twice for the same	901	* have speed, we don't really want to call it twice for the same
979	* function - in fact, as written below, part N would get called	902	* function - in fact, as written below, part N would get called
980	* N times without the speed check.	903	* N times without the speed check.
981	*/	904	*/
982	if (op->more && FABS (op->more->speed) < MIN_ACTIVE_SPEED)	905	if (op->more && !op->more->has_active_speed ())
983	move_teleporter (op->more);	906	move_teleporter (op->more);
984		907
985	if (op->head)	908	if (op->head)
986	head = op->head;	909	head = op->head;
987		910
…		…
998	if (tmp->type == PLAYER)	921	if (tmp->type == PLAYER)
999	{	922	{
1000	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))	923	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
1001	return;	924	return;
1002		925
1003	enter_exit (tmp, head);	926	tmp->enter_exit (head);
1004	}	927	}
1005	else	928	else
1006	/* Currently only players can transfer maps */	929	/* Currently only players can transfer maps */
1007	return;	930	return;
1008	}	931	}
1009	else if (EXIT_X (head) \|\| EXIT_Y (head))	932	else if (EXIT_X (head) \|\| EXIT_Y (head))
1010	{	933	{
1011	if (out_of_map (head->map, EXIT_X (head), EXIT_Y (head)))	934	if (out_of_map (head->map, EXIT_X (head), EXIT_Y (head)))
1012	{	935	{
1013	LOG (llevError, "Removed illegal teleporter.\n");	936	LOG (llevError, "Removed illegal teleporter.\n");
1014	remove_ob (head);	937	head->destroy ();
1015	free_object (head);
1016	return;	938	return;
1017	}	939	}
		940
1018	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))	941	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
1019	return;	942	return;
		943
1020	transfer_ob (tmp, EXIT_X (head), EXIT_Y (head), 0, head);	944	transfer_ob (tmp, EXIT_X (head), EXIT_Y (head), 0, head);
1021	}	945	}
1022	else	946	else
1023	{	947	{
1024	/* Random teleporter */	948	/* Random teleporter */
…		…
1032	/* This object will teleport someone to a different map	956	/* This object will teleport someone to a different map
1033	and will also apply changes to the player from its inventory.	957	and will also apply changes to the player from its inventory.
1034	This was invented for giving classes, but there's no reason it	958	This was invented for giving classes, but there's no reason it
1035	can't be generalized.	959	can't be generalized.
1036	*/	960	*/
1037
1038	void	961	void
1039	move_player_changer (object *op)	962	move_player_changer (object *op)
1040	{	963	{
1041	object *player;	964	object *player;
1042	object *walk;	965	object *walk;
1043	char c;
1044		966
1045	if (!op->above \|\| !EXIT_PATH (op))	967	if (!op->above \|\| !EXIT_PATH (op))
1046	return;	968	return;
1047		969
1048	/* This isn't all that great - means that the player_mover	970	/* This isn't all that great - means that the player_mover
1049	* needs to be on top.	971	* needs to be on top.
1050	*/	972	*/
1051	if (op->above->type == PLAYER)	973	if (op->above->type == PLAYER)
1052	{	974	{
1053	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))	975	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))
1054	return;	976	return;
		977
1055	player = op->above;	978	player = op->above;
1056		979
1057	for (walk = op->inv; walk != NULL; walk = walk->below)	980	for (walk = op->inv; walk; walk = walk->below)
1058	apply_changes_to_player (player, walk);	981	apply_changes_to_player (player, walk);
1059		982
1060	fix_player (player);	983	player->update_stats ();
1061		984
1062	esrv_send_inventory (op->above, op->above);	985	esrv_send_inventory (op->above, op->above);
1063	esrv_update_item (UPD_FACE, op->above, op->above);	986	esrv_update_item (UPD_FACE, op->above, op->above);
1064		987
1065	/* update players death & WoR home-position */	988	/* update players death & WoR home-position */
1066	sscanf (EXIT_PATH (op), "%c", &c);	989	if (*EXIT_PATH (op) == '/')
1067	if (c == '/')
1068	{	990	{
1069	strcpy (player->contr->savebed_map, EXIT_PATH (op));	991	player->contr->savebed_map = EXIT_PATH (op);
1070	player->contr->bed_x = EXIT_X (op);	992	player->contr->bed_x = EXIT_X (op);
1071	player->contr->bed_y = EXIT_Y (op);	993	player->contr->bed_y = EXIT_Y (op);
1072	}	994	}
1073	else	995	else
1074	LOG (llevDebug, "WARNING: destination '%s' in player_changer must be an absolute path!\n", &EXIT_PATH (op));	996	LOG (llevDebug, "WARNING: destination '%s' in player_changer must be an absolute path!\n", &EXIT_PATH (op));
1075		997
1076	enter_exit (op->above, op);	998	op->above->enter_exit (op);
1077	save_player (player, 1);
1078	}	999	}
1079	}	1000	}
1080		1001
1081	/* firewalls fire other spells.	1002	/* firewalls fire other spells.
1082	* The direction of the wall is stored in op->stats.sp.	1003	* The direction of the wall is stored in op->stats.sp.
…		…
1089		1010
1090	if (!op->map)	1011	if (!op->map)
1091	return; /* dm has created a firewall in his inventory */	1012	return; /* dm has created a firewall in his inventory */
1092		1013
1093	spell = op->inv;	1014	spell = op->inv;
		1015
1094	if (!spell \|\| spell->type != SPELL)	1016	if (!spell \|\| spell->type != SPELL)
1095	spell = &op->other_arch->clone;	1017	spell = &op->other_arch->clone;
		1018
1096	if (!spell)	1019	if (!spell)
1097	{	1020	{
1098	LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, op->map->name, op->x, op->y);	1021	LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
1099	return;	1022	return;
1100	}	1023	}
1101		1024
1102	cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);	1025	cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);
1103	}	1026	}
1104
1105		1027
1106	/* move_player_mover: this function takes a "player mover" as an	1028	/* move_player_mover: this function takes a "player mover" as an
1107	* argument, and performs the function of a player mover, which is:	1029	* argument, and performs the function of a player mover, which is:
1108	*	1030	*
1109	* a player mover finds any players that are sitting on it. It	1031	* a player mover finds any players that are sitting on it. It
…		…
1116	move_player_mover (object *op)	1038	move_player_mover (object *op)
1117	{	1039	{
1118	object victim, nextmover;	1040	object victim, nextmover;
1119	int dir = op->stats.sp;	1041	int dir = op->stats.sp;
1120	sint16 nx, ny;	1042	sint16 nx, ny;
1121	mapstruct *m;	1043	maptile *m;
1122		1044
1123	/* Determine direction now for random movers so we do the right thing */	1045	/* Determine direction now for random movers so we do the right thing */
1124	if (!dir)	1046	if (!dir)
1125	dir = rndm (1, 8);	1047	dir = rndm (1, 8);
1126		1048
1127	for (victim = get_map_ob (op->map, op->x, op->y); victim != NULL; victim = victim->above)	1049	for (victim = GET_MAP_OB (op->map, op->x, op->y); victim != NULL; victim = victim->above)
1128	{	1050	{
1129	if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&	1051	if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&
1130	(victim->move_type & op->move_type \|\| !victim->move_type))	1052	(victim->move_type & op->move_type \|\| !victim->move_type))
1131	{	1053	{
1132		1054
1133	if (victim->head)	1055	if (victim->head)
1134	victim = victim->head;	1056	victim = victim->head;
1135		1057
1136	if (QUERY_FLAG (op, FLAG_LIFESAVE) && op->stats.hp-- < 0)	1058	if (QUERY_FLAG (op, FLAG_LIFESAVE) && op->stats.hp-- < 0)
1137	{	1059	{
1138	remove_ob (op);	1060	op->remove ();
1139	free_object (op);
1140	return;	1061	return;
1141	}	1062	}
		1063
1142	nx = op->x + freearr_x[dir];	1064	nx = op->x + freearr_x[dir];
1143	ny = op->y + freearr_y[dir];	1065	ny = op->y + freearr_y[dir];
1144	m = op->map;	1066	m = op->map;
1145	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)	1067	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
1146	{	1068	{
1147	LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", m->path, op->x, op->y);	1069	LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
1148	return;	1070	return;
1149	}	1071	}
1150		1072
1151	if (should_director_abort (op, victim))	1073	if (should_director_abort (op, victim))
1152	return;	1074	return;
1153		1075
1154	for (nextmover = get_map_ob (m, nx, ny); nextmover != NULL; nextmover = nextmover->above)	1076	for (nextmover = GET_MAP_OB (m, nx, ny); nextmover != NULL; nextmover = nextmover->above)
1155	{	1077	{
1156	if (nextmover->type == PLAYERMOVER)	1078	if (nextmover->type == PLAYERMOVER)
1157	nextmover->speed_left = -.99;	1079	nextmover->speed_left = -.99;
1158	if (QUERY_FLAG (nextmover, FLAG_ALIVE))	1080	if (QUERY_FLAG (nextmover, FLAG_ALIVE))
1159	{	1081	{
…		…
1213	{	1135	{
1214	object *tmp;	1136	object *tmp;
1215		1137
1216	if (!op->other_arch)	1138	if (!op->other_arch)
1217	{	1139	{
1218	LOG (llevInfo, "Duplicator with no other_arch! %d %d %s\n", op->x, op->y, op->map ? op->map->path : "nullmap");	1140	LOG (llevInfo, "Duplicator with no other_arch! %d %d %s\n", op->x, op->y, op->map ? &op->map->path : "nullmap");
1219	return;	1141	return;
1220	}	1142	}
1221		1143
1222	if (op->above == NULL)	1144	if (op->above == NULL)
1223	return;	1145	return;
		1146
1224	for (tmp = op->above; tmp != NULL; tmp = tmp->above)	1147	for (tmp = op->above; tmp; tmp = tmp->above)
1225	{	1148	{
1226	if (strcmp (op->other_arch->name, tmp->arch->name) == 0)	1149	if (op->other_arch->name == tmp->arch->name)
1227	{	1150	{
1228	if (op->level <= 0)	1151	if (op->level <= 0)
1229	{	1152	tmp->destroy ();
1230	remove_ob (tmp);
1231	free_object (tmp);
1232	}
1233	else	1153	else
1234	{	1154	{
1235	uint64 new_nrof = (uint64) tmp->nrof * op->level;	1155	uint64 new_nrof = (uint64) tmp->nrof * op->level;
1236		1156
1237	if (new_nrof >= 1UL << 31)	1157	if (new_nrof >= 1UL << 31)
1238	new_nrof = 1UL << 31;	1158	new_nrof = 1UL << 31;
		1159
1239	tmp->nrof = new_nrof;	1160	tmp->nrof = new_nrof;
1240	}	1161	}
		1162
1241	break;	1163	break;
1242	}	1164	}
1243	}	1165	}
1244	}	1166	}
1245		1167
…		…
1289	}	1211	}
1290	else	1212	else
1291	{	1213	{
1292	if (creator->other_arch == NULL)	1214	if (creator->other_arch == NULL)
1293	{	1215	{
1294	LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n", &creator->name, creator->map->path,	1216	LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",
1295	creator->x, creator->y);	1217	&creator->name, &creator->map->path, creator->x, creator->y);
1296	return;	1218	return;
1297	}	1219	}
1298		1220
1299	new_ob = object_create_arch (creator->other_arch);	1221	new_ob = object_create_arch (creator->other_arch);
1300	fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);	1222	fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);
1301	}	1223	}
1302		1224
1303	/* Make sure this multipart object fits */	1225	/* Make sure this multipart object fits */
1304	if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y))	1226	if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y))
1305	{	1227	{
1306	free_object (new_ob);	1228	new_ob->destroy ();
1307	return;	1229	return;
1308	}	1230	}
1309		1231
1310	insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);	1232	insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
1311	if (QUERY_FLAG (new_ob, FLAG_FREED))	1233	if (QUERY_FLAG (new_ob, FLAG_FREED))
…		…
1323	with a specific code as the slaying field.	1245	with a specific code as the slaying field.
1324	At that time, it writes the contents of its own message	1246	At that time, it writes the contents of its own message
1325	field to the player. The marker will decrement hp to	1247	field to the player. The marker will decrement hp to
1326	0 and then delete itself every time it grants a mark.	1248	0 and then delete itself every time it grants a mark.
1327	unless hp was zero to start with, in which case it is infinite.*/	1249	unless hp was zero to start with, in which case it is infinite.*/
1328
1329	void	1250	void
1330	move_marker (object *op)	1251	move_marker (object *op)
1331	{	1252	{
		1253	if (object *tmp = op->ms ().player ())
		1254	{
1332	object tmp, tmp2;	1255	object *tmp2;
1333		1256
1334	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1335	{
1336	if (tmp->type == PLAYER)
1337	{ /* we've got someone to MARK */
1338
1339	/* remove an old force with a slaying field == op->name */	1257	/* remove an old force with a slaying field == op->name */
1340	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)	1258	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
		1259	if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->name)
1341	{	1260	{
1342	if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->name))	1261	tmp2->destroy ();
1343	break;	1262	break;
1344	}	1263	}
1345		1264
1346	if (tmp2)
1347	{
1348	remove_ob (tmp2);
1349	free_object (tmp2);
1350	}
1351
1352	/* cycle through his inventory to look for the MARK we want to	1265	/* cycle through his inventory to look for the MARK we want to
1353	* place	1266	* place
1354	*/	1267	*/
1355	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)	1268	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1356	{
1357	if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->slaying))	1269	if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
1358	break;	1270	break;
1359	}
1360		1271
1361	/* if we didn't find our own MARK */	1272	/* if we didn't find our own MARK */
1362	if (tmp2 == NULL)	1273	if (!tmp2)
1363	{	1274	{
1364	object *force = get_archetype (FORCE_NAME);	1275	object *force = get_archetype (FORCE_NAME);
1365		1276
1366	force->speed = 0;
1367	if (op->stats.food)	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)
		1293	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, tmp, op->msg);
		1294
		1295	if (op->stats.hp > 0)
		1296	{
		1297	op->stats.hp--;
		1298	if (op->stats.hp == 0)
1368	{	1299	{
1369	force->speed = 0.01;	1300	/* marker expires--granted mark number limit */
1370	force->speed_left = -op->stats.food;	1301	op->destroy ();
		1302	return;
1371	}	1303	}
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	remove_ob (op);
1390	free_object (op);
1391	return;
1392	}
1393	}	1304	}
1394	} /* if tmp2 == NULL */	1305	}
1395	} /* if tmp->type == PLAYER */	1306	}
1396	} /* For all objects on this space */
1397	}	1307	}
1398		1308
1399	int	1309	int
1400	process_object (object *op)	1310	process_object (object *op)
1401	{	1311	{
…		…
1434	if (QUERY_FLAG (op, FLAG_APPLIED))	1344	if (QUERY_FLAG (op, FLAG_APPLIED))
1435	remove_force (op);	1345	remove_force (op);
1436	else	1346	else
1437	{	1347	{
1438	/* IF necessary, delete the item from the players inventory */	1348	/* IF necessary, delete the item from the players inventory */
1439	object *pl = is_player_inv (op);	1349	object *pl = op->in_player ();
1440		1350
1441	if (pl)	1351	if (pl)
1442	esrv_del_item (pl->contr, op->count);	1352	esrv_del_item (pl->contr, op->count);
1443		1353
1444	remove_ob (op);	1354	op->remove ();
1445		1355
1446	if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))	1356	if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1447	make_sure_not_seen (op);	1357	make_sure_not_seen (op);
1448		1358
1449	free_object (op);	1359	op->destroy ();
1450	}	1360	}
1451		1361
1452	return 1;	1362	return 1;
1453	}	1363	}
1454		1364
…		…
1485	return 0;	1395	return 0;
1486		1396
1487	case THROWN_OBJ:	1397	case THROWN_OBJ:
1488	case ARROW:	1398	case ARROW:
1489	move_arrow (op);	1399	move_arrow (op);
1490	return 0;
1491
1492	case LIGHTNING: /* It now moves twice as fast */
1493	move_bolt (op);
1494	return 0;	1400	return 0;
1495		1401
1496	case DOOR:	1402	case DOOR:
1497	remove_door (op);	1403	remove_door (op);
1498	return 0;	1404	return 0;

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.12 by root, Thu Sep 14 22:34:05 2006 UTC vs. Revision 1.45 by root, Sun Apr 22 13:06:45 2007 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.12 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.45 by root, Sun Apr 22 13:06:45 2007 UTC