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.11 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.62 by root, Mon Jul 14 00:04:57 2008 UTC

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

Diff Legend

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