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.42 by root, Sun Jul 1 05:00:20 2007 UTC

1
2	/*	1	/*
3	* static char *rcsid_spell_attack_c =	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4	* "$Id: spell_attack.C,v 1.11 2006/09/11 20:26:41 root Exp $";	3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
		5	* Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
		6	* Copyright (©) 1992,2007 Frank Tore Johansen
		7	*
		8	* Crossfire TRT is free software: you can redistribute it and/or modify
		9	* it under the terms of the GNU General Public License as published by
		10	* the Free Software Foundation, either version 3 of the License, or
		11	* (at your option) any later version.
		12	*
		13	* This program is distributed in the hope that it will be useful,
		14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	* GNU General Public License for more details.
		17	*
		18	* You should have received a copy of the GNU General Public License
		19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		20	*
		21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
5	*/	22	*/
6
7
8	/*
9	CrossFire, A Multiplayer game for X-windows
10
11	Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
12	Copyright (C) 1992 Frank Tore Johansen
13
14	This program is free software; you can redistribute it and/or modify
15	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
17	(at your option) any later version.
18
19	This program is distributed in the hope that it will be useful,
20	but WITHOUT ANY WARRANTY; without even the implied warranty of
21	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22	GNU General Public License for more details.
23
24	You should have received a copy of the GNU General Public License
25	along with this program; if not, write to the Free Software
26	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27
28	The authors can be reached via e-mail at crossfire-devel@real-time.com
29	*/
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)
…		…
64	{	55	{
65	weight_move = op->weight + (op->weight * op->level) / 3;	56	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); */	57	/*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
67	}	58	}
68		59
69	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)
70	{	61	{
71	int num_sections = 1;	62	int num_sections = 1;
72		63
73	/* don't move DM */	64	/* don't move DM */
74	if (QUERY_FLAG (tmp, FLAG_WIZ))	65	if (QUERY_FLAG (tmp, FLAG_WIZ))
…		…
124	void	115	void
125	forklightning (object *op, object *tmp)	116	forklightning (object *op, object *tmp)
126	{	117	{
127	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 */
128	int t_dir; /* stores temporary dir calculation */	119	int t_dir; /* stores temporary dir calculation */
129	mapstruct *m;	120	maptile *m;
130	sint16 sx, sy;	121	sint16 sx, sy;
131	object *new_bolt;	122	object *new_bolt;
132		123
133	/* pick a fork direction. tmp->stats.Con is the left bias	124	/* pick a fork direction. tmp->stats.Con is the left bias
134	* i.e., the chance in 100 of forking LEFT	125	* i.e., the chance in 100 of forking LEFT
…		…
147		138
148	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)))
149	return;	140	return;
150		141
151	/* OK, we made a fork */	142	/* OK, we made a fork */
152	new_bolt = get_object ();	143	new_bolt = tmp->clone ();
153	copy_object (tmp, new_bolt);
154		144
155	/* reduce chances of subsequent forking */	145	/* reduce chances of subsequent forking */
156	new_bolt->stats.Dex -= 10;	146	new_bolt->stats.Dex -= 10;
157	tmp->stats.Dex -= 10; /* less forks from main bolt too */	147	tmp->stats.Dex -= 10; /* less forks from main bolt too */
158	new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */	148	new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
159	new_bolt->speed_left = -0.1;	149	new_bolt->speed_left = -0.1f;
160	new_bolt->direction = t_dir;	150	new_bolt->direction = t_dir;
161	new_bolt->duration++;	151	new_bolt->duration++;
162	new_bolt->x = sx;
163	new_bolt->y = sy;
164	new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */	152	new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
165	new_bolt->stats.dam++;	153	new_bolt->stats.dam++;
166	tmp->stats.dam /= 2; /* reduce father bolt damage */	154	tmp->stats.dam /= 2; /* reduce father bolt damage */
167	tmp->stats.dam++;	155	tmp->stats.dam++;
168	new_bolt = insert_ob_in_map (new_bolt, m, op, 0);	156	if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
169	update_turn_face (new_bolt);	157	update_turn_face (new_bolt);
170	}	158	}
171		159
172	/* move_bolt: moves bolt 'op'. Basically, it just advances a space,	160	/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
173	* and checks for various things that may stop it.	161	* and checks for various things that may stop it.
174	*/	162	*/
175		163
176	void	164	void
177	move_bolt (object *op)	165	move_bolt (object *op)
178	{	166	{
179	object *tmp;
180	int mflags;	167	int mflags;
181	sint16 x, y;	168	sint16 x, y;
182	mapstruct *m;	169	maptile *m;
183		170
184	if (--(op->duration) < 0)	171	if (--op->duration < 0)
185	{	172	{
186	remove_ob (op);	173	op->destroy ();
187	free_object (op);
188	return;	174	return;
189	}	175	}
190		176
191	hit_map (op, 0, op->attacktype, 1);	177	hit_map (op, 0, op->attacktype, 1);
192		178
193	if (!op->direction)	179	if (!op->direction)
194	return;	180	return;
195		181
196	if (--op->range < 0)	182	if (--op->range < 0)
197	{
198	op->range = 0;	183	op->range = 0;
199	}
200	else	184	else
201	{	185	{
202	x = op->x + DIRX (op);	186	x = op->x + DIRX (op);
203	y = op->y + DIRY (op);	187	y = op->y + DIRY (op);
204	m = op->map;	188	m = op->map;
…		…
212	* 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
213	* will be useful.	197	* will be useful.
214	*/	198	*/
215	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)))
216	{	200	{
217
218	if (!QUERY_FLAG (op, FLAG_REFLECTING))	201	if (!QUERY_FLAG (op, FLAG_REFLECTING))
219	return;	202	return;
220		203
221	/* Since walls don't run diagonal, if the bolt is in	204	/* Since walls don't run diagonal, if the bolt is in
222	* one of 4 main directions, it just reflects back in the	205	* one of 4 main directions, it just reflects back in the
…		…
252	else if (left)	235	else if (left)
253	op->direction = absdir (op->direction + 2);	236	op->direction = absdir (op->direction + 2);
254	else if (right)	237	else if (right)
255	op->direction = absdir (op->direction - 2);	238	op->direction = absdir (op->direction - 2);
256	}	239	}
		240
257	update_turn_face (op); /* A bolt *must* be IS_TURNABLE */	241	update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
258	return;	242	return;
259	}	243	}
260	else	244	else
261	{ /* Create a copy of this object and put it ahead */	245	{ /* Create a copy of this object and put it ahead */
262	tmp = get_object ();	246	object *tmp = op->clone ();
263	copy_object (op, tmp);	247
		248	m->insert (tmp, x, y, op);
264	tmp->speed_left = -0.1;	249	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 */	250	/* To make up for the decrease at the top of the function */
268	tmp->duration++;	251	tmp->duration++;
269		252
270	/* New forking code. Possibly create forks of this object	253	/* New forking code. Possibly create forks of this object
271	* going off in other directions.	254	* going off in other directions.
272	*/	255	*/
273
274	if (rndm (0, 99) < tmp->stats.Dex)	256	if (rndm (0, 99) < tmp->stats.Dex)
275	{ /* stats.Dex % of forking */	257	{ /* stats.Dex % of forking */
276	forklightning (op, tmp);	258	forklightning (op, tmp);
277	}	259	}
		260
278	/* 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
279	* doesn't create any bolts that continue to move onward.	262	* doesn't create any bolts that continue to move onward.
280	*/	263	*/
281	op->range = 0;	264	op->range = 0;
282	} /* copy object and move it along */	265	} /* copy object and move it along */
…		…
289	* we remove the magic flag - that can be derived from	272	* we remove the magic flag - that can be derived from
290	* spob->attacktype.	273	* spob->attacktype.
291	* This function sets up the appropriate owner and skill	274	* This function sets up the appropriate owner and skill
292	* pointers.	275	* pointers.
293	*/	276	*/
294
295	int	277	int
296	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)
297	{	279	{
298	object *tmp = NULL;	280	object *tmp = NULL;
299	int mflags;	281	int mflags;
…		…
317		299
318	tmp->direction = dir;	300	tmp->direction = dir;
319	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	301	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
320	SET_ANIMATION (tmp, dir);	302	SET_ANIMATION (tmp, dir);
321		303
322	set_owner (tmp, op);	304	tmp->set_owner (op);
323	set_spell_skill (op, caster, spob, tmp);	305	set_spell_skill (op, caster, spob, tmp);
324		306
325	tmp->x = op->x + DIRX (tmp);	307	tmp->x = op->x + DIRX (tmp);
326	tmp->y = op->y + DIRY (tmp);	308	tmp->y = op->y + DIRY (tmp);
327	tmp->map = op->map;	309	tmp->map = op->map;
328		310
		311	maptile *newmap;
329	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);
330	if (mflags & P_OUT_OF_MAP)	313	if (mflags & P_OUT_OF_MAP)
331	{	314	{
332	free_object (tmp);	315	tmp->destroy ();
333	return 0;	316	return 0;
334	}	317	}
		318
		319	tmp->map = newmap;
		320
335	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)))
336	{	322	{
337	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	323	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
338	{	324	{
339	free_object (tmp);	325	tmp->destroy ();
340	return 0;	326	return 0;
341	}	327	}
		328
342	tmp->x = op->x;	329	tmp->x = op->x;
343	tmp->y = op->y;	330	tmp->y = op->y;
344	tmp->direction = absdir (tmp->direction + 4);	331	tmp->direction = absdir (tmp->direction + 4);
345	tmp->map = op->map;	332	tmp->map = op->map;
346	}	333	}
347	if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)	334
		335	if ((tmp = tmp->insert_at (tmp, op)))
348	move_bolt (tmp);	336	move_bolt (tmp);
		337
349	return 1;	338	return 1;
350	}	339	}
351
352
353		340
354	/***************************************************************************	341	/***************************************************************************
355	*	342	*
356	* BULLET/BALL CODE	343	* BULLET/BALL CODE
357	*	344	*
…		…
362	* At least that is what I think this does.	349	* At least that is what I think this does.
363	*/	350	*/
364	void	351	void
365	explosion (object *op)	352	explosion (object *op)
366	{	353	{
367	object *tmp;
368	mapstruct *m = op->map;	354	maptile *m = op->map;
369	int i;	355	int i;
370		356
371	if (--(op->duration) < 0)	357	if (--op->duration < 0)
372	{	358	{
373	remove_ob (op);	359	op->destroy ();
374	free_object (op);
375	return;	360	return;
376	}	361	}
		362
377	hit_map (op, 0, op->attacktype, 0);	363	hit_map (op, 0, op->attacktype, 0);
378		364
379	if (op->range > 0)	365	if (op->range > 0)
380	{	366	{
381	for (i = 1; i < 9; i++)	367	for (i = 1; i < 9; i++)
382	{	368	{
383	sint16 dx, dy;	369	sint16 dx, dy;
384		370
385	dx = op->x + freearr_x[i];	371	dx = op->x + freearr_x[i];
386	dy = op->y + freearr_y[i];	372	dy = op->y + freearr_y[i];
		373
387	/* ok_to_put_more already does things like checks for walls,	374	/* ok_to_put_more already does things like checks for walls,
388	* out of map, etc.	375	* out of map, etc.
389	*/	376	*/
390	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))
391	{	378	{
392	tmp = get_object ();	379	object *tmp = op->clone ();
393	copy_object (op, tmp);	380
394	tmp->state = 0;	381	tmp->state = 0;
395	tmp->speed_left = -0.21;	382	tmp->speed_left = -0.21f;
396	tmp->range--;	383	tmp->range--;
397	tmp->value = 0;	384	tmp->value = 0;
398	tmp->x = dx;	385
399	tmp->y = dy;	386	m->insert (tmp, dx, dy, op);
400	insert_ob_in_map (tmp, m, op, 0);
401	}	387	}
402	}	388	}
403	}	389	}
404	}	390	}
405
406		391
407	/* Causes an object to explode, eg, a firebullet,	392	/* Causes an object to explode, eg, a firebullet,
408	* poison cloud ball, etc. op is the object to	393	* poison cloud ball, etc. op is the object to
409	* explode.	394	* explode.
410	*/	395	*/
411	void	396	void
412	explode_bullet (object *op)	397	explode_bullet (object *op)
413	{	398	{
414	tag_t op_tag = op->count;
415	object *tmp, *owner;	399	object *tmp, *owner;
416		400
417	if (op->other_arch == NULL)	401	if (op->other_arch == NULL)
418	{	402	{
419	LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");	403	LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
420	remove_ob (op);	404	op->destroy ();
421	free_object (op);
422	return;	405	return;
423	}	406	}
424		407
425	if (op->env)	408	if (op->env)
426	{	409	{
427	object *env;
428
429	env = object_get_env_recursive (op);	410	object *env = object_get_env_recursive (op);
430	if (env->map == NULL || out_of_map (env->map, env->x, env->y))	411	if (env->map == NULL || out_of_map (env->map, env->x, env->y))
431	{	412	{
432	LOG (llevError, "BUG: explode_bullet(): env out of map\n");	413	LOG (llevError, "BUG: explode_bullet(): env out of map\n");
433	remove_ob (op);	414	op->destroy ();
434	free_object (op);
435	return;	415	return;
436	}	416	}
437	remove_ob (op);	417
438	op->x = env->x;	418	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	}	419	}
442	else if (out_of_map (op->map, op->x, op->y))	420	else if (out_of_map (op->map, op->x, op->y))
443	{	421	{
444	LOG (llevError, "BUG: explode_bullet(): op out of map\n");	422	LOG (llevError, "BUG: explode_bullet(): op out of map\n");
445	remove_ob (op);	423	op->destroy ();
446	free_object (op);
447	return;	424	return;
448	}	425	}
449		426
450	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps	427	// 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	428	// NOTE: If this breaks something important: remove this. I can't think of anything
452	// bad at the moment that might happen from this.	429	// 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)	430	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
454	{	431	{
455	remove_ob (op);	432	op->destroy ();
456	free_object (op);
457	return;	433	return;
458	}	434	}
459		435
460	if (op->attacktype)	436	if (op->attacktype)
461	{	437	{
462	hit_map (op, 0, op->attacktype, 1);	438	hit_map (op, 0, op->attacktype, 1);
463	if (was_destroyed (op, op_tag))	439	if (op->destroyed ())
464	return;	440	return;
465	}	441	}
466		442
467	/* other_arch contains what this explodes into */	443	/* other_arch contains what this explodes into */
468	tmp = arch_to_object (op->other_arch);	444	tmp = arch_to_object (op->other_arch);
469		445
470	copy_owner (tmp, op);	446	tmp->set_owner (op);
471	tmp->skill = op->skill;	447	tmp->skill = op->skill;
472		448
473	owner = get_owner (op);	449	owner = op->owner;
474		450
475	if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))	451	if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
476	{	452	{
477	remove_ob (op);	453	op->destroy ();
478	free_object (op);
479	return;	454	return;
480	}	455	}
481
482	tmp->x = op->x;
483	tmp->y = op->y;
484		456
485	/* special for bombs - it actually has sane values for these */	457	/* special for bombs - it actually has sane values for these */
486	if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)	458	if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
487	{	459	{
488	tmp->attacktype = op->attacktype;	460	tmp->attacktype = op->attacktype;
…		…
492	}	464	}
493	else	465	else
494	{	466	{
495	if (op->attacktype & AT_MAGIC)	467	if (op->attacktype & AT_MAGIC)
496	tmp->attacktype |= AT_MAGIC;	468	tmp->attacktype |= AT_MAGIC;
		469
497	/* Spell doc describes what is going on here */	470	/* Spell doc describes what is going on here */
498	tmp->stats.dam = op->dam_modifier;	471	tmp->stats.dam = op->dam_modifier;
499	tmp->range = op->stats.maxhp;	472	tmp->range = op->stats.maxhp;
500	tmp->duration = op->stats.hp;	473	tmp->duration = op->stats.hp;
501	/* Used for spell tracking - just need a unique val for this spell -	474	/* Used for spell tracking - just need a unique val for this spell -
…		…
509	tmp->stats.sp = op->direction;	482	tmp->stats.sp = op->direction;
510		483
511	/* Prevent recursion */	484	/* Prevent recursion */
512	op->move_on = 0;	485	op->move_on = 0;
513		486
514	insert_ob_in_map (tmp, op->map, op, 0);	487	tmp->insert_at (op, op);
515	/* remove the firebullet */	488	/* remove the firebullet */
516	if (!was_destroyed (op, op_tag))	489	op->destroy ();
517	{
518	remove_ob (op);
519	free_object (op);
520	}
521	}	490	}
522
523
524		491
525	/* checks to see what op should do, given the space it is on	492	/* checks to see what op should do, given the space it is on
526	* (eg, explode, damage player, etc)	493	* (eg, explode, damage player, etc)
527	*/	494	*/
528
529	void	495	void
530	check_bullet (object *op)	496	check_bullet (object *op)
531	{	497	{
532	tag_t op_tag = op->count, tmp_tag;
533	object *tmp;	498	object *tmp;
534	int dam, mflags;	499	int dam, mflags;
535	mapstruct *m;	500	maptile *m;
536	sint16 sx, sy;	501	sint16 sx, sy;
537		502
538	mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);	503	mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
539		504
540	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))	505	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
…		…
549		514
550	/* If nothing alive on this space, no reason to do anything further */	515	/* If nothing alive on this space, no reason to do anything further */
551	if (!(mflags & P_IS_ALIVE))	516	if (!(mflags & P_IS_ALIVE))
552	return;	517	return;
553		518
554	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	519	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
555	{	520	{
556	if (QUERY_FLAG (tmp, FLAG_ALIVE))	521	if (QUERY_FLAG (tmp, FLAG_ALIVE))
557	{	522	{
558	tmp_tag = tmp->count;
559	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);	523	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
560	if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0)	524	if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
561	{	525	{
562	if (!QUERY_FLAG (op, FLAG_REMOVED))	526	if (!QUERY_FLAG (op, FLAG_REMOVED))
563	{	527	{
564	remove_ob (op);	528	op->destroy ();
565	free_object (op);
566	return;	529	return;
567	}	530	}
568	}	531	}
569	}	532	}
570	}	533	}
571	}	534	}
572
573		535
574	/* Basically, we move 'op' one square, and if it hits something,	536	/* Basically, we move 'op' one square, and if it hits something,
575	* call check_bullet.	537	* call check_bullet.
576	* This function is only applicable to bullets, but not to all	538	* This function is only applicable to bullets, but not to all
577	* fired arches (eg, bolts).	539	* fired arches (eg, bolts).
578	*/	540	*/
579
580	void	541	void
581	move_bullet (object *op)	542	move_bullet (object *op)
582	{	543	{
583	sint16 new_x, new_y;	544	sint16 new_x, new_y;
584	int mflags;	545	int mflags;
585	mapstruct *m;	546	maptile *m;
586		547
587	#if 0	548	#if 0
588	/* We need a better general purpose way to do this */	549	/* We need a better general purpose way to do this */
589		550
590	/* peterm: added to make comet leave a trail of burnouts	551	/* peterm: added to make comet leave a trail of burnouts
591	it's an unadulterated hack, but the effect is cool. */	552	it's an unadulterated hack, but the effect is cool. */
592	if (op->stats.sp == SP_METEOR)	553	if (op->stats.sp == SP_METEOR)
593	{	554	{
594	replace_insert_ob_in_map ("fire_trail", op);	555	replace_insert_ob_in_map ("fire_trail", op);
595	if (was_destroyed (op, op_tag))	556	if (op->destroyed ())
596	return;	557	return;
597	} /* end addition. */	558	} /* end addition. */
598	#endif	559	#endif
599		560
600	/* Reached the end of its life - remove it */	561	/* Reached the end of its life - remove it */
601	if (--op->range <= 0)	562	if (--op->range <= 0)
602	{	563	{
603	if (op->other_arch)	564	if (op->other_arch)
604	{
605	explode_bullet (op);	565	explode_bullet (op);
606	}
607	else	566	else
608	{	567	op->destroy ();
609	remove_ob (op);	568
610	free_object (op);
611	}
612	return;	569	return;
613	}	570	}
614		571
615	new_x = op->x + DIRX (op);	572	new_x = op->x + DIRX (op);
616	new_y = op->y + DIRY (op);	573	new_y = op->y + DIRY (op);
617	m = op->map;	574	m = op->map;
618	mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);	575	mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
619		576
620	if (mflags & P_OUT_OF_MAP)	577	if (mflags & P_OUT_OF_MAP)
621	{	578	{
622	remove_ob (op);	579	op->destroy ();
623	free_object (op);
624	return;	580	return;
625	}	581	}
626		582
627	if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))	583	if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
628	{	584	{
629	if (op->other_arch)	585	if (op->other_arch)
630	{
631	explode_bullet (op);	586	explode_bullet (op);
632	}
633	else	587	else
634	{	588	op->destroy ();
635	remove_ob (op);	589
636	free_object (op);
637	}
638	return;	590	return;
639	}	591	}
640		592
641	remove_ob (op);	593	if (!(op = m->insert (op, new_x, new_y, op)))
642	op->x = new_x;
643	op->y = new_y;
644	if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
645	return;	594	return;
646		595
647	if (reflwall (op->map, op->x, op->y, op))	596	if (reflwall (op->map, op->x, op->y, op))
648	{	597	{
649	op->direction = absdir (op->direction + 4);	598	op->direction = absdir (op->direction + 4);
650	update_turn_face (op);	599	update_turn_face (op);
651	}	600	}
652	else	601	else
653	{
654	check_bullet (op);	602	check_bullet (op);
655	}
656	}	603	}
657
658
659
660		604
661	/* fire_bullet	605	/* fire_bullet
662	* object op (cast from caster) files a bolt in dir.	606	* object op (cast from caster) files a bolt in dir.
663	* spob is the spell object for the bolt.	607	* spob is the spell object for the bolt.
664	* we remove the magic flag - that can be derived from	608	* we remove the magic flag - that can be derived from
665	* spob->attacktype.	609	* spob->attacktype.
666	* This function sets up the appropriate owner and skill	610	* This function sets up the appropriate owner and skill
667	* pointers.	611	* pointers.
668	*/	612	*/
669
670	int	613	int
671	fire_bullet (object *op, object *caster, int dir, object *spob)	614	fire_bullet (object *op, object *caster, int dir, object *spob)
672	{	615	{
673	object *tmp = NULL;	616	object *tmp = NULL;
674	int mflags;	617	int mflags;
…		…
695		638
696	tmp->direction = dir;	639	tmp->direction = dir;
697	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	640	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
698	SET_ANIMATION (tmp, dir);	641	SET_ANIMATION (tmp, dir);
699		642
700	set_owner (tmp, op);	643	tmp->set_owner (op);
701	set_spell_skill (op, caster, spob, tmp);	644	set_spell_skill (op, caster, spob, tmp);
702		645
703	tmp->x = op->x + freearr_x[dir];	646	tmp->x = op->x + freearr_x[dir];
704	tmp->y = op->y + freearr_y[dir];	647	tmp->y = op->y + freearr_y[dir];
705	tmp->map = op->map;	648	tmp->map = op->map;
706		649
		650	maptile *newmap;
707	mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);	651	mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
708	if (mflags & P_OUT_OF_MAP)	652	if (mflags & P_OUT_OF_MAP)
709	{	653	{
710	free_object (tmp);	654	tmp->destroy ();
711	return 0;	655	return 0;
712	}	656	}
		657
		658	tmp->map = newmap;
		659
713	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	660	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
714	{	661	{
715	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	662	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
716	{	663	{
717	free_object (tmp);	664	tmp->destroy ();
718	return 0;	665	return 0;
719	}	666	}
		667
720	tmp->x = op->x;	668	tmp->x = op->x;
721	tmp->y = op->y;	669	tmp->y = op->y;
722	tmp->direction = absdir (tmp->direction + 4);	670	tmp->direction = absdir (tmp->direction + 4);
723	tmp->map = op->map;	671	tmp->map = op->map;
724	}	672	}
725	if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)	673
726	{	674	if ((tmp = tmp->insert_at (tmp, op)))
727	check_bullet (tmp);	675	check_bullet (tmp);
728	}	676
729	return 1;	677	return 1;
730	}	678	}
731
732
733
734		679
735	/*****************************************************************************	680	/*****************************************************************************
736	*	681	*
737	* CONE RELATED FUNCTIONS	682	* CONE RELATED FUNCTIONS
738	*	683	*
739	*****************************************************************************/	684	*****************************************************************************/
740		685
741
742	/* drops an object based on what is in the cone's "other_arch" */	686	/* drops an object based on what is in the cone's "other_arch" */
743	void	687	void
744	cone_drop (object *op)	688	cone_drop (object *op)
745	{	689	{
746	object *new_ob = arch_to_object (op->other_arch);	690	object *new_ob = arch_to_object (op->other_arch);
747		691
748	new_ob->x = op->x;
749	new_ob->y = op->y;
750	new_ob->level = op->level;	692	new_ob->level = op->level;
751	set_owner (new_ob, op->owner);	693	new_ob->set_owner (op->owner);
752		694
753	/* preserve skill ownership */	695	/* preserve skill ownership */
754	if (op->skill && op->skill != new_ob->skill)	696	if (op->skill && op->skill != new_ob->skill)
755	{
756	new_ob->skill = op->skill;	697	new_ob->skill = op->skill;
757	}
758	insert_ob_in_map (new_ob, op->map, op, 0);
759		698
		699	new_ob->insert_at (op, op);
760	}	700	}
761		701
762	/* move_cone: causes cone object 'op' to move a space/hit creatures */	702	/* move_cone: causes cone object 'op' to move a space/hit creatures */
763		703
764	void	704	void
765	move_cone (object *op)	705	move_cone (object *op)
766	{	706	{
767	int i;	707	int i;
768	tag_t tag;
769		708
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.
…		…
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;	940	int i;
1013	object *env, *tmp;	941	object *env, *tmp;
1014	archetype *at;
1015		942
1016	if (op->state != NUM_ANIMATIONS (op) - 1)	943	if (op->state != NUM_ANIMATIONS (op) - 1)
1017	return;	944	return;
1018		945
1019	env = object_get_env_recursive (op);	946	env = object_get_env_recursive (op);
…		…
1024	return;	951	return;
1025		952
1026	if (env->type == PLAYER)	953	if (env->type == PLAYER)
1027	esrv_del_item (env->contr, op->count);	954	esrv_del_item (env->contr, op->count);
1028		955
1029	remove_ob (op);	956	if (!(op = op->insert_at (env, 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;	957	return;
1034	}	958	}
1035		959
1036	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding	960	// 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	961	// on a safe map. I don't like this special casing, but it seems to be neccessary
1038	// as bombs can be carried.	962	// as bombs can be carried.
1039	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)	963	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1040	{	964	{
1041	remove_ob (op);	965	op->destroy ();
1042	free_object (op);
1043	return;	966	return;
1044	}	967	}
1045		968
1046	/* This copies a lot of the code from the fire bullet,	969	/* This copies a lot of the code from the fire bullet,
1047	* but using the cast_bullet isn't really feasible,	970	* but using the cast_bullet isn't really feasible,
1048	* so just set up the appropriate values.	971	* so just set up the appropriate values.
1049	*/	972	*/
1050	at = find_archetype (SPLINT);	973	if (archetype *at = archetype::find (SPLINT))
1051	if (at)
1052	{	974	{
1053	for (i = 1; i < 9; i++)	975	for (i = 1; i < 9; i++)
1054	{	976	{
1055	if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))	977	if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1056	continue;	978	continue;
		979
1057	tmp = arch_to_object (at);	980	tmp = arch_to_object (at);
1058	tmp->direction = i;	981	tmp->direction = i;
1059	tmp->range = op->range;	982	tmp->range = op->range;
1060	tmp->stats.dam = op->stats.dam;	983	tmp->stats.dam = op->stats.dam;
1061	tmp->duration = op->duration;	984	tmp->duration = op->duration;
1062	tmp->attacktype = op->attacktype;	985	tmp->attacktype = op->attacktype;
1063	copy_owner (tmp, op);	986	tmp->set_owner (op);
1064	if (op->skill && op->skill != tmp->skill)	987	if (op->skill && op->skill != tmp->skill)
1065	{
1066	tmp->skill = op->skill;	988	tmp->skill = op->skill;
1067	}	989
1068	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	990	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1069	SET_ANIMATION (tmp, i);	991	SET_ANIMATION (tmp, i);
1070	tmp->x = op->x + freearr_x[i];	992
1071	tmp->y = op->y + freearr_x[i];	993	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);	994	move_bullet (tmp);
1074	}	995	}
1075	}	996	}
1076		997
1077	explode_bullet (op);	998	explode_bullet (op);
…		…
1082	{	1003	{
1083		1004
1084	object *tmp;	1005	object *tmp;
1085	int mflags;	1006	int mflags;
1086	sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];	1007	sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1087	mapstruct *m;	1008	maptile *m;
1088		1009
1089	mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);	1010	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))	1011	if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1091	{	1012	{
1092	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	1013	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
…		…
1098	tmp->range = spell->range + SP_level_range_adjust (caster, spell);	1019	tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1099	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1020	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1100	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);	1021	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1101	tmp->attacktype = spell->attacktype;	1022	tmp->attacktype = spell->attacktype;
1102		1023
1103	set_owner (tmp, op);	1024	tmp->set_owner (op);
1104	set_spell_skill (op, caster, spell, tmp);	1025	set_spell_skill (op, caster, spell, tmp);
1105	tmp->x = dx;	1026
1106	tmp->y = dy;	1027	m->insert (tmp, dx, dy, op);
1107	insert_ob_in_map (tmp, m, op, 0);
1108	return 1;	1028	return 1;
1109	}	1029	}
1110		1030
1111	/****************************************************************************	1031	/****************************************************************************
1112	*	1032	*
…		…
1121	* dir is the direction to look in.	1041	* dir is the direction to look in.
1122	* range is how far out to look.	1042	* range is how far out to look.
1123	* type is the type of spell - either SPELL_MANA or SPELL_GRACE.	1043	* type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1124	* this info is used for blocked magic/unholy spaces.	1044	* this info is used for blocked magic/unholy spaces.
1125	*/	1045	*/
1126
1127	object *	1046	object *
1128	get_pointed_target (object *op, int dir, int range, int type)	1047	get_pointed_target (object *op, int dir, int range, int type)
1129	{	1048	{
1130	object *target;	1049	object *target;
1131	sint16 x, y;	1050	sint16 x, y;
1132	int dist, mflags;	1051	int dist, mflags;
1133	mapstruct *mp;	1052	maptile *mp;
1134		1053
1135	if (dir == 0)	1054	if (dir == 0)
1136	return NULL;	1055	return NULL;
1137		1056
1138	for (dist = 1; dist < range; dist++)	1057	for (dist = 1; dist < range; dist++)
…		…
1150	return NULL;	1069	return NULL;
1151	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)	1070	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1152	return NULL;	1071	return NULL;
1153		1072
1154	if (mflags & P_IS_ALIVE)	1073	if (mflags & P_IS_ALIVE)
1155	{
1156	for (target = get_map_ob (mp, x, y); target; target = target->above)	1074	for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1157	{	1075	if (QUERY_FLAG (target, FLAG_MONSTER))
1158	if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1159	{
1160	return target;	1076	return target;
1161	}
1162	}
1163	}
1164	}	1077	}
		1078
1165	return NULL;	1079	return NULL;
1166	}	1080	}
1167
1168		1081
1169	/* cast_smite_arch() - the priest points to a creature and causes	1082	/* cast_smite_arch() - the priest points to a creature and causes
1170	* a 'godly curse' to decend.	1083	* a 'godly curse' to decend.
1171	* usual params -	1084	* usual params -
1172	* op = player	1085	* op = player
…		…
1228	if (effect->attacktype & AT_DEATH)	1141	if (effect->attacktype & AT_DEATH)
1229	{	1142	{
1230	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1143	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1231		1144
1232	/* casting death spells at undead isn't a good thing */	1145	/* casting death spells at undead isn't a good thing */
1233	if QUERY_FLAG
1234	(target, FLAG_UNDEAD)	1146	if (QUERY_FLAG (target, FLAG_UNDEAD))
1235	{	1147	{
1236	if (random_roll (0, 2, op, PREFER_LOW))	1148	if (random_roll (0, 2, op, PREFER_LOW))
1237	{	1149	{
1238	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");	1150	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1239	effect->x = op->x;	1151	effect->x = op->x;
…		…
1241	}	1153	}
1242	else	1154	else
1243	{	1155	{
1244	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));	1156	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1245	target->stats.hp = target->stats.maxhp * 2;	1157	target->stats.hp = target->stats.maxhp * 2;
1246	free_object (effect);	1158	effect->destroy ();
1247	return 0;	1159	return 0;
1248	}	1160	}
1249	}	1161	}
1250	}	1162	}
1251	else	1163	else
1252	{	1164	{
1253	/* how much woe to inflict :) */	1165	/* how much woe to inflict :) */
1254	effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1166	effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1255	}	1167	}
1256		1168
1257	set_owner (effect, op);	1169	effect->set_owner (op);
1258	set_spell_skill (op, caster, spell, effect);	1170	set_spell_skill (op, caster, spell, effect);
1259		1171
1260	/* ok, tell it where to be, and insert! */	1172	/* ok, tell it where to be, and insert! */
1261	effect->x = target->x;	1173	effect->insert_at (target, op);
1262	effect->y = target->y;
1263	insert_ob_in_map (effect, target->map, op, 0);
1264		1174
1265	return 1;	1175	return 1;
1266	}	1176	}
1267		1177
1268		1178
…		…
1278	move_missile (object *op)	1188	move_missile (object *op)
1279	{	1189	{
1280	int i, mflags;	1190	int i, mflags;
1281	object *owner;	1191	object *owner;
1282	sint16 new_x, new_y;	1192	sint16 new_x, new_y;
1283	mapstruct *m;	1193	maptile *m;
1284		1194
1285	if (op->range-- <= 0)	1195	if (op->range-- <= 0)
1286	{	1196	{
1287	remove_ob (op);	1197	op->destroy ();
1288	free_object (op);
1289	return;	1198	return;
1290	}	1199	}
1291		1200
1292	owner = get_owner (op);	1201	owner = op->owner;
1293	#if 0	1202	#if 0
1294	/* It'd make things nastier if this wasn't here - spells cast by	1203	/* It'd make things nastier if this wasn't here - spells cast by
1295	* monster that are then killed would continue to survive	1204	* monster that are then killed would continue to survive
1296	*/	1205	*/
1297	if (owner == NULL)	1206	if (owner == NULL)
1298	{	1207	{
1299	remove_ob (op);	1208	op->destroy ();
1300	free_object (op);
1301	return;	1209	return;
1302	}	1210	}
1303	#endif	1211	#endif
1304		1212
1305	new_x = op->x + DIRX (op);	1213	new_x = op->x + DIRX (op);
…		…
1307		1215
1308	mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);	1216	mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1309		1217
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))))	1218	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	{	1219	{
1312	tag_t tag = op->count;
1313
1314	hit_map (op, op->direction, AT_MAGIC, 1);	1220	hit_map (op, op->direction, AT_MAGIC, 1);
1315	/* Basically, missile only hits one thing then goes away.	1221	/* Basically, missile only hits one thing then goes away.
1316	* we need to remove it if someone hasn't already done so.	1222	* we need to remove it if someone hasn't already done so.
1317	*/	1223	*/
1318	if (!was_destroyed (op, tag))	1224	if (!op->destroyed ())
1319	{	1225	op->destroy ();
1320	remove_ob (op);	1226
1321	free_object (op);
1322	}
1323	return;	1227	return;
1324	}	1228	}
1325		1229
1326	remove_ob (op);	1230	op->remove ();
		1231
1327	if (!op->direction || (mflags & P_OUT_OF_MAP))	1232	if (!op->direction || (mflags & P_OUT_OF_MAP))
1328	{	1233	{
1329	free_object (op);	1234	op->destroy ();
1330	return;	1235	return;
1331	}	1236	}
1332	op->x = new_x;	1237
1333	op->y = new_y;	1238	i = spell_find_dir (m, new_x, new_y, op->owner);
1334	op->map = m;
1335	i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1336	if (i > 0 && i != op->direction)	1239	if (i > 0 && i != op->direction)
1337	{	1240	{
1338	op->direction = i;	1241	op->direction = i;
1339	SET_ANIMATION (op, op->direction);	1242	SET_ANIMATION (op, op->direction);
1340	}	1243	}
1341	insert_ob_in_map (op, op->map, op, 0);	1244
		1245	m->insert (op, new_x, new_y, op);
1342	}	1246	}
1343		1247
1344	/****************************************************************************	1248	/****************************************************************************
1345	* Destruction	1249	* Destruction
1346	****************************************************************************/	1250	****************************************************************************/
…		…
1383	return 0;	1287	return 0;
1384	}	1288	}
1385	return 1;	1289	return 1;
1386	}	1290	}
1387		1291
1388
1389
1390
1391	int	1292	int
1392	cast_destruction (object *op, object *caster, object *spell_ob)	1293	cast_destruction (object *op, object *caster, object *spell_ob)
1393	{	1294	{
1394	int i, j, range, mflags, friendly = 0, dam, dur;	1295	int i, j, range, mflags, friendly = 0, dam, dur;
1395	sint16 sx, sy;	1296	sint16 sx, sy;
1396	mapstruct *m;	1297	maptile *m;
1397	object *tmp;	1298	object *tmp;
1398	const char *skill;	1299	const char *skill;
1399		1300
1400	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	1301	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1401	dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	1302	dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
…		…
1415	else if (caster->skill)	1316	else if (caster->skill)
1416	op->skill = caster->skill;	1317	op->skill = caster->skill;
1417	else	1318	else
1418	op->skill = NULL;	1319	op->skill = NULL;
1419		1320
1420	change_skill (op, find_skill_by_name (op, op->skill), 1);	1321	op->change_skill (find_skill_by_name (op, op->skill));
1421		1322
1422	for (i = -range; i < range; i++)	1323	for (i = -range; i < range; i++)
1423	{	1324	{
1424	for (j = -range; j < range; j++)	1325	for (j = -range; j < range; j++)
1425	{	1326	{
1426	m = op->map;	1327	m = op->map;
1427	sx = op->x + i;	1328	sx = op->x + i;
1428	sy = op->y + j;	1329	sy = op->y + j;
		1330
1429	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	1331	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1430	if (mflags & P_OUT_OF_MAP)	1332	if (mflags & P_OUT_OF_MAP)
1431	continue;	1333	continue;
		1334
1432	if (mflags & P_IS_ALIVE)	1335	if (mflags & P_IS_ALIVE)
1433	{	1336	{
1434	for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above)	1337	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1435	{
1436	if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)	1338	if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1437	break;	1339	break;
1438	}	1340
1439	if (tmp)	1341	if (tmp)
1440	{	1342	{
1441	if (tmp->head)	1343	if (tmp->head)
1442	tmp = tmp->head;	1344	tmp = tmp->head;
1443		1345
…		…
1446	{	1348	{
1447	if (spell_ob->subtype == SP_DESTRUCTION)	1349	if (spell_ob->subtype == SP_DESTRUCTION)
1448	{	1350	{
1449	hit_player (tmp, dam, op, spell_ob->attacktype, 0);	1351	hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1450	if (spell_ob->other_arch)	1352	if (spell_ob->other_arch)
1451	{
1452	tmp = arch_to_object (spell_ob->other_arch);	1353	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	}	1354	}
1458	else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)	1355	else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1459	{	1356	{
1460	if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)	1357	if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1461	{
1462	object *effect = arch_to_object (spell_ob->other_arch);	1358	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	}	1359	}
1469	}	1360	}
1470	}	1361	}
1471	}	1362	}
1472	}	1363	}
1473	}	1364	}
		1365
1474	op->skill = skill;	1366	op->skill = skill;
1475	return 1;	1367	return 1;
1476	}	1368	}
1477		1369
1478	/***************************************************************************	1370	/***************************************************************************
…		…
1538	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1430	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1539	}	1431	}
1540	return 1;	1432	return 1;
1541	}	1433	}
1542	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1434	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1543	force->speed = 1.0;	1435	force->speed = 1.f;
1544	force->speed_left = -1.0;	1436	force->speed_left = -1.f;
1545	SET_FLAG (force, FLAG_APPLIED);	1437	SET_FLAG (force, FLAG_APPLIED);
1546		1438
1547	if (god)	1439	if (god)
1548	{	1440	{
1549	if (spell_ob->last_grace)	1441	if (spell_ob->last_grace)
…		…
1562	force->stats.ac = spell_ob->stats.ac;	1454	force->stats.ac = spell_ob->stats.ac;
1563	force->stats.wc = spell_ob->stats.wc;	1455	force->stats.wc = spell_ob->stats.wc;
1564		1456
1565	change_abil (tmp, force); /* Mostly to display any messages */	1457	change_abil (tmp, force); /* Mostly to display any messages */
1566	insert_ob_in_ob (force, tmp);	1458	insert_ob_in_ob (force, tmp);
1567	fix_player (tmp);	1459	tmp->update_stats ();
1568	return 1;	1460	return 1;
1569		1461
1570	}	1462	}
1571
1572		1463
1573	/**********************************************************************	1464	/**********************************************************************
1574	* mood change	1465	* mood change
1575	* Arguably, this may or may not be an attack spell. But since it	1466	* 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	1467	* effects monsters, it seems best to put it into this file
…		…
1583	mood_change (object *op, object *caster, object *spell)	1474	mood_change (object *op, object *caster, object *spell)
1584	{	1475	{
1585	object *tmp, *god, *head;	1476	object *tmp, *god, *head;
1586	int done_one, range, mflags, level, at, best_at;	1477	int done_one, range, mflags, level, at, best_at;
1587	sint16 x, y, nx, ny;	1478	sint16 x, y, nx, ny;
1588	mapstruct *m;	1479	maptile *m;
1589	const char *race;	1480	const char *race;
1590		1481
1591	/* We precompute some values here so that we don't have to keep	1482	/* We precompute some values here so that we don't have to keep
1592	* doing it over and over again.	1483	* doing it over and over again.
1593	*/	1484	*/
…		…
1606	else if (god && !strcmp (spell->race, "GOD_FRIEND"))	1497	else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1607	race = god->race;	1498	race = god->race;
1608	else	1499	else
1609	race = spell->race;	1500	race = spell->race;
1610		1501
1611
1612	for (x = op->x - range; x <= op->x + range; x++)	1502	for (x = op->x - range; x <= op->x + range; x++)
1613	for (y = op->y - range; y <= op->y + range; y++)	1503	for (y = op->y - range; y <= op->y + range; y++)
1614	{	1504	{
1615
1616	done_one = 0;	1505	done_one = 0;
1617	m = op->map;	1506	m = op->map;
1618	nx = x;	1507	nx = x;
1619	ny = y;	1508	ny = y;
1620	mflags = get_map_flags (m, &m, x, y, &nx, &ny);	1509	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
…		…
1623		1512
1624	/* If there is nothing living on this space, no need to go further */	1513	/* If there is nothing living on this space, no need to go further */
1625	if (!(mflags & P_IS_ALIVE))	1514	if (!(mflags & P_IS_ALIVE))
1626	continue;	1515	continue;
1627		1516
		1517	// players can only affect spaces that they can actually see
		1518	if (caster && caster->contr
		1519	&& caster->contr->visibility_at (m, nx, ny) < 70)
		1520	continue;
		1521
1628	for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)	1522	for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1629	if (QUERY_FLAG (tmp, FLAG_MONSTER))	1523	if (QUERY_FLAG (tmp, FLAG_MONSTER))
1630	break;	1524	break;
1631		1525
1632	/* There can be living objects that are not monsters */	1526	/* There can be living objects that are not monsters */
1633	if (!tmp || tmp->type == PLAYER)	1527	if (!tmp || tmp->type == PLAYER)
…		…
1640	head = tmp;	1534	head = tmp;
1641		1535
1642	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */	1536	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1643	if (race && head->race && !strstr (race, head->race))	1537	if (race && head->race && !strstr (race, head->race))
1644	continue;	1538	continue;
		1539
1645	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))	1540	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1646	continue;	1541	continue;
1647		1542
1648	/* Now do a bunch of stuff related to saving throws */	1543	/* Now do a bunch of stuff related to saving throws */
1649	best_at = -1;	1544	best_at = -1;
…		…
1666	at -= level / 5;	1561	at -= level / 5;
1667	if (did_make_save (head, head->level, at))	1562	if (did_make_save (head, head->level, at))
1668	continue;	1563	continue;
1669	}	1564	}
1670	else /* spell->attacktype */	1565	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	{	1566	{
		1567	/*
		1568	Spell has no attacktype (charm & such), so we'll have a specific saving:
		1569	* if spell level < monster level, no go
		1570	* else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
		1571
		1572	The chance will then be in the range [20-70] percent, not too bad.
		1573
		1574	This is required to fix the 'charm monster' abuse, where a player level 1 can
		1575	charm a level 125 monster...
		1576
		1577	Ryo, august 14th
		1578	*/
1684	if (head->level > level)	1579	if (head->level > level)
1685	continue;	1580	continue;
		1581
1686	if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))	1582	if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1687	/* Failed, no effect */	1583	/* Failed, no effect */
1688	continue;	1584	continue;
1689	}	1585	}
1690		1586
1691	/* Done with saving throw. Now start effecting the monster */	1587	/* Done with saving throw. Now start affecting the monster */
1692		1588
1693	/* aggravation */	1589	/* aggravation */
1694	if (QUERY_FLAG (spell, FLAG_MONSTER))	1590	if (QUERY_FLAG (spell, FLAG_MONSTER))
1695	{	1591	{
1696	CLEAR_FLAG (head, FLAG_SLEEP);	1592	CLEAR_FLAG (head, FLAG_SLEEP);
1697	if (QUERY_FLAG (head, FLAG_FRIENDLY))
1698	remove_friendly_object (head);	1593	remove_friendly_object (head);
1699
1700	done_one = 1;	1594	done_one = 1;
1701	head->enemy = op;	1595	head->enemy = op;
1702	}	1596	}
1703		1597
1704	/* calm monsters */	1598	/* calm monsters */
…		…
1713	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))	1607	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1714	{	1608	{
1715	SET_FLAG (head, FLAG_BERSERK);	1609	SET_FLAG (head, FLAG_BERSERK);
1716	done_one = 1;	1610	done_one = 1;
1717	}	1611	}
		1612
1718	/* charm */	1613	/* charm */
1719	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))	1614	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1720	{	1615	{
1721	SET_FLAG (head, FLAG_FRIENDLY);
1722	/* Prevent uncontolled outbreaks of self replicating monsters.	1616	/* Prevent uncontolled outbreaks of self replicating monsters.
1723	Typical use case is charm, go somwhere, use aggravation to make hostile.	1617	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. */	1618	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1725	CLEAR_FLAG (head, FLAG_GENERATOR);	1619	CLEAR_FLAG (head, FLAG_GENERATOR);
1726	set_owner (head, op);	1620	head->set_owner (op);
1727	set_spell_skill (op, caster, spell, head);	1621	set_spell_skill (op, caster, spell, head);
1728	add_friendly_object (head);	1622	add_friendly_object (head);
1729	head->attack_movement = PETMOVE;	1623	head->attack_movement = PETMOVE;
1730	done_one = 1;	1624	done_one = 1;
1731	change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);	1625	change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1732	head->stats.exp = 0;	1626	head->stats.exp = 0;
1733	}	1627	}
1734		1628
1735	/* If a monster was effected, put an effect in */	1629	/* If a monster was effected, put an effect in */
1736	if (done_one && spell->other_arch)	1630	if (done_one && spell->other_arch)
1737	{
1738	tmp = arch_to_object (spell->other_arch);	1631	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 */	1632	} /* for y */
1744		1633
1745	return 1;	1634	return 1;
1746	}	1635	}
1747		1636
…		…
1757	move_ball_spell (object *op)	1646	move_ball_spell (object *op)
1758	{	1647	{
1759	int i, j, dam_save, dir, mflags;	1648	int i, j, dam_save, dir, mflags;
1760	sint16 nx, ny, hx, hy;	1649	sint16 nx, ny, hx, hy;
1761	object *owner;	1650	object *owner;
1762	mapstruct *m;	1651	maptile *m;
1763		1652
1764	owner = get_owner (op);	1653	owner = op->owner;
1765		1654
1766	/* the following logic makes sure that the ball doesn't move into a wall,	1655	/* 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	1656	* 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	1657	* 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	1658	* offset to move the ball, eg, keep it mostly on course, with some
…		…
1798	nx = op->x;	1687	nx = op->x;
1799	ny = op->y;	1688	ny = op->y;
1800	m = op->map;	1689	m = op->map;
1801	}	1690	}
1802		1691
1803	remove_ob (op);	1692	m->insert (op, nx, ny, op);
1804	op->y = ny;
1805	op->x = nx;
1806	insert_ob_in_map (op, m, op, 0);
1807		1693
1808	dam_save = op->stats.dam; /* save the original dam: we do halfdam on	1694	dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1809	surrounding squares */	1695	surrounding squares */
1810		1696
1811	/* loop over current square and neighbors to hit.	1697	/* loop over current square and neighbors to hit.
1812	* if this has an other_arch field, we insert that in	1698	* if this has an other_arch field, we insert that in
1813	* the surround spaces.	1699	* the surround spaces.
1814	*/	1700	*/
1815	for (j = 0; j < 9; j++)	1701	for (j = 0; j < 9; j++)
1816	{	1702	{
1817	object *new_ob;
1818
1819	hx = nx + freearr_x[j];	1703	hx = nx + freearr_x[j];
1820	hy = ny + freearr_y[j];	1704	hy = ny + freearr_y[j];
1821		1705
1822	m = op->map;	1706	m = op->map;
1823	mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);	1707	mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
…		…
1837		1721
1838	}	1722	}
1839		1723
1840	/* insert the other arch */	1724	/* insert the other arch */
1841	if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))	1725	if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1842	{	1726	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	}	1727	}
1849		1728
1850	/* restore to the center location and damage */	1729	/* restore to the center location and damage */
1851	op->stats.dam = dam_save;	1730	op->stats.dam = dam_save;
1852		1731
1853	i = spell_find_dir (op->map, op->x, op->y, get_owner (op));	1732	i = spell_find_dir (op->map, op->x, op->y, op->owner);
1854		1733
1855	if (i >= 0)	1734	if (i >= 0)
1856	{ /* we have a preferred direction! */	1735	{ /* we have a preferred direction! */
1857	/* pick another direction if the preferred dir is blocked. */	1736	/* 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 ||	1737	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)))	1738	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1860	{
1861	i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */	1739	i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1862	}	1740
1863	op->direction = i;	1741	op->direction = i;
1864	}	1742	}
1865	}	1743	}
1866		1744
1867		1745
…		…
1879	#if 0	1757	#if 0
1880	static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };	1758	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 };	1759	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;	1760	sint16 target_x, target_y, origin_x, origin_y;
1883	int adjustdir;	1761	int adjustdir;
1884	mapstruct *m;	1762	maptile *m;
1885	#endif	1763	#endif
1886	int basedir;	1764	int basedir;
1887	object *owner;	1765	object *owner;
1888		1766
1889	owner = get_owner (op);	1767	owner = op->owner;
1890	if (op->duration == 0 || owner == NULL)	1768	if (op->duration == 0 || owner == NULL)
1891	{	1769	{
1892	remove_ob (op);	1770	op->destroy ();
1893	free_object (op);
1894	return;	1771	return;
1895	}	1772	}
		1773
1896	op->duration--;	1774	op->duration--;
1897		1775
1898	basedir = op->direction;	1776	basedir = op->direction;
1899	if (basedir == 0)	1777	if (basedir == 0)
1900	{	1778	{
…		…
1905	#if 0	1783	#if 0
1906	// this is bogus: it causes wrong places to be checked below	1784	// this is bogus: it causes wrong places to be checked below
1907	// (a wall 2 cells away will block the effect...) and	1785	// (a wall 2 cells away will block the effect...) and
1908	// doesn't work for SP_BULLET anyhow, so again tests the wrong	1786	// doesn't work for SP_BULLET anyhow, so again tests the wrong
1909	// space.	1787	// space.
1910	// should be fixed later, but correctness before featurs...	1788	// should be fixed later, but correctness before features...
1911	// (schmorp)	1789	// (schmorp)
1912		1790
1913	/* new offset calculation to make swarm element distribution	1791	/* new offset calculation to make swarm element distribution
1914	* more uniform	1792	* more uniform
1915	*/	1793	*/
…		…
1997		1875
1998	if (!spell->other_arch)	1876	if (!spell->other_arch)
1999	return 0;	1877	return 0;
2000		1878
2001	tmp = get_archetype (SWARM_SPELL);	1879	tmp = get_archetype (SWARM_SPELL);
2002	tmp->x = op->x;
2003	tmp->y = op->y;
2004	set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */	1880	tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
2005	set_spell_skill (op, caster, spell, tmp);	1881	set_spell_skill (op, caster, spell, tmp);
2006		1882
2007	tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */	1883	tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2008	tmp->spell = arch_to_object (spell->other_arch);	1884	tmp->spell = arch_to_object (spell->other_arch);
2009		1885
2010	tmp->attacktype = tmp->spell->attacktype;	1886	tmp->attacktype = tmp->spell->attacktype;
2011		1887
2012	if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)	1888	if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2013	{
2014	if (!tailor_god_spell (tmp, op))	1889	if (!tailor_god_spell (tmp, op))
2015	return 1;	1890	return 1;
2016	}	1891
2017	tmp->duration = SP_level_duration_adjust (caster, spell);	1892	tmp->duration = SP_level_duration_adjust (caster, spell);
2018	for (i = 0; i < spell->duration; i++)	1893	for (i = 0; i < spell->duration; i++)
2019	tmp->duration += die_roll (1, 3, op, PREFER_HIGH);	1894	tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2020		1895
2021	tmp->direction = dir;	1896	tmp->direction = dir;
2022	tmp->invisible = 1;	1897	tmp->invisible = 1;
2023	insert_ob_in_map (tmp, op->map, op, 0);	1898
		1899	tmp->insert_at (op, op);
2024	return 1;	1900	return 1;
2025	}	1901	}
2026		1902
2027		1903
2028	/* See the spells documentation file for why this is its own	1904	/* See the spells documentation file for why this is its own
…		…
2032	cast_light (object *op, object *caster, object *spell, int dir)	1908	cast_light (object *op, object *caster, object *spell, int dir)
2033	{	1909	{
2034	object *target = NULL, *tmp = NULL;	1910	object *target = NULL, *tmp = NULL;
2035	sint16 x, y;	1911	sint16 x, y;
2036	int dam, mflags;	1912	int dam, mflags;
2037	mapstruct *m;	1913	maptile *m;
2038		1914
2039	dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1915	dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2040		1916
2041	if (!dir)	1917	if (!dir)
2042	{	1918	{
…		…
2056	return 0;	1932	return 0;
2057	}	1933	}
2058		1934
2059	if (mflags & P_IS_ALIVE && spell->attacktype)	1935	if (mflags & P_IS_ALIVE && spell->attacktype)
2060	{	1936	{
2061	for (target = get_map_ob (m, x, y); target; target = target->above)	1937	for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2062	if (QUERY_FLAG (target, FLAG_MONSTER))	1938	if (QUERY_FLAG (target, FLAG_MONSTER))
2063	{	1939	{
2064	/* oky doky. got a target monster. Lets make a blinding attack */	1940	/* oky doky. got a target monster. Lets make a blinding attack */
2065	if (target->head)	1941	if (target->head)
2066	target = target->head;	1942	target = target->head;
…		…
2088	{	1964	{
2089	tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);	1965	tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2090	if (tmp->glow_radius > MAX_LIGHT_RADII)	1966	if (tmp->glow_radius > MAX_LIGHT_RADII)
2091	tmp->glow_radius = MAX_LIGHT_RADII;	1967	tmp->glow_radius = MAX_LIGHT_RADII;
2092	}	1968	}
2093	tmp->x = x;	1969
2094	tmp->y = y;	1970	m->insert (tmp, x, y, op);
2095	insert_ob_in_map (tmp, m, op, 0);
2096	return 1;	1971	return 1;
2097	}	1972	}
2098		1973
2099		1974
2100		1975
…		…
2110	cast_cause_disease (object *op, object *caster, object *spell, int dir)	1985	cast_cause_disease (object *op, object *caster, object *spell, int dir)
2111	{	1986	{
2112	sint16 x, y;	1987	sint16 x, y;
2113	int i, mflags, range, dam_mod, dur_mod;	1988	int i, mflags, range, dam_mod, dur_mod;
2114	object *walk;	1989	object *walk;
2115	mapstruct *m;	1990	maptile *m;
2116		1991
2117	x = op->x;	1992	x = op->x;
2118	y = op->y;	1993	y = op->y;
2119		1994
2120	/* If casting from a scroll, no direction will be available, so refer to the	1995	/* If casting from a scroll, no direction will be available, so refer to the
…		…
2148		2023
2149	/* Only bother looking on this space if there is something living here */	2024	/* Only bother looking on this space if there is something living here */
2150	if (mflags & P_IS_ALIVE)	2025	if (mflags & P_IS_ALIVE)
2151	{	2026	{
2152	/* search this square for a victim */	2027	/* search this square for a victim */
2153	for (walk = get_map_ob (m, x, y); walk; walk = walk->above)	2028	for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2154	if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))	2029	if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2155	{ /* found a victim */	2030	{ /* found a victim */
2156	object *disease = arch_to_object (spell->other_arch);	2031	object *disease = arch_to_object (spell->other_arch);
2157		2032
2158	set_owner (disease, op);	2033	disease->set_owner (op);
2159	set_spell_skill (op, caster, spell, disease);	2034	set_spell_skill (op, caster, spell, disease);
2160	disease->stats.exp = 0;	2035	disease->stats.exp = 0;
2161	disease->level = caster_level (caster, spell);	2036	disease->level = caster_level (caster, spell);
2162		2037
2163	/* do level adjustments */	2038	/* do level adjustments */
…		…
2208	if (disease->stats.sp)	2083	if (disease->stats.sp)
2209	disease->stats.sp -= dam_mod;	2084	disease->stats.sp -= dam_mod;
2210		2085
2211	if (infect_object (walk, disease, 1))	2086	if (infect_object (walk, disease, 1))
2212	{	2087	{
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);	2088	new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2216		2089
2217	free_object (disease); /* don't need this one anymore */	2090	disease->destroy (); /* don't need this one anymore */
2218	flash = get_archetype (ARCH_DETECT_MAGIC);	2091	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;	2092	return 1;
2224	}	2093	}
2225	free_object (disease);	2094
		2095	disease->destroy ();
2226	}	2096	}
2227	} /* if living creature */	2097	} /* if living creature */
2228	} /* for range of spaces */	2098	} /* for range of spaces */
		2099
2229	new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");	2100	new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2230	return 1;	2101	return 1;
2231	}	2102	}

Diff Legend

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