ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/spell_attack.C

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.13 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.55 by root, Sat May 17 00:17:02 2008 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* This file contains all the spell attack code. Grouping this code	24	/* This file contains all the spell attack code. Grouping this code
25	* together should hopefully make it easier to find the relevent bits	25	* together should hopefully make it easier to find the relevent bits
26	* of code	26	* of code
27	*/	27	*/
28		28
29	#include <global.h>	29	#include <global.h>
30	#include <object.h>	30	#include <object.h>
31	#include <living.h>	31	#include <living.h>
32	#ifndef __CEXTRACT__
33	# include <sproto.h>	32	#include <sproto.h>
34	#endif
35	#include <spells.h>	33	#include <spells.h>
36	#include <sounds.h>	34	#include <sounds.h>
37		35
38	/* this function checks to see if a spell pushes objects as well	36	/* this function checks to see if a spell pushes objects as well
39	* as flies over and damages them (only used for cones for now)	37	* as flies over and damages them (only used for cones for now)
…		…
57	{	55	{
58	weight_move = op->weight + (op->weight * op->level) / 3;	56	weight_move = op->weight + (op->weight * op->level) / 3;
59	/*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */	57	/*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60	}	58	}
61		59
62	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	60	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
63	{	61	{
64	int num_sections = 1;	62	int num_sections = 1;
65		63
66	/* don't move DM */	64	/* don't move DM */
67	if (QUERY_FLAG (tmp, FLAG_WIZ))	65	if (QUERY_FLAG (tmp, FLAG_WIZ))
…		…
117	void	115	void
118	forklightning (object *op, object *tmp)	116	forklightning (object *op, object *tmp)
119	{	117	{
120	int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */	118	int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
121	int t_dir; /* stores temporary dir calculation */	119	int t_dir; /* stores temporary dir calculation */
122	mapstruct *m;	120	maptile *m;
123	sint16 sx, sy;	121	sint16 sx, sy;
124	object *new_bolt;	122	object *new_bolt;
125		123
126	/* pick a fork direction. tmp->stats.Con is the left bias	124	/* pick a fork direction. tmp->stats.Con is the left bias
127	* i.e., the chance in 100 of forking LEFT	125	* i.e., the chance in 100 of forking LEFT
…		…
140		138
141	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))	139	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142	return;	140	return;
143		141
144	/* OK, we made a fork */	142	/* OK, we made a fork */
145	new_bolt = get_object ();	143	new_bolt = tmp->clone ();
146	copy_object (tmp, new_bolt);
147		144
148	/* reduce chances of subsequent forking */	145	/* reduce chances of subsequent forking */
149	new_bolt->stats.Dex -= 10;	146	new_bolt->stats.Dex -= 10;
150	tmp->stats.Dex -= 10; /* less forks from main bolt too */	147	tmp->stats.Dex -= 10; /* less forks from main bolt too */
151	new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */	148	new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
152	new_bolt->speed_left = -0.1;	149	new_bolt->speed_left = -0.1f;
153	new_bolt->direction = t_dir;	150	new_bolt->direction = t_dir;
154	new_bolt->duration++;	151	new_bolt->duration++;
155	new_bolt->x = sx;
156	new_bolt->y = sy;
157	new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */	152	new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
158	new_bolt->stats.dam++;	153	new_bolt->stats.dam++;
159	tmp->stats.dam /= 2; /* reduce father bolt damage */	154	tmp->stats.dam /= 2; /* reduce father bolt damage */
160	tmp->stats.dam++;	155	tmp->stats.dam++;
161	new_bolt = insert_ob_in_map (new_bolt, m, op, 0);	156	if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
162	update_turn_face (new_bolt);	157	update_turn_face (new_bolt);
163	}	158	}
164		159
165	/* move_bolt: moves bolt 'op'. Basically, it just advances a space,	160	/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
166	* and checks for various things that may stop it.	161	* and checks for various things that may stop it.
167	*/	162	*/
168		163
169	void	164	void
170	move_bolt (object *op)	165	move_bolt (object *op)
171	{	166	{
172	object *tmp;
173	int mflags;	167	int mflags;
174	sint16 x, y;	168	sint16 x, y;
175	mapstruct *m;	169	maptile *m;
176		170
177	if (--(op->duration) < 0)	171	if (--op->duration < 0)
178	{	172	{
179	remove_ob (op);	173	op->destroy ();
180	free_object (op);
181	return;	174	return;
182	}	175	}
183		176
184	hit_map (op, 0, op->attacktype, 1);	177	hit_map (op, 0, op->attacktype, 1);
185		178
186	if (!op->direction)	179	if (!op->direction)
187	return;	180	return;
188		181
189	if (--op->range < 0)	182	if (--op->range < 0)
190	{
191	op->range = 0;	183	op->range = 0;
192	}
193	else	184	else
194	{	185	{
195	x = op->x + DIRX (op);	186	x = op->x + DIRX (op);
196	y = op->y + DIRY (op);	187	y = op->y + DIRY (op);
197	m = op->map;	188	m = op->map;
…		…
205	* on the space. So only call reflwall if we think the data it returns	196	* on the space. So only call reflwall if we think the data it returns
206	* will be useful.	197	* will be useful.
207	*/	198	*/
208	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))	199	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
209	{	200	{
210
211	if (!QUERY_FLAG (op, FLAG_REFLECTING))	201	if (!QUERY_FLAG (op, FLAG_REFLECTING))
212	return;	202	return;
213		203
214	/* Since walls don't run diagonal, if the bolt is in	204	/* Since walls don't run diagonal, if the bolt is in
215	* one of 4 main directions, it just reflects back in the	205	* one of 4 main directions, it just reflects back in the
…		…
245	else if (left)	235	else if (left)
246	op->direction = absdir (op->direction + 2);	236	op->direction = absdir (op->direction + 2);
247	else if (right)	237	else if (right)
248	op->direction = absdir (op->direction - 2);	238	op->direction = absdir (op->direction - 2);
249	}	239	}
		240
250	update_turn_face (op); /* A bolt *must* be IS_TURNABLE */	241	update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
251	return;	242	return;
252	}	243	}
253	else	244	else
254	{ /* Create a copy of this object and put it ahead */	245	{ /* Create a copy of this object and put it ahead */
255	tmp = get_object ();	246	object *tmp = op->clone ();
256	copy_object (op, tmp);	247
		248	m->insert (tmp, x, y, op);
257	tmp->speed_left = -0.1;	249	tmp->speed_left = -0.1f;
258	tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
259	tmp = insert_ob_in_map (tmp, op->map, op, 0);
260	/* To make up for the decrease at the top of the function */	250	/* To make up for the decrease at the top of the function */
261	tmp->duration++;	251	tmp->duration++;
262		252
263	/* New forking code. Possibly create forks of this object	253	/* New forking code. Possibly create forks of this object
264	* going off in other directions.	254	* going off in other directions.
265	*/	255	*/
266
267	if (rndm (0, 99) < tmp->stats.Dex)	256	if (rndm (0, 99) < tmp->stats.Dex)
268	{ /* stats.Dex % of forking */	257	{ /* stats.Dex % of forking */
269	forklightning (op, tmp);	258	forklightning (op, tmp);
270	}	259	}
		260
271	/* In this way, the object left behind sticks on the space, but	261	/* In this way, the object left behind sticks on the space, but
272	* doesn't create any bolts that continue to move onward.	262	* doesn't create any bolts that continue to move onward.
273	*/	263	*/
274	op->range = 0;	264	op->range = 0;
275	} /* copy object and move it along */	265	} /* copy object and move it along */
…		…
282	* we remove the magic flag - that can be derived from	272	* we remove the magic flag - that can be derived from
283	* spob->attacktype.	273	* spob->attacktype.
284	* This function sets up the appropriate owner and skill	274	* This function sets up the appropriate owner and skill
285	* pointers.	275	* pointers.
286	*/	276	*/
287
288	int	277	int
289	fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)	278	fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
290	{	279	{
291	object *tmp = NULL;	280	object *tmp = NULL;
292	int mflags;	281	int mflags;
…		…
310		299
311	tmp->direction = dir;	300	tmp->direction = dir;
312	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	301	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
313	SET_ANIMATION (tmp, dir);	302	SET_ANIMATION (tmp, dir);
314		303
315	set_owner (tmp, op);	304	tmp->set_owner (op);
316	set_spell_skill (op, caster, spob, tmp);	305	set_spell_skill (op, caster, spob, tmp);
317		306
318	tmp->x = op->x + DIRX (tmp);	307	tmp->x = op->x + DIRX (tmp);
319	tmp->y = op->y + DIRY (tmp);	308	tmp->y = op->y + DIRY (tmp);
320	tmp->map = op->map;	309	tmp->map = op->map;
321		310
		311	maptile *newmap;
322	mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);	312	mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
323	if (mflags & P_OUT_OF_MAP)	313	if (mflags & P_OUT_OF_MAP)
324	{	314	{
325	free_object (tmp);	315	tmp->destroy ();
326	return 0;	316	return 0;
327	}	317	}
		318
		319	tmp->map = newmap;
		320
328	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	321	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
329	{	322	{
330	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	323	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331	{	324	{
332	free_object (tmp);	325	tmp->destroy ();
333	return 0;	326	return 0;
334	}	327	}
		328
335	tmp->x = op->x;	329	tmp->x = op->x;
336	tmp->y = op->y;	330	tmp->y = op->y;
337	tmp->direction = absdir (tmp->direction + 4);	331	tmp->direction = absdir (tmp->direction + 4);
338	tmp->map = op->map;	332	tmp->map = op->map;
339	}	333	}
340	if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)	334
		335	if ((tmp = tmp->insert_at (tmp, op)))
341	move_bolt (tmp);	336	move_bolt (tmp);
		337
342	return 1;	338	return 1;
343	}	339	}
344
345
346		340
347	/***************************************************************************	341	/***************************************************************************
348	*	342	*
349	* BULLET/BALL CODE	343	* BULLET/BALL CODE
350	*	344	*
351	***************************************************************************/	345	***************************************************************************/
352		346
353	/* expands an explosion. op is a piece of the	347	/* expands an explosion. op is a piece of the
354	* explosion - this expans it in the different directions.	348	* explosion - this expands it in the different directions.
355	* At least that is what I think this does.	349	* At least that is what I think this does.
356	*/	350	*/
357	void	351	void
358	explosion (object *op)	352	explosion (object *op)
359	{	353	{
360	object *tmp;
361	mapstruct *m = op->map;	354	maptile *m = op->map;
362	int i;	355	int i;
363		356
364	if (--(op->duration) < 0)	357	if (--op->duration < 0)
365	{
366	remove_ob (op);
367	free_object (op);
368	return;
369	}	358	{
		359	op->destroy ();
		360	return;
		361	}
		362
370	hit_map (op, 0, op->attacktype, 0);	363	hit_map (op, 0, op->attacktype, 0);
371		364
372	if (op->range > 0)	365	if (op->range > 0)
373	{	366	{
374	for (i = 1; i < 9; i++)	367	for (i = 1; i < 9; i++)
375	{	368	{
376	sint16 dx, dy;	369	sint16 dx, dy;
377		370
378	dx = op->x + freearr_x[i];	371	dx = op->x + freearr_x[i];
379	dy = op->y + freearr_y[i];	372	dy = op->y + freearr_y[i];
		373
380	/* ok_to_put_more already does things like checks for walls,	374	/* ok_to_put_more already does things like checks for walls,
381	* out of map, etc.	375	* out of map, etc.
382	*/	376	*/
383	if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))	377	if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
384	{	378	{
385	tmp = get_object ();	379	object *tmp = op->clone ();
386	copy_object (op, tmp);	380
387	tmp->state = 0;	381	tmp->state = 0;
388	tmp->speed_left = -0.21;	382	tmp->speed_left = -0.21f;
389	tmp->range--;	383	tmp->range--;
390	tmp->value = 0;	384	tmp->value = 0;
391	tmp->x = dx;	385
392	tmp->y = dy;	386	m->insert (tmp, dx, dy, op);
393	insert_ob_in_map (tmp, m, op, 0);
394	}	387	}
395	}	388	}
396	}	389	}
397	}	390	}
398
399		391
400	/* Causes an object to explode, eg, a firebullet,	392	/* Causes an object to explode, eg, a firebullet,
401	* poison cloud ball, etc. op is the object to	393	* poison cloud ball, etc. op is the object to
402	* explode.	394	* explode.
403	*/	395	*/
404	void	396	void
405	explode_bullet (object *op)	397	explode_bullet (object *op)
406	{	398	{
407	tag_t op_tag = op->count;
408	object *tmp, *owner;	399	object *tmp, *owner;
409		400
410	if (op->other_arch == NULL)	401	if (op->other_arch == NULL)
411	{	402	{
412	LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");	403	LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
413	remove_ob (op);	404	op->destroy ();
414	free_object (op);
415	return;	405	return;
416	}	406	}
417		407
418	if (op->env)	408	if (op->env)
419	{	409	{
420	object *env;	410	object *env = op->outer_env ();
421		411
422	env = object_get_env_recursive (op);
423	if (env->map == NULL || out_of_map (env->map, env->x, env->y))	412	if (!env->map || out_of_map (env->map, env->x, env->y))
424	{	413	{
425	LOG (llevError, "BUG: explode_bullet(): env out of map\n");	414	LOG (llevError, "BUG: explode_bullet(): env out of map\n");
426	remove_ob (op);	415	op->destroy ();
427	free_object (op);
428	return;	416	return;
429	}	417	}
430	remove_ob (op);	418
431	op->x = env->x;	419	op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
432	op->y = env->y;
433	insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
434	}	420	}
435	else if (out_of_map (op->map, op->x, op->y))	421	else if (out_of_map (op->map, op->x, op->y))
436	{	422	{
437	LOG (llevError, "BUG: explode_bullet(): op out of map\n");	423	LOG (llevError, "BUG: explode_bullet(): op out of map\n");
438	remove_ob (op);	424	op->destroy ();
439	free_object (op);
440	return;	425	return;
441	}	426	}
442		427
443	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps	428	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
444	// NOTE: If this breaks something important: remove this. I can't think of anything	429	// NOTE: If this breaks something important: remove this. I can't think of anything
445	// bad at the moment that might happen from this.	430	// bad at the moment that might happen from this.
446	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)	431	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
447	{	432	{
448	remove_ob (op);	433	op->destroy ();
449	free_object (op);
450	return;	434	return;
451	}	435	}
452		436
453	if (op->attacktype)	437	if (op->attacktype)
454	{	438	{
455	hit_map (op, 0, op->attacktype, 1);	439	hit_map (op, 0, op->attacktype, 1);
456	if (was_destroyed (op, op_tag))	440	if (op->destroyed ())
457	return;	441	return;
458	}	442	}
459		443
460	/* other_arch contains what this explodes into */	444	/* other_arch contains what this explodes into */
461	tmp = arch_to_object (op->other_arch);	445	tmp = arch_to_object (op->other_arch);
462		446
463	copy_owner (tmp, op);	447	tmp->set_owner (op);
464	tmp->skill = op->skill;	448	tmp->skill = op->skill;
465		449
466	owner = get_owner (op);	450	owner = op->owner;
467		451
468	if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))	452	if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
469	{	453	{
470	remove_ob (op);	454	op->destroy ();
471	free_object (op);
472	return;	455	return;
473	}	456	}
474
475	tmp->x = op->x;
476	tmp->y = op->y;
477		457
478	/* special for bombs - it actually has sane values for these */	458	/* special for bombs - it actually has sane values for these */
479	if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)	459	if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
480	{	460	{
481	tmp->attacktype = op->attacktype;	461	tmp->attacktype = op->attacktype;
…		…
485	}	465	}
486	else	466	else
487	{	467	{
488	if (op->attacktype & AT_MAGIC)	468	if (op->attacktype & AT_MAGIC)
489	tmp->attacktype |= AT_MAGIC;	469	tmp->attacktype |= AT_MAGIC;
		470
490	/* Spell doc describes what is going on here */	471	/* Spell doc describes what is going on here */
491	tmp->stats.dam = op->dam_modifier;	472	tmp->stats.dam = op->dam_modifier;
492	tmp->range = op->stats.maxhp;	473	tmp->range = op->stats.maxhp;
493	tmp->duration = op->stats.hp;	474	tmp->duration = op->stats.hp;
494	/* Used for spell tracking - just need a unique val for this spell -	475	/* Used for spell tracking - just need a unique val for this spell -
…		…
502	tmp->stats.sp = op->direction;	483	tmp->stats.sp = op->direction;
503		484
504	/* Prevent recursion */	485	/* Prevent recursion */
505	op->move_on = 0;	486	op->move_on = 0;
506		487
507	insert_ob_in_map (tmp, op->map, op, 0);	488	tmp->insert_at (op, op);
		489	tmp->play_sound (tmp->sound);
		490
508	/* remove the firebullet */	491	/* remove the firebullet */
509	if (!was_destroyed (op, op_tag))	492	op->destroy ();
510	{
511	remove_ob (op);
512	free_object (op);
513	}
514	}	493	}
515
516
517		494
518	/* checks to see what op should do, given the space it is on	495	/* checks to see what op should do, given the space it is on
519	* (eg, explode, damage player, etc)	496	* (eg, explode, damage player, etc)
520	*/	497	*/
521
522	void	498	void
523	check_bullet (object *op)	499	check_bullet (object *op)
524	{	500	{
525	tag_t op_tag = op->count, tmp_tag;
526	object *tmp;	501	object *tmp;
527	int dam, mflags;	502	int dam, mflags;
528	mapstruct *m;	503	maptile *m;
529	sint16 sx, sy;	504	sint16 sx, sy;
530		505
531	mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);	506	mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
532		507
533	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))	508	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
…		…
542		517
543	/* If nothing alive on this space, no reason to do anything further */	518	/* If nothing alive on this space, no reason to do anything further */
544	if (!(mflags & P_IS_ALIVE))	519	if (!(mflags & P_IS_ALIVE))
545	return;	520	return;
546		521
547	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	522	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
548	{	523	{
549	if (QUERY_FLAG (tmp, FLAG_ALIVE))	524	if (QUERY_FLAG (tmp, FLAG_ALIVE))
550	{	525	{
551	tmp_tag = tmp->count;
552	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);	526	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
553	if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0)	527	if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
554	{	528	{
555	if (!QUERY_FLAG (op, FLAG_REMOVED))	529	if (!QUERY_FLAG (op, FLAG_REMOVED))
556	{	530	{
557	remove_ob (op);	531	op->destroy ();
558	free_object (op);
559	return;	532	return;
560	}	533	}
561	}	534	}
562	}	535	}
563	}	536	}
564	}	537	}
565
566		538
567	/* Basically, we move 'op' one square, and if it hits something,	539	/* Basically, we move 'op' one square, and if it hits something,
568	* call check_bullet.	540	* call check_bullet.
569	* This function is only applicable to bullets, but not to all	541	* This function is only applicable to bullets, but not to all
570	* fired arches (eg, bolts).	542	* fired arches (eg, bolts).
571	*/	543	*/
572
573	void	544	void
574	move_bullet (object *op)	545	move_bullet (object *op)
575	{	546	{
576	sint16 new_x, new_y;	547	sint16 new_x, new_y;
577	int mflags;	548	int mflags;
578	mapstruct *m;	549	maptile *m;
579		550
580	#if 0	551	#if 0
581	/* We need a better general purpose way to do this */	552	/* We need a better general purpose way to do this */
582		553
583	/* peterm: added to make comet leave a trail of burnouts	554	/* peterm: added to make comet leave a trail of burnouts
584	it's an unadulterated hack, but the effect is cool. */	555	it's an unadulterated hack, but the effect is cool. */
585	if (op->stats.sp == SP_METEOR)	556	if (op->stats.sp == SP_METEOR)
586	{	557	{
587	replace_insert_ob_in_map ("fire_trail", op);	558	replace_insert_ob_in_map ("fire_trail", op);
588	if (was_destroyed (op, op_tag))	559	if (op->destroyed ())
589	return;	560	return;
590	} /* end addition. */	561	} /* end addition. */
591	#endif	562	#endif
592		563
593	/* Reached the end of its life - remove it */	564	/* Reached the end of its life - remove it */
594	if (--op->range <= 0)	565	if (--op->range <= 0)
595	{	566	{
596	if (op->other_arch)	567	if (op->other_arch)
597	{
598	explode_bullet (op);	568	explode_bullet (op);
599	}
600	else	569	else
601	{	570	op->destroy ();
602	remove_ob (op);	571
603	free_object (op);
604	}
605	return;	572	return;
606	}	573	}
607		574
608	new_x = op->x + DIRX (op);	575	new_x = op->x + DIRX (op);
609	new_y = op->y + DIRY (op);	576	new_y = op->y + DIRY (op);
610	m = op->map;	577	m = op->map;
611	mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);	578	mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
612		579
613	if (mflags & P_OUT_OF_MAP)	580	if (mflags & P_OUT_OF_MAP)
614	{	581	{
615	remove_ob (op);	582	op->destroy ();
616	free_object (op);
617	return;	583	return;
618	}	584	}
619		585
620	if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))	586	if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
621	{	587	{
622	if (op->other_arch)	588	if (op->other_arch)
623	{
624	explode_bullet (op);	589	explode_bullet (op);
625	}
626	else	590	else
627	{	591	op->destroy ();
628	remove_ob (op);
629	free_object (op);
630	}
631	return;
632	}
633		592
634	remove_ob (op);	593	return;
635	op->x = new_x;	594	}
636	op->y = new_y;	595
637	if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)	596	if (!(op = m->insert (op, new_x, new_y, op)))
638	return;	597	return;
639		598
640	if (reflwall (op->map, op->x, op->y, op))	599	if (reflwall (op->map, op->x, op->y, op))
641	{	600	{
642	op->direction = absdir (op->direction + 4);	601	op->direction = absdir (op->direction + 4);
643	update_turn_face (op);	602	update_turn_face (op);
644	}	603	}
645	else	604	else
646	{
647	check_bullet (op);	605	check_bullet (op);
648	}
649	}	606	}
650
651
652
653		607
654	/* fire_bullet	608	/* fire_bullet
655	* object op (cast from caster) files a bolt in dir.	609	* object op (cast from caster) files a bolt in dir.
656	* spob is the spell object for the bolt.	610	* spob is the spell object for the bolt.
657	* we remove the magic flag - that can be derived from	611	* we remove the magic flag - that can be derived from
658	* spob->attacktype.	612	* spob->attacktype.
659	* This function sets up the appropriate owner and skill	613	* This function sets up the appropriate owner and skill
660	* pointers.	614	* pointers.
661	*/	615	*/
662
663	int	616	int
664	fire_bullet (object *op, object *caster, int dir, object *spob)	617	fire_bullet (object *op, object *caster, int dir, object *spob)
665	{	618	{
666	object *tmp = NULL;	619	object *tmp = NULL;
667	int mflags;	620	int mflags;
668		621
669	if (!spob->other_arch)	622	if (!spob->other_arch)
670	return 0;	623	return 0;
671		624
672	tmp = arch_to_object (spob->other_arch);	625	tmp = spob->other_arch->instance ();
673	if (tmp == NULL)	626	if (!tmp)
674	return 0;	627	return 0;
675		628
676	/* peterm: level dependency for bolts */	629	/* peterm: level dependency for bolts */
677	tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);	630	tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
678	tmp->attacktype = spob->attacktype;	631	tmp->attacktype = spob->attacktype;
679	if (spob->slaying)	632	if (spob->slaying)
680	tmp->slaying = spob->slaying;	633	tmp->slaying = spob->slaying;
681		634
…		…
688		641
689	tmp->direction = dir;	642	tmp->direction = dir;
690	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	643	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
691	SET_ANIMATION (tmp, dir);	644	SET_ANIMATION (tmp, dir);
692		645
693	set_owner (tmp, op);	646	tmp->set_owner (op);
694	set_spell_skill (op, caster, spob, tmp);	647	set_spell_skill (op, caster, spob, tmp);
695		648
696	tmp->x = op->x + freearr_x[dir];	649	tmp->x = op->x + freearr_x[dir];
697	tmp->y = op->y + freearr_y[dir];	650	tmp->y = op->y + freearr_y[dir];
698	tmp->map = op->map;	651	tmp->map = op->map;
699		652
		653	maptile *newmap;
700	mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);	654	mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
701	if (mflags & P_OUT_OF_MAP)	655	if (mflags & P_OUT_OF_MAP)
702	{	656	{
703	free_object (tmp);	657	tmp->destroy ();
704	return 0;	658	return 0;
705	}	659	}
		660
		661	tmp->map = newmap;
		662
706	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	663	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
707	{	664	{
708	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	665	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
709	{	666	{
710	free_object (tmp);	667	tmp->destroy ();
711	return 0;	668	return 0;
712	}	669	}
		670
713	tmp->x = op->x;	671	tmp->x = op->x;
714	tmp->y = op->y;	672	tmp->y = op->y;
715	tmp->direction = absdir (tmp->direction + 4);	673	tmp->direction = absdir (tmp->direction + 4);
716	tmp->map = op->map;	674	tmp->map = op->map;
717	}	675	}
718	if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)	676
719	{	677	if ((tmp = tmp->insert_at (tmp, op)))
720	check_bullet (tmp);	678	check_bullet (tmp);
721	}	679
722	return 1;	680	return 1;
723	}	681	}
724
725
726
727		682
728	/*****************************************************************************	683	/*****************************************************************************
729	*	684	*
730	* CONE RELATED FUNCTIONS	685	* CONE RELATED FUNCTIONS
731	*	686	*
732	*****************************************************************************/	687	*****************************************************************************/
733		688
734
735	/* drops an object based on what is in the cone's "other_arch" */	689	/* drops an object based on what is in the cone's "other_arch" */
736	void	690	void
737	cone_drop (object *op)	691	cone_drop (object *op)
738	{	692	{
739	object *new_ob = arch_to_object (op->other_arch);	693	object *new_ob = arch_to_object (op->other_arch);
740		694
741	new_ob->x = op->x;
742	new_ob->y = op->y;
743	new_ob->level = op->level;	695	new_ob->level = op->level;
744	set_owner (new_ob, op->owner);	696	new_ob->set_owner (op->owner);
745		697
746	/* preserve skill ownership */	698	/* preserve skill ownership */
747	if (op->skill && op->skill != new_ob->skill)	699	if (op->skill && op->skill != new_ob->skill)
748	{
749	new_ob->skill = op->skill;	700	new_ob->skill = op->skill;
750	}
751	insert_ob_in_map (new_ob, op->map, op, 0);
752		701
		702	new_ob->insert_at (op, op);
753	}	703	}
754		704
755	/* move_cone: causes cone object 'op' to move a space/hit creatures */	705	/* move_cone: causes cone object 'op' to move a space/hit creatures */
756		706
757	void	707	void
758	move_cone (object *op)	708	move_cone (object *op)
759	{	709	{
760	int i;	710	int i;
761	tag_t tag;
762		711
763	/* if no map then hit_map will crash so just ignore object */	712	/* if no map then hit_map will crash so just ignore object */
764	if (!op->map)	713	if (!op->map)
765	{	714	{
766	LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");	715	LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
767	op->speed = 0;	716	op->set_speed (0);
768	update_ob_speed (op);
769	return;	717	return;
770	}	718	}
771		719
772	/* lava saves it's life, but not yours :) */	720	/* lava saves it's life, but not yours :) */
773	if (QUERY_FLAG (op, FLAG_LIFESAVE))	721	if (QUERY_FLAG (op, FLAG_LIFESAVE))
…		…
779	#if 0	727	#if 0
780	/* Disable this - enabling it makes monsters easier, as	728	/* Disable this - enabling it makes monsters easier, as
781	* when their cone dies when they die.	729	* when their cone dies when they die.
782	*/	730	*/
783	/* If no owner left, the spell dies out. */	731	/* If no owner left, the spell dies out. */
784	if (get_owner (op) == NULL)	732	if (op->owner == NULL)
785	{	733	{
786	remove_ob (op);	734	op->destroy ();
787	free_object (op);
788	return;	735	return;
789	}	736	}
790	#endif	737	#endif
791		738
792	tag = op->count;
793	hit_map (op, 0, op->attacktype, 0);	739	hit_map (op, 0, op->attacktype, 0);
794		740
795	/* Check to see if we should push anything.	741	/* Check to see if we should push anything.
796	* Spell objects with weight push whatever they encounter to some	742	* Spell objects with weight push whatever they encounter to some
797	* degree.	743	* degree.
798	*/	744	*/
799	if (op->weight)	745	if (op->weight)
800	check_spell_knockback (op);	746	check_spell_knockback (op);
801		747
802	if (was_destroyed (op, tag))	748	if (op->destroyed ())
803	return;	749	return;
804		750
805	if ((op->duration--) < 0)	751	if ((op->duration--) < 0)
806	{	752	{
807	remove_ob (op);	753	op->destroy ();
808	free_object (op);
809	return;	754	return;
810	}	755	}
811	/* Object has hit maximum range, so don't have it move	756	/* Object has hit maximum range, so don't have it move
812	* any further. When the duration above expires,	757	* any further. When the duration above expires,
813	* then the object will get removed.	758	* then the object will get removed.
…		…
822	{	767	{
823	sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];	768	sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
824		769
825	if (ok_to_put_more (op->map, x, y, op, op->attacktype))	770	if (ok_to_put_more (op->map, x, y, op, op->attacktype))
826	{	771	{
827	object *tmp = get_object ();	772	object *tmp = op->clone ();
828
829	copy_object (op, tmp);
830	tmp->x = x;
831	tmp->y = y;
832		773
833	tmp->duration = op->duration + 1;	774	tmp->duration = op->duration + 1;
834		775
835	/* Use for spell tracking - see ok_to_put_more() */	776	/* Use for spell tracking - see ok_to_put_more() */
836	tmp->stats.maxhp = op->stats.maxhp;	777	tmp->stats.maxhp = op->stats.maxhp;
837	insert_ob_in_map (tmp, op->map, op, 0);	778
		779	op->map->insert (tmp, x, y, op);
		780
838	if (tmp->other_arch)	781	if (tmp->other_arch)
839	cone_drop (tmp);	782	cone_drop (tmp);
840	}	783	}
841	}	784	}
842	}	785	}
…		…
852	int	795	int
853	cast_cone (object *op, object *caster, int dir, object *spell)	796	cast_cone (object *op, object *caster, int dir, object *spell)
854	{	797	{
855	object *tmp;	798	object *tmp;
856	int i, success = 0, range_min = -1, range_max = 1;	799	int i, success = 0, range_min = -1, range_max = 1;
857	mapstruct *m;	800	maptile *m;
858	sint16 sx, sy;	801	sint16 sx, sy;
859	MoveType movetype;	802	MoveType movetype;
860		803
861	if (!spell->other_arch)	804	if (!spell->other_arch)
862	return 0;	805	return 0;
…		…
875		818
876	/* Need to know what the movetype of the object we are about	819	/* Need to know what the movetype of the object we are about
877	* to create is, so we can know if the space we are about to	820	* to create is, so we can know if the space we are about to
878	* insert it into is blocked.	821	* insert it into is blocked.
879	*/	822	*/
880	movetype = spell->other_arch->clone.move_type;	823	movetype = spell->other_arch->move_type;
881		824
882	for (i = range_min; i <= range_max; i++)	825	for (i = range_min; i <= range_max; i++)
883	{	826	{
884	sint16 x, y, d;	827	sint16 x, y, d;
885		828
…		…
918	if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)	861	if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
919	continue;	862	continue;
920		863
921	success = 1;	864	success = 1;
922	tmp = arch_to_object (spell->other_arch);	865	tmp = arch_to_object (spell->other_arch);
923	set_owner (tmp, op);	866	tmp->set_owner (op);
924	set_spell_skill (op, caster, spell, tmp);	867	set_spell_skill (op, caster, spell, tmp);
925	tmp->level = caster_level (caster, spell);	868	tmp->level = caster_level (caster, spell);
926	tmp->x = sx;
927	tmp->y = sy;
928	tmp->attacktype = spell->attacktype;	869	tmp->attacktype = spell->attacktype;
929		870
930	/* holy word stuff */	871	/* holy word stuff */
931	if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))	872	if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
932	if (!tailor_god_spell (tmp, op))	873	if (!tailor_god_spell (tmp, op))
…		…
966	else	907	else
967	tmp->duration += caster->level / 3;	908	tmp->duration += caster->level / 3;
968	}	909	}
969		910
970	if (!(tmp->move_type & MOVE_FLY_LOW))	911	if (!(tmp->move_type & MOVE_FLY_LOW))
971	LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);	912	LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
972		913
973	if (!tmp->move_on && tmp->stats.dam)	914	if (!tmp->move_on && tmp->stats.dam)
974	{
975	LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);	915	LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
976	}
977		916
978	insert_ob_in_map (tmp, m, op, 0);	917	m->insert (tmp, sx, sy, op);
979		918
980	/* This is used for tracking spells so that one effect doesn't hit	919	/* This is used for tracking spells so that one effect doesn't hit
981	* a single space too many times.	920	* a single space too many times.
982	*/	921	*/
983	tmp->stats.maxhp = tmp->count;	922	tmp->stats.maxhp = tmp->count;
…		…
993	*	932	*
994	* BOMB related code	933	* BOMB related code
995	*	934	*
996	****************************************************************************/	935	****************************************************************************/
997		936
998
999	/* This handles an exploding bomb.	937	/* This handles an exploding bomb.
1000	* op is the original bomb object.	938	* op is the original bomb object.
1001	*/	939	*/
1002	void	940	void
1003	animate_bomb (object *op)	941	animate_bomb (object *op)
1004	{	942	{
1005	int i;
1006	object *env, *tmp;
1007	archetype *at;
1008
1009	if (op->state != NUM_ANIMATIONS (op) - 1)	943	if (op->state != NUM_ANIMATIONS (op) - 1)
1010	return;	944	return;
1011		945
1012	env = object_get_env_recursive (op);	946	object *env = op->outer_env ();
1013		947
1014	if (op->env)	948	if (op->env)
1015	{	949	{
1016	if (env->map == NULL)	950	if (env->map == NULL)
1017	return;	951	return;
1018		952
1019	if (env->type == PLAYER)	953	if (!(op = op->insert_at (env, op)))
1020	esrv_del_item (env->contr, op->count);
1021
1022	remove_ob (op);
1023	op->x = env->x;
1024	op->y = env->y;
1025	if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1026	return;	954	return;
1027	}	955	}
1028		956
1029	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding	957	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1030	// on a safe map. I don't like this special casing, but it seems to be neccessary	958	// on a safe map. I don't like this special casing, but it seems to be neccessary
1031	// as bombs can be carried.	959	// as bombs can be carried.
1032	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)	960	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1033	{	961	{
1034	remove_ob (op);	962	op->destroy ();
1035	free_object (op);
1036	return;	963	return;
1037	}	964	}
1038		965
1039	/* This copies a lot of the code from the fire bullet,	966	/* This copies a lot of the code from the fire bullet,
1040	* but using the cast_bullet isn't really feasible,	967	* but using the cast_bullet isn't really feasible,
1041	* so just set up the appropriate values.	968	* so just set up the appropriate values.
1042	*/	969	*/
1043	at = archetype::find (SPLINT);	970	if (archetype *at = archetype::find (SPLINT))
1044	if (at)
1045	{	971	{
1046	for (i = 1; i < 9; i++)	972	for (int i = 1; i < 9; i++)
1047	{	973	{
1048	if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))	974	if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1049	continue;	975	continue;
		976
1050	tmp = arch_to_object (at);	977	object *tmp = arch_to_object (at);
1051	tmp->direction = i;	978	tmp->direction = i;
1052	tmp->range = op->range;	979	tmp->range = op->range;
1053	tmp->stats.dam = op->stats.dam;	980	tmp->stats.dam = op->stats.dam;
1054	tmp->duration = op->duration;	981	tmp->duration = op->duration;
1055	tmp->attacktype = op->attacktype;	982	tmp->attacktype = op->attacktype;
1056	copy_owner (tmp, op);	983	tmp->set_owner (op);
1057	if (op->skill && op->skill != tmp->skill)	984	if (op->skill && op->skill != tmp->skill)
1058	{
1059	tmp->skill = op->skill;	985	tmp->skill = op->skill;
1060	}	986
1061	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	987	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1062	SET_ANIMATION (tmp, i);	988	SET_ANIMATION (tmp, i);
1063	tmp->x = op->x + freearr_x[i];	989
1064	tmp->y = op->y + freearr_x[i];	990	op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1065	insert_ob_in_map (tmp, op->map, op, 0);
1066	move_bullet (tmp);	991	move_bullet (tmp);
1067	}	992	}
1068	}	993	}
1069		994
1070	explode_bullet (op);	995	explode_bullet (op);
1071	}	996	}
1072		997
1073	int	998	int
1074	create_bomb (object *op, object *caster, int dir, object *spell)	999	create_bomb (object *op, object *caster, int dir, object *spell)
1075	{	1000	{
1076
1077	object *tmp;	1001	object *tmp;
1078	int mflags;	1002	int mflags;
1079	sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];	1003	sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1080	mapstruct *m;	1004	maptile *m;
1081		1005
1082	mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);	1006	mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1083	if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))	1007	if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1084	{	1008	{
1085	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	1009	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1086	return 0;	1010	return 0;
1087	}	1011	}
		1012
1088	tmp = arch_to_object (spell->other_arch);	1013	tmp = arch_to_object (spell->other_arch);
1089		1014
1090	/* level dependencies for bomb */	1015	/* level dependencies for bomb */
1091	tmp->range = spell->range + SP_level_range_adjust (caster, spell);	1016	tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1092	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1017	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1093	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);	1018	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1094	tmp->attacktype = spell->attacktype;	1019	tmp->attacktype = spell->attacktype;
1095		1020
1096	set_owner (tmp, op);	1021	tmp->set_owner (op);
1097	set_spell_skill (op, caster, spell, tmp);	1022	set_spell_skill (op, caster, spell, tmp);
1098	tmp->x = dx;	1023
1099	tmp->y = dy;	1024	m->insert (tmp, dx, dy, op);
1100	insert_ob_in_map (tmp, m, op, 0);
1101	return 1;	1025	return 1;
1102	}	1026	}
1103		1027
1104	/****************************************************************************	1028	/****************************************************************************
1105	*	1029	*
…		…
1114	* dir is the direction to look in.	1038	* dir is the direction to look in.
1115	* range is how far out to look.	1039	* range is how far out to look.
1116	* type is the type of spell - either SPELL_MANA or SPELL_GRACE.	1040	* type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1117	* this info is used for blocked magic/unholy spaces.	1041	* this info is used for blocked magic/unholy spaces.
1118	*/	1042	*/
1119
1120	object *	1043	object *
1121	get_pointed_target (object *op, int dir, int range, int type)	1044	get_pointed_target (object *op, int dir, int range, int type)
1122	{	1045	{
1123	object *target;	1046	object *target;
1124	sint16 x, y;	1047	sint16 x, y;
1125	int dist, mflags;	1048	int dist, mflags;
1126	mapstruct *mp;	1049	maptile *mp;
1127		1050
1128	if (dir == 0)	1051	if (dir == 0)
1129	return NULL;	1052	return NULL;
1130		1053
1131	for (dist = 1; dist < range; dist++)	1054	for (dist = 1; dist < range; dist++)
…		…
1143	return NULL;	1066	return NULL;
1144	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)	1067	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1145	return NULL;	1068	return NULL;
1146		1069
1147	if (mflags & P_IS_ALIVE)	1070	if (mflags & P_IS_ALIVE)
1148	{
1149	for (target = get_map_ob (mp, x, y); target; target = target->above)	1071	for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1150	{	1072	if (QUERY_FLAG (target, FLAG_MONSTER))
1151	if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1152	{
1153	return target;	1073	return target;
1154	}
1155	}
1156	}
1157	}	1074	}
		1075
1158	return NULL;	1076	return NULL;
1159	}	1077	}
1160
1161		1078
1162	/* cast_smite_arch() - the priest points to a creature and causes	1079	/* cast_smite_arch() - the priest points to a creature and causes
1163	* a 'godly curse' to decend.	1080	* a 'godly curse' to decend.
1164	* usual params -	1081	* usual params -
1165	* op = player	1082	* op = player
1166	* caster = object casting the spell.	1083	* caster = object casting the spell.
1167	* dir = direction being cast	1084	* dir = direction being cast
1168	* spell = spell object	1085	* spell = spell object
1169	*/	1086	*/
1170
1171	int	1087	int
1172	cast_smite_spell (object *op, object *caster, int dir, object *spell)	1088	cast_smite_spell (object *op, object *caster, int dir, object *spell)
1173	{	1089	{
1174	object *effect, *target;	1090	object *effect, *target;
1175	object *god = find_god (determine_god (op));	1091	object *god = find_god (determine_god (op));
…		…
1221	if (effect->attacktype & AT_DEATH)	1137	if (effect->attacktype & AT_DEATH)
1222	{	1138	{
1223	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1139	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1224		1140
1225	/* casting death spells at undead isn't a good thing */	1141	/* casting death spells at undead isn't a good thing */
1226	if QUERY_FLAG
1227	(target, FLAG_UNDEAD)	1142	if (QUERY_FLAG (target, FLAG_UNDEAD))
1228	{	1143	{
1229	if (random_roll (0, 2, op, PREFER_LOW))	1144	if (random_roll (0, 2, op, PREFER_LOW))
1230	{	1145	{
1231	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");	1146	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1232	effect->x = op->x;	1147	effect->x = op->x;
…		…
1234	}	1149	}
1235	else	1150	else
1236	{	1151	{
1237	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));	1152	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1238	target->stats.hp = target->stats.maxhp * 2;	1153	target->stats.hp = target->stats.maxhp * 2;
1239	free_object (effect);	1154	effect->destroy ();
1240	return 0;	1155	return 0;
1241	}	1156	}
1242	}	1157	}
1243	}	1158	}
1244	else	1159	else
1245	{	1160	{
1246	/* how much woe to inflict :) */	1161	/* how much woe to inflict :) */
1247	effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1162	effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1248	}	1163	}
1249		1164
1250	set_owner (effect, op);	1165	effect->set_owner (op);
1251	set_spell_skill (op, caster, spell, effect);	1166	set_spell_skill (op, caster, spell, effect);
1252		1167
1253	/* ok, tell it where to be, and insert! */	1168	/* ok, tell it where to be, and insert! */
1254	effect->x = target->x;	1169	effect->insert_at (target, op);
1255	effect->y = target->y;
1256	insert_ob_in_map (effect, target->map, op, 0);
1257		1170
1258	return 1;	1171	return 1;
1259	}	1172	}
1260
1261		1173
1262	/****************************************************************************	1174	/****************************************************************************
1263	*	1175	*
1264	* MAGIC MISSILE code.	1176	* MAGIC MISSILE code.
1265	* note that the fire_bullet is used to fire the missile. The	1177	* note that the fire_bullet is used to fire the missile. The
…		…
1271	move_missile (object *op)	1183	move_missile (object *op)
1272	{	1184	{
1273	int i, mflags;	1185	int i, mflags;
1274	object *owner;	1186	object *owner;
1275	sint16 new_x, new_y;	1187	sint16 new_x, new_y;
1276	mapstruct *m;	1188	maptile *m;
1277		1189
1278	if (op->range-- <= 0)	1190	if (op->range-- <= 0)
1279	{	1191	{
1280	remove_ob (op);	1192	op->destroy ();
1281	free_object (op);
1282	return;	1193	return;
1283	}	1194	}
1284		1195
1285	owner = get_owner (op);	1196	owner = op->owner;
1286	#if 0	1197	#if 0
1287	/* It'd make things nastier if this wasn't here - spells cast by	1198	/* It'd make things nastier if this wasn't here - spells cast by
1288	* monster that are then killed would continue to survive	1199	* monster that are then killed would continue to survive
1289	*/	1200	*/
1290	if (owner == NULL)	1201	if (owner == NULL)
1291	{	1202	{
1292	remove_ob (op);	1203	op->destroy ();
1293	free_object (op);
1294	return;	1204	return;
1295	}	1205	}
1296	#endif	1206	#endif
1297		1207
1298	new_x = op->x + DIRX (op);	1208	new_x = op->x + DIRX (op);
…		…
1300		1210
1301	mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);	1211	mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1302		1212
1303	if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))	1213	if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1304	{	1214	{
1305	tag_t tag = op->count;
1306
1307	hit_map (op, op->direction, AT_MAGIC, 1);	1215	hit_map (op, op->direction, AT_MAGIC, 1);
1308	/* Basically, missile only hits one thing then goes away.	1216	/* Basically, missile only hits one thing then goes away.
1309	* we need to remove it if someone hasn't already done so.	1217	* we need to remove it if someone hasn't already done so.
1310	*/	1218	*/
1311	if (!was_destroyed (op, tag))	1219	if (!op->destroyed ())
1312	{	1220	op->destroy ();
1313	remove_ob (op);
1314	free_object (op);
1315	}
1316	return;
1317	}
1318		1221
1319	remove_ob (op);	1222	return;
		1223	}
		1224
		1225	op->remove ();
		1226
1320	if (!op->direction || (mflags & P_OUT_OF_MAP))	1227	if (!op->direction || (mflags & P_OUT_OF_MAP))
1321	{	1228	{
1322	free_object (op);	1229	op->destroy ();
1323	return;	1230	return;
1324	}	1231	}
1325	op->x = new_x;	1232
1326	op->y = new_y;	1233	i = spell_find_dir (m, new_x, new_y, op->owner);
1327	op->map = m;
1328	i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1329	if (i > 0 && i != op->direction)	1234	if (i > 0 && i != op->direction)
1330	{	1235	{
1331	op->direction = i;	1236	op->direction = i;
1332	SET_ANIMATION (op, op->direction);	1237	SET_ANIMATION (op, op->direction);
1333	}	1238	}
1334	insert_ob_in_map (op, op->map, op, 0);	1239
		1240	m->insert (op, new_x, new_y, op);
1335	}	1241	}
1336		1242
1337	/****************************************************************************	1243	/****************************************************************************
1338	* Destruction	1244	* Destruction
1339	****************************************************************************/	1245	****************************************************************************/
…		…
1342	* we do this by creating a force and inserting it in the	1248	* we do this by creating a force and inserting it in the
1343	* object. if time is 0, the object glows permanently. To truely	1249	* object. if time is 0, the object glows permanently. To truely
1344	* make this work for non-living objects, we would have to	1250	* make this work for non-living objects, we would have to
1345	* give them the capability to have an inventory. b.t.	1251	* give them the capability to have an inventory. b.t.
1346	*/	1252	*/
1347
1348	int	1253	int
1349	make_object_glow (object *op, int radius, int time)	1254	make_object_glow (object *op, int radius, int time)
1350	{	1255	{
1351	object *tmp;
1352
1353	/* some things are unaffected... */	1256	/* some things are unaffected... */
1354	if (op->path_denied & PATH_LIGHT)	1257	if (op->path_denied & PATH_LIGHT)
1355	return 0;	1258	return 0;
1356		1259
1357	tmp = get_archetype (FORCE_NAME);	1260	object *tmp = get_archetype (FORCE_NAME);
1358	tmp->speed = 0.01;	1261	tmp->speed = 0.01;
1359	tmp->stats.food = time;	1262	tmp->stats.food = time;
1360	SET_FLAG (tmp, FLAG_IS_USED_UP);	1263	SET_FLAG (tmp, FLAG_IS_USED_UP);
1361	tmp->glow_radius = radius;	1264	tmp->glow_radius = radius;
1362	if (tmp->glow_radius > MAX_LIGHT_RADII)	1265	if (tmp->glow_radius > MAX_LIGHT_RADII)
1363	tmp->glow_radius = MAX_LIGHT_RADII;	1266	tmp->glow_radius = MAX_LIGHT_RADII;
1364		1267
1365	tmp->x = op->x;
1366	tmp->y = op->y;
1367	if (tmp->speed < MIN_ACTIVE_SPEED)
1368	tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1369	tmp = insert_ob_in_ob (tmp, op);	1268	tmp = insert_ob_in_ob (tmp, op);
		1269
1370	if (tmp->glow_radius > op->glow_radius)	1270	if (tmp->glow_radius > op->glow_radius)
1371	op->glow_radius = tmp->glow_radius;	1271	op->glow_radius = tmp->glow_radius;
1372		1272
1373	if (!tmp->env || op != tmp->env)
1374	{
1375	LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1376	return 0;
1377	}
1378	return 1;	1273	return 1;
1379	}	1274	}
1380
1381
1382
1383		1275
1384	int	1276	int
1385	cast_destruction (object *op, object *caster, object *spell_ob)	1277	cast_destruction (object *op, object *caster, object *spell_ob)
1386	{	1278	{
1387	int i, j, range, mflags, friendly = 0, dam, dur;	1279	int i, j, range, mflags, friendly = 0, dam, dur;
1388	sint16 sx, sy;	1280	sint16 sx, sy;
1389	mapstruct *m;	1281	maptile *m;
1390	object *tmp;	1282	object *tmp;
1391	const char *skill;	1283	const char *skill;
1392		1284
1393	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	1285	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1394	dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	1286	dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
…		…
1408	else if (caster->skill)	1300	else if (caster->skill)
1409	op->skill = caster->skill;	1301	op->skill = caster->skill;
1410	else	1302	else
1411	op->skill = NULL;	1303	op->skill = NULL;
1412		1304
1413	change_skill (op, find_skill_by_name (op, op->skill), 1);	1305	op->change_skill (find_skill_by_name (op, op->skill));
1414		1306
1415	for (i = -range; i < range; i++)	1307	for (i = -range; i < range; i++)
1416	{	1308	{
1417	for (j = -range; j < range; j++)	1309	for (j = -range; j < range; j++)
1418	{	1310	{
1419	m = op->map;	1311	m = op->map;
1420	sx = op->x + i;	1312	sx = op->x + i;
1421	sy = op->y + j;	1313	sy = op->y + j;
		1314
1422	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	1315	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1423	if (mflags & P_OUT_OF_MAP)	1316	if (mflags & P_OUT_OF_MAP)
1424	continue;	1317	continue;
		1318
1425	if (mflags & P_IS_ALIVE)	1319	if (mflags & P_IS_ALIVE)
1426	{	1320	{
1427	for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above)	1321	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1428	{
1429	if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)	1322	if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1430	break;	1323	break;
1431	}	1324
1432	if (tmp)	1325	if (tmp)
1433	{	1326	{
1434	if (tmp->head)	1327	if (tmp->head)
1435	tmp = tmp->head;	1328	tmp = tmp->head;
1436		1329
…		…
1439	{	1332	{
1440	if (spell_ob->subtype == SP_DESTRUCTION)	1333	if (spell_ob->subtype == SP_DESTRUCTION)
1441	{	1334	{
1442	hit_player (tmp, dam, op, spell_ob->attacktype, 0);	1335	hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1443	if (spell_ob->other_arch)	1336	if (spell_ob->other_arch)
1444	{
1445	tmp = arch_to_object (spell_ob->other_arch);	1337	m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1446	tmp->x = sx;
1447	tmp->y = sy;
1448	insert_ob_in_map (tmp, m, op, 0);
1449	}
1450	}	1338	}
1451	else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)	1339	else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1452	{	1340	{
1453	if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)	1341	if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1454	{
1455	object *effect = arch_to_object (spell_ob->other_arch);	1342	m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1456
1457	effect->x = sx;
1458	effect->y = sy;
1459	insert_ob_in_map (effect, m, op, 0);
1460	}
1461	}	1343	}
1462	}	1344	}
1463	}	1345	}
1464	}	1346	}
1465	}	1347	}
1466	}	1348	}
		1349
1467	op->skill = skill;	1350	op->skill = skill;
1468	return 1;	1351	return 1;
1469	}	1352	}
1470		1353
1471	/***************************************************************************	1354	/***************************************************************************
…		…
1485	{	1368	{
1486	new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");	1369	new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1487	return 0;	1370	return 0;
1488	}	1371	}
1489		1372
		1373	tmp = tmp->head_ ();
		1374
1490	/* If we've already got a force of this type, don't add a new one. */	1375	/* If we've already got a force of this type, don't add a new one. */
1491	for (force = tmp->inv; force != NULL; force = force->below)	1376	for (force = tmp->inv; force; force = force->below)
1492	{	1377	{
1493	if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)	1378	if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1494	{	1379	{
1495	if (force->name == spell_ob->name)	1380	if (force->name == spell_ob->name)
1496	{	1381	{
…		…
1502	return 0;	1387	return 0;
1503	}	1388	}
1504	}	1389	}
1505	}	1390	}
1506		1391
1507	if (force == NULL)	1392	if (!force)
1508	{	1393	{
1509	force = get_archetype (FORCE_NAME);	1394	force = get_archetype (FORCE_NAME);
1510	force->subtype = FORCE_CHANGE_ABILITY;	1395	force->subtype = FORCE_CHANGE_ABILITY;
		1396
1511	if (spell_ob->race)	1397	if (spell_ob->race)
1512	force->name = spell_ob->race;	1398	force->name = spell_ob->race;
1513	else	1399	else
1514	force->name = spell_ob->name;	1400	force->name = spell_ob->name;
1515		1401
…		…
1525	{	1411	{
1526	force->duration = duration;	1412	force->duration = duration;
1527	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	1413	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1528	}	1414	}
1529	else	1415	else
1530	{
1531	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1416	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1532	}	1417
1533	return 1;	1418	return 1;
1534	}	1419	}
		1420
1535	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1421	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1536	force->speed = 1.0;	1422	force->speed = 1.f;
1537	force->speed_left = -1.0;	1423	force->speed_left = -1.f;
1538	SET_FLAG (force, FLAG_APPLIED);	1424	SET_FLAG (force, FLAG_APPLIED);
1539		1425
1540	if (god)	1426	if (god)
1541	{	1427	{
1542	if (spell_ob->last_grace)	1428	if (spell_ob->last_grace)
…		…
1555	force->stats.ac = spell_ob->stats.ac;	1441	force->stats.ac = spell_ob->stats.ac;
1556	force->stats.wc = spell_ob->stats.wc;	1442	force->stats.wc = spell_ob->stats.wc;
1557		1443
1558	change_abil (tmp, force); /* Mostly to display any messages */	1444	change_abil (tmp, force); /* Mostly to display any messages */
1559	insert_ob_in_ob (force, tmp);	1445	insert_ob_in_ob (force, tmp);
1560	fix_player (tmp);	1446	tmp->update_stats ();
1561	return 1;	1447	return 1;
1562		1448
1563	}	1449	}
1564
1565		1450
1566	/**********************************************************************	1451	/**********************************************************************
1567	* mood change	1452	* mood change
1568	* Arguably, this may or may not be an attack spell. But since it	1453	* Arguably, this may or may not be an attack spell. But since it
1569	* effects monsters, it seems best to put it into this file	1454	* effects monsters, it seems best to put it into this file
…		…
1576	mood_change (object *op, object *caster, object *spell)	1461	mood_change (object *op, object *caster, object *spell)
1577	{	1462	{
1578	object *tmp, *god, *head;	1463	object *tmp, *god, *head;
1579	int done_one, range, mflags, level, at, best_at;	1464	int done_one, range, mflags, level, at, best_at;
1580	sint16 x, y, nx, ny;	1465	sint16 x, y, nx, ny;
1581	mapstruct *m;	1466	maptile *m;
1582	const char *race;	1467	const char *race;
1583		1468
1584	/* We precompute some values here so that we don't have to keep	1469	/* We precompute some values here so that we don't have to keep
1585	* doing it over and over again.	1470	* doing it over and over again.
1586	*/	1471	*/
…		…
1599	else if (god && !strcmp (spell->race, "GOD_FRIEND"))	1484	else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1600	race = god->race;	1485	race = god->race;
1601	else	1486	else
1602	race = spell->race;	1487	race = spell->race;
1603		1488
1604
1605	for (x = op->x - range; x <= op->x + range; x++)	1489	for (x = op->x - range; x <= op->x + range; x++)
1606	for (y = op->y - range; y <= op->y + range; y++)	1490	for (y = op->y - range; y <= op->y + range; y++)
1607	{	1491	{
1608
1609	done_one = 0;	1492	done_one = 0;
1610	m = op->map;	1493	m = op->map;
1611	nx = x;	1494	nx = x;
1612	ny = y;	1495	ny = y;
1613	mflags = get_map_flags (m, &m, x, y, &nx, &ny);	1496	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
…		…
1616		1499
1617	/* If there is nothing living on this space, no need to go further */	1500	/* If there is nothing living on this space, no need to go further */
1618	if (!(mflags & P_IS_ALIVE))	1501	if (!(mflags & P_IS_ALIVE))
1619	continue;	1502	continue;
1620		1503
		1504	// players can only affect spaces that they can actually see
		1505	if (caster && caster->contr
		1506	&& caster->contr->visibility_at (m, nx, ny) < 70)
		1507	continue;
		1508
1621	for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)	1509	for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1622	if (QUERY_FLAG (tmp, FLAG_MONSTER))	1510	if (QUERY_FLAG (tmp, FLAG_MONSTER))
1623	break;	1511	break;
1624		1512
1625	/* There can be living objects that are not monsters */	1513	/* There can be living objects that are not monsters */
1626	if (!tmp || tmp->type == PLAYER)	1514	if (!tmp || tmp->type == PLAYER)
…		…
1633	head = tmp;	1521	head = tmp;
1634		1522
1635	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */	1523	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1636	if (race && head->race && !strstr (race, head->race))	1524	if (race && head->race && !strstr (race, head->race))
1637	continue;	1525	continue;
		1526
1638	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))	1527	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1639	continue;	1528	continue;
1640		1529
1641	/* Now do a bunch of stuff related to saving throws */	1530	/* Now do a bunch of stuff related to saving throws */
1642	best_at = -1;	1531	best_at = -1;
…		…
1659	at -= level / 5;	1548	at -= level / 5;
1660	if (did_make_save (head, head->level, at))	1549	if (did_make_save (head, head->level, at))
1661	continue;	1550	continue;
1662	}	1551	}
1663	else /* spell->attacktype */	1552	else /* spell->attacktype */
1664	/*
1665	Spell has no attacktype (charm & such), so we'll have a specific saving:
1666	* if spell level < monster level, no go
1667	* else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1668
1669	The chance will then be in the range [20-70] percent, not too bad.
1670
1671	This is required to fix the 'charm monster' abuse, where a player level 1 can
1672	charm a level 125 monster...
1673
1674	Ryo, august 14th
1675	*/
1676	{	1553	{
		1554	/*
		1555	Spell has no attacktype (charm & such), so we'll have a specific saving:
		1556	* if spell level < monster level, no go
		1557	* else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
		1558
		1559	The chance will then be in the range [20-70] percent, not too bad.
		1560
		1561	This is required to fix the 'charm monster' abuse, where a player level 1 can
		1562	charm a level 125 monster...
		1563
		1564	Ryo, august 14th
		1565	*/
1677	if (head->level > level)	1566	if (head->level > level)
1678	continue;	1567	continue;
		1568
1679	if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))	1569	if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1680	/* Failed, no effect */	1570	/* Failed, no effect */
1681	continue;	1571	continue;
1682	}	1572	}
1683		1573
1684	/* Done with saving throw. Now start effecting the monster */	1574	/* Done with saving throw. Now start affecting the monster */
1685		1575
1686	/* aggravation */	1576	/* aggravation */
1687	if (QUERY_FLAG (spell, FLAG_MONSTER))	1577	if (QUERY_FLAG (spell, FLAG_MONSTER))
1688	{	1578	{
1689	CLEAR_FLAG (head, FLAG_SLEEP);	1579	CLEAR_FLAG (head, FLAG_SLEEP);
1690	if (QUERY_FLAG (head, FLAG_FRIENDLY))
1691	remove_friendly_object (head);	1580	remove_friendly_object (head);
1692
1693	done_one = 1;	1581	done_one = 1;
1694	head->enemy = op;	1582	head->enemy = op;
1695	}	1583	}
1696		1584
1697	/* calm monsters */	1585	/* calm monsters */
…		…
1706	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))	1594	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1707	{	1595	{
1708	SET_FLAG (head, FLAG_BERSERK);	1596	SET_FLAG (head, FLAG_BERSERK);
1709	done_one = 1;	1597	done_one = 1;
1710	}	1598	}
		1599
1711	/* charm */	1600	/* charm */
1712	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))	1601	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1713	{	1602	{
1714	SET_FLAG (head, FLAG_FRIENDLY);	1603	INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
		1604
1715	/* Prevent uncontolled outbreaks of self replicating monsters.	1605	/* Prevent uncontrolled outbreaks of self replicating monsters.
1716	Typical use case is charm, go somwhere, use aggravation to make hostile.	1606	Typical use case is charm, go somwhere, use aggravation to make hostile.
1717	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */	1607	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1718	CLEAR_FLAG (head, FLAG_GENERATOR);	1608	CLEAR_FLAG (head, FLAG_GENERATOR);
1719	set_owner (head, op);	1609	head->set_owner (op);
1720	set_spell_skill (op, caster, spell, head);	1610	set_spell_skill (op, caster, spell, head);
1721	add_friendly_object (head);	1611	add_friendly_object (head);
1722	head->attack_movement = PETMOVE;	1612	head->attack_movement = PETMOVE;
1723	done_one = 1;	1613	done_one = 1;
1724	change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);	1614	change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1725	head->stats.exp = 0;	1615	head->stats.exp = 0;
1726	}	1616	}
1727		1617
1728	/* If a monster was effected, put an effect in */	1618	/* If a monster was effected, put an effect in */
1729	if (done_one && spell->other_arch)	1619	if (done_one && spell->other_arch)
1730	{
1731	tmp = arch_to_object (spell->other_arch);	1620	m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1732	tmp->x = nx;
1733	tmp->y = ny;
1734	insert_ob_in_map (tmp, m, op, 0);
1735	}
1736	} /* for y */	1621	} /* for y */
1737		1622
1738	return 1;	1623	return 1;
1739	}	1624	}
1740		1625
…		…
1750	move_ball_spell (object *op)	1635	move_ball_spell (object *op)
1751	{	1636	{
1752	int i, j, dam_save, dir, mflags;	1637	int i, j, dam_save, dir, mflags;
1753	sint16 nx, ny, hx, hy;	1638	sint16 nx, ny, hx, hy;
1754	object *owner;	1639	object *owner;
1755	mapstruct *m;	1640	maptile *m;
1756		1641
1757	owner = get_owner (op);	1642	owner = op->owner;
1758		1643
1759	/* the following logic makes sure that the ball doesn't move into a wall,	1644	/* the following logic makes sure that the ball doesn't move into a wall,
1760	* and makes sure that it will move along a wall to try and get at it's	1645	* and makes sure that it will move along a wall to try and get at it's
1761	* victim. The block immediately below more or less chooses a random	1646	* victim. The block immediately below more or less chooses a random
1762	* offset to move the ball, eg, keep it mostly on course, with some	1647	* offset to move the ball, eg, keep it mostly on course, with some
…		…
1791	nx = op->x;	1676	nx = op->x;
1792	ny = op->y;	1677	ny = op->y;
1793	m = op->map;	1678	m = op->map;
1794	}	1679	}
1795		1680
1796	remove_ob (op);	1681	m->insert (op, nx, ny, op);
1797	op->y = ny;
1798	op->x = nx;
1799	insert_ob_in_map (op, m, op, 0);
1800		1682
1801	dam_save = op->stats.dam; /* save the original dam: we do halfdam on	1683	dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1802	surrounding squares */	1684	surrounding squares */
1803		1685
1804	/* loop over current square and neighbors to hit.	1686	/* loop over current square and neighbors to hit.
1805	* if this has an other_arch field, we insert that in	1687	* if this has an other_arch field, we insert that in
1806	* the surround spaces.	1688	* the surround spaces.
1807	*/	1689	*/
1808	for (j = 0; j < 9; j++)	1690	for (j = 0; j < 9; j++)
1809	{	1691	{
1810	object *new_ob;
1811
1812	hx = nx + freearr_x[j];	1692	hx = nx + freearr_x[j];
1813	hy = ny + freearr_y[j];	1693	hy = ny + freearr_y[j];
1814		1694
1815	m = op->map;	1695	m = op->map;
1816	mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);	1696	mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
…		…
1830		1710
1831	}	1711	}
1832		1712
1833	/* insert the other arch */	1713	/* insert the other arch */
1834	if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))	1714	if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1835	{	1715	m->insert (arch_to_object (op->other_arch), hx, hy, op);
1836	new_ob = arch_to_object (op->other_arch);
1837	new_ob->x = hx;
1838	new_ob->y = hy;
1839	insert_ob_in_map (new_ob, m, op, 0);
1840	}
1841	}	1716	}
1842		1717
1843	/* restore to the center location and damage */	1718	/* restore to the center location and damage */
1844	op->stats.dam = dam_save;	1719	op->stats.dam = dam_save;
1845		1720
1846	i = spell_find_dir (op->map, op->x, op->y, get_owner (op));	1721	i = spell_find_dir (op->map, op->x, op->y, op->owner);
1847		1722
1848	if (i >= 0)	1723	if (i >= 0)
1849	{ /* we have a preferred direction! */	1724	{ /* we have a preferred direction! */
1850	/* pick another direction if the preferred dir is blocked. */	1725	/* pick another direction if the preferred dir is blocked. */
1851	if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||	1726	if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1852	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))	1727	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1853	{
1854	i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */	1728	i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1855	}	1729
1856	op->direction = i;	1730	op->direction = i;
1857	}	1731	}
1858	}	1732	}
1859		1733
1860
1861	/* move_swarm_spell: peterm	1734	/* move_swarm_spell: peterm
1862	* This is an implementation of the swarm spell. It was written for	1735	* This is an implementation of the swarm spell. It was written for
1863	* meteor swarm, but it could be used for any swarm. A swarm spell	1736	* meteor swarm, but it could be used for any swarm. A swarm spell
1864	* is a special type of object that casts swarms of other types	1737	* is a special type of object that casts swarms of other types
1865	* of spells. Which spell it casts is flexible. It fires the spells	1738	* of spells. Which spell it casts is flexible. It fires the spells
1866	* from a set of squares surrounding the caster, in a given direction.	1739	* from a set of squares surrounding the caster, in a given direction.
1867	*/	1740	*/
1868
1869	void	1741	void
1870	move_swarm_spell (object *op)	1742	move_swarm_spell (object *op)
1871	{	1743	{
1872	#if 0	1744	#if 0
1873	static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };	1745	static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1874	static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };	1746	static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1875	sint16 target_x, target_y, origin_x, origin_y;	1747	sint16 target_x, target_y, origin_x, origin_y;
1876	int adjustdir;	1748	int adjustdir;
1877	mapstruct *m;	1749	maptile *m;
1878	#endif	1750	#endif
1879	int basedir;
1880	object *owner;	1751	object *owner = op->env;
1881		1752
1882	owner = get_owner (op);	1753	if (!op->duration || !owner->is_on_map ())
1883	if (op->duration == 0 || owner == NULL)
1884	{
1885	remove_ob (op);
1886	free_object (op);
1887	return;
1888	}	1754	{
		1755	op->destroy ();
		1756	return;
		1757	}
		1758
1889	op->duration--;	1759	op->duration--;
1890		1760
1891	basedir = op->direction;	1761	int basedir = op->direction;
1892	if (basedir == 0)	1762	if (!basedir)
1893	{
1894	/* spray in all directions! 8) */	1763	/* spray in all directions! 8) */
1895	basedir = rndm (1, 8);	1764	basedir = rndm (1, 8);
1896	}
1897		1765
1898	#if 0	1766	#if 0
1899	// this is bogus: it causes wrong places to be checked below	1767	// this is bogus: it causes wrong places to be checked below
1900	// (a wall 2 cells away will block the effect...) and	1768	// (a wall 2 cells away will block the effect...) and
1901	// doesn't work for SP_BULLET anyhow, so again tests the wrong	1769	// doesn't work for SP_BULLET anyhow, so again tests the wrong
1902	// space.	1770	// space.
1903	// should be fixed later, but correctness before featurs...	1771	// should be fixed later, but correctness before features...
1904	// (schmorp)	1772	// (schmorp)
1905		1773
1906	/* new offset calculation to make swarm element distribution	1774	/* new offset calculation to make swarm element distribution
1907	* more uniform	1775	* more uniform
1908	*/	1776	*/
…		…
1964	fire_bullet (owner, op, basedir, op->spell);	1832	fire_bullet (owner, op, basedir, op->spell);
1965	else if (op->spell->subtype == SP_MAGIC_MISSILE)	1833	else if (op->spell->subtype == SP_MAGIC_MISSILE)
1966	fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);	1834	fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);
1967	}	1835	}
1968	}	1836	}
1969
1970
1971
1972		1837
1973	/* fire_swarm:	1838	/* fire_swarm:
1974	* The following routine creates a swarm of objects. It actually	1839	* The following routine creates a swarm of objects. It actually
1975	* sets up a specific swarm object, which then fires off all	1840	* sets up a specific swarm object, which then fires off all
1976	* the parts of the swarm.	1841	* the parts of the swarm.
…		…
1979	* caster: the caster (owner, wand, rod, scroll)	1844	* caster: the caster (owner, wand, rod, scroll)
1980	* dir: the direction everything will be fired in	1845	* dir: the direction everything will be fired in
1981	* spell - the spell that is this spell.	1846	* spell - the spell that is this spell.
1982	* n: the number to be fired.	1847	* n: the number to be fired.
1983	*/	1848	*/
1984
1985	int	1849	int
1986	fire_swarm (object *op, object *caster, object *spell, int dir)	1850	fire_swarm (object *op, object *caster, object *spell, int dir)
1987	{	1851	{
1988	object *tmp;
1989	int i;
1990
1991	if (!spell->other_arch)	1852	if (!spell->other_arch)
1992	return 0;	1853	return 0;
1993		1854
1994	tmp = get_archetype (SWARM_SPELL);	1855	object *tmp = archetype::get (SWARM_SPELL);
1995	tmp->x = op->x;
1996	tmp->y = op->y;
1997	set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */
1998	set_spell_skill (op, caster, spell, tmp);	1856	set_spell_skill (op, caster, spell, tmp);
1999
2000	tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */	1857	tmp->level = caster_level (caster, spell); /* needed later, to get level dep. right. */
2001	tmp->spell = arch_to_object (spell->other_arch);	1858	tmp->spell = spell->other_arch->instance ();
2002
2003	tmp->attacktype = tmp->spell->attacktype;	1859	tmp->attacktype = tmp->spell->attacktype;
2004		1860
2005	if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)	1861	if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2006	{
2007	if (!tailor_god_spell (tmp, op))	1862	if (!tailor_god_spell (tmp, op))
2008	return 1;	1863	return 1;
2009	}	1864
2010	tmp->duration = SP_level_duration_adjust (caster, spell);	1865	tmp->duration = SP_level_duration_adjust (caster, spell);
2011	for (i = 0; i < spell->duration; i++)	1866	for (int i = 0; i < spell->duration; i++)
2012	tmp->duration += die_roll (1, 3, op, PREFER_HIGH);	1867	tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2013		1868
2014	tmp->direction = dir;	1869	tmp->direction = dir;
2015	tmp->invisible = 1;	1870	tmp->invisible = 1;
2016	insert_ob_in_map (tmp, op->map, op, 0);	1871
		1872	op->insert (tmp);
		1873
2017	return 1;	1874	return 1;
2018	}	1875	}
2019
2020		1876
2021	/* See the spells documentation file for why this is its own	1877	/* See the spells documentation file for why this is its own
2022	* function.	1878	* function.
2023	*/	1879	*/
2024	int	1880	int
2025	cast_light (object *op, object *caster, object *spell, int dir)	1881	cast_light (object *op, object *caster, object *spell, int dir)
2026	{	1882	{
2027	object *target = NULL, *tmp = NULL;	1883	object *target = NULL, *tmp = NULL;
2028	sint16 x, y;	1884	sint16 x, y;
2029	int dam, mflags;	1885	int dam, mflags;
2030	mapstruct *m;	1886	maptile *m;
2031		1887
2032	dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1888	dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2033		1889
2034	if (!dir)	1890	if (!dir)
2035	{	1891	{
…		…
2049	return 0;	1905	return 0;
2050	}	1906	}
2051		1907
2052	if (mflags & P_IS_ALIVE && spell->attacktype)	1908	if (mflags & P_IS_ALIVE && spell->attacktype)
2053	{	1909	{
2054	for (target = get_map_ob (m, x, y); target; target = target->above)	1910	for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2055	if (QUERY_FLAG (target, FLAG_MONSTER))	1911	if (QUERY_FLAG (target, FLAG_MONSTER))
2056	{	1912	{
2057	/* oky doky. got a target monster. Lets make a blinding attack */	1913	/* oky doky. got a target monster. Lets make a blinding attack */
2058	if (target->head)	1914	if (target->head)
2059	target = target->head;	1915	target = target->head;
…		…
2081	{	1937	{
2082	tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);	1938	tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2083	if (tmp->glow_radius > MAX_LIGHT_RADII)	1939	if (tmp->glow_radius > MAX_LIGHT_RADII)
2084	tmp->glow_radius = MAX_LIGHT_RADII;	1940	tmp->glow_radius = MAX_LIGHT_RADII;
2085	}	1941	}
2086	tmp->x = x;	1942
2087	tmp->y = y;	1943	m->insert (tmp, x, y, op);
2088	insert_ob_in_map (tmp, m, op, 0);
2089	return 1;	1944	return 1;
2090	}	1945	}
2091
2092
2093
2094		1946
2095	/* cast_cause_disease: this spell looks along <dir> from the	1947	/* cast_cause_disease: this spell looks along <dir> from the
2096	* player and infects someone.	1948	* player and infects someone.
2097	* op is the player/monster, caster is the object, dir is the direction	1949	* op is the player/monster, caster is the object, dir is the direction
2098	* to cast, disease_arch is the specific disease, and type is the spell number	1950	* to cast, disease_arch is the specific disease, and type is the spell number
2099	* perhaps this should actually be in disease.c?	1951	* perhaps this should actually be in disease.c?
2100	*/	1952	*/
2101
2102	int	1953	int
2103	cast_cause_disease (object *op, object *caster, object *spell, int dir)	1954	cast_cause_disease (object *op, object *caster, object *spell, int dir)
2104	{	1955	{
2105	sint16 x, y;	1956	sint16 x, y;
2106	int i, mflags, range, dam_mod, dur_mod;	1957	int i, mflags, range, dam_mod, dur_mod;
2107	object *walk;	1958	object *walk;
2108	mapstruct *m;	1959	maptile *m;
2109		1960
2110	x = op->x;	1961	x = op->x;
2111	y = op->y;	1962	y = op->y;
2112		1963
2113	/* If casting from a scroll, no direction will be available, so refer to the	1964	/* If casting from a scroll, no direction will be available, so refer to the
2114	* direction the player is pointing.	1965	* direction the player is pointing.
2115	*/	1966	*/
2116	if (!dir)	1967	if (!dir)
2117	dir = op->facing;	1968	dir = op->facing;
		1969
2118	if (!dir)	1970	if (!dir)
2119	return 0; /* won't find anything if casting on ourself, so just return */	1971	return 0; /* won't find anything if casting on ourself, so just return */
2120		1972
2121	/* Calculate these once here */	1973	/* Calculate these once here */
2122	range = spell->range + SP_level_range_adjust (caster, spell);	1974	range = spell->range + SP_level_range_adjust (caster, spell);
…		…
2141		1993
2142	/* Only bother looking on this space if there is something living here */	1994	/* Only bother looking on this space if there is something living here */
2143	if (mflags & P_IS_ALIVE)	1995	if (mflags & P_IS_ALIVE)
2144	{	1996	{
2145	/* search this square for a victim */	1997	/* search this square for a victim */
2146	for (walk = get_map_ob (m, x, y); walk; walk = walk->above)	1998	for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2147	if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))	1999	if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2148	{ /* found a victim */	2000	{ /* found a victim */
2149	object *disease = arch_to_object (spell->other_arch);	2001	object *disease = arch_to_object (spell->other_arch);
2150		2002
2151	set_owner (disease, op);	2003	disease->set_owner (op);
2152	set_spell_skill (op, caster, spell, disease);	2004	set_spell_skill (op, caster, spell, disease);
2153	disease->stats.exp = 0;	2005	disease->stats.exp = 0;
2154	disease->level = caster_level (caster, spell);	2006	disease->level = caster_level (caster, spell);
2155		2007
2156	/* do level adjustments */	2008	/* do level adjustments */
2157	if (disease->stats.wc)	2009	if (disease->stats.wc)
2158	disease->stats.wc += dur_mod / 2;	2010	disease->stats.wc += dur_mod / 2;
2159		2011
2160	if (disease->magic > 0)	2012	if (disease->magic > 0)
2161	disease->magic += dur_mod / 4;	2013	disease->magic += dur_mod / 8;
2162		2014
2163	if (disease->stats.maxhp > 0)	2015	if (disease->stats.maxhp > 0)
2164	disease->stats.maxhp += dur_mod;	2016	disease->stats.maxhp += dur_mod;
2165		2017
2166	if (disease->stats.maxgrace > 0)	2018	if (disease->stats.maxgrace > 0)
…		…
2201	if (disease->stats.sp)	2053	if (disease->stats.sp)
2202	disease->stats.sp -= dam_mod;	2054	disease->stats.sp -= dam_mod;
2203		2055
2204	if (infect_object (walk, disease, 1))	2056	if (infect_object (walk, disease, 1))
2205	{	2057	{
2206	object *flash; /* visual effect for inflicting disease */
2207
2208	new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);	2058	new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2209		2059
2210	free_object (disease); /* don't need this one anymore */	2060	disease->destroy (); /* don't need this one anymore */
2211	flash = get_archetype (ARCH_DETECT_MAGIC);	2061	walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2212	flash->x = x;
2213	flash->y = y;
2214	flash->map = walk->map;
2215	insert_ob_in_map (flash, walk->map, op, 0);
2216	return 1;	2062	return 1;
2217	}	2063	}
2218	free_object (disease);	2064
		2065	disease->destroy ();
2219	}	2066	}
2220	} /* if living creature */	2067	} /* if living creature */
2221	} /* for range of spaces */	2068	} /* for range of spaces */
		2069
2222	new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");	2070	new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2223	return 1;	2071	return 1;
2224	}	2072	}

Diff Legend

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