[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.13 by root, Tue Sep 12 17:23:02 2006 UTC vs.
Revision 1.75 by root, Mon Jul 14 00:04:57 2008 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at crossfire-devel@real-time.com
22	*/	22	*/
23
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <spells.h>	25	#include <spells.h>
27	#include <object.h>	26	#include <object.h>
28	#include <errno.h>	27	#include <errno.h>
29	#ifndef __CEXTRACT__
30	# include <sproto.h>	28	#include <sproto.h>
31	#endif
32	#include <sounds.h>	29	#include <sounds.h>
33		30
34	extern char *spell_mapping[];	31	extern char *spell_mapping[];
35		32
36	/* This returns a random spell from 'ob'. If skill is set, then	33	/* This returns a random spell from 'ob'. If skill is set, then
80	dest->skill = spob->skill;	77	dest->skill = spob->skill;
81	else	78	else
82	dest->skill = caster->skill;	79	dest->skill = caster->skill;
83	}	80	}
84		81
85	/* init_spells: This should really be called check_spells, as that
86	* is what it does. It goes through the spells looking for any
87	* obvious errors. This was most useful in debugging when re-doing
88	* all the spells to catch simple errors. To use it all the time
89	* will result in it spitting out messages that aren't really errors.
90	*/
91	void
92	init_spells (void)
93	{
94	#ifdef SPELL_DEBUG
95	static int init_spells_done = 0;
96	int i;
97	archetype *at;
98
99	if (init_spells_done)
100	return;
101	LOG (llevDebug, "Checking spells...\n");
102
103	for (at = first_archetype; at; at = at->next)
104	{
105	if (at->clone.type == SPELL)
106	{
107	if (at->clone.skill)
108	{
109	for (i = 1; i < NUM_SKILLS; i++)
110	if (!strcmp (skill_names[i], at->clone.skill))
111	break;
112	if (i == NUM_SKILLS)
113	{
114	LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
115	}
116	}
117	/* other_arch is already checked for in the loader */
118	}
119	}
120
121	i = 0;
122	while (spell_mapping[i])
123	{
124	if (!find_archetype (spell_mapping[i]))
125	{
126	LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
127	}
128	i++;
129	}
130	LOG (llevDebug, "Checking spells completed.\n");
131	#endif
132	}
133
134	/* Dumps all the spells - now also dumps skill associated with the spell.
135	* not sure what this would be used for, as the data seems pretty
136	* minimal, but easy enough to keep around.
137	*/
138	void
139	dump_spells (void)
140	{
141	archetype *at;
142
143	for (at = first_archetype; at; at = at->next)
144	{
145	if (at->clone.type == SPELL)
146	{
147	fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
148	&at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
149	}
150	}
151	}
152
153	/* pretty basic function - basically just takes	82	/* pretty basic function - basically just takes
154	* an object, sets the x,y, and calls insert_ob_in_map	83	* an object, sets the x,y, and calls insert_ob_in_map
155	*/	84	*/
156
157	void	85	void
158	spell_effect (object spob, int x, int y, mapstruct map, object *originator)	86	spell_effect (object spob, int x, int y, maptile map, object *originator)
159	{	87	{
160
161	if (spob->other_arch != NULL)	88	if (spob->other_arch)
162	{	89	map->insert (arch_to_object (spob->other_arch), x, y, originator);
163	object *effect = arch_to_object (spob->other_arch);
164
165	effect->x = x;
166	effect->y = y;
167
168	insert_ob_in_map (effect, map, originator, 0);
169	}
170	}	90	}
171		91
172	/*	92	/*
173	* This function takes a caster and spell and presents the	93	* This function takes a caster and spell and presents the
174	* effective level the caster needs to be to cast the spell.	94	* effective level the caster needs to be to cast the spell.
175	* basically, it just adjusts the spell->level with attuned/repelled	95	* basically, it just adjusts the spell->level with attuned/repelled
176	* spellpaths. Was called path_level_mod	96	* spellpaths. Was called path_level_mod.
177	*	97	*
178	* caster is person casting hte spell.	98	* caster is person casting the spell.
179	* spell is the spell object.	99	* spell is the spell object.
180	* Returns modified level.	100	* Returns modified level.
181	*/	101	*/
182	int	102	int
183	min_casting_level (object caster, object spell)	103	min_casting_level (object caster, object spell)
184	{	104	{
185	int new_level;
186
187	if (caster->path_denied & spell->path_attuned)	105	if (caster->path_denied & spell->path_attuned)
188	{
189	/* This case is not a bug, just the fact that this function is
190	* usually called BEFORE checking for path_deny. -AV
191	*/
192	#if 0
193	LOG (llevError, "BUG: path_level_mod (arch %s, name %s): casting denied " "spell\n", caster->arch->name, caster->name);
194	#endif
195	return 1;	106	return 1;
196	}	107
197	new_level = spell->level	108	int new_level = spell->level
198	+ ((caster->path_repelled & spell->path_attuned) ? +2 : 0) + ((caster->path_attuned & spell->path_attuned) ? -2 : 0);	109	+ (caster->path_repelled & spell->path_attuned ? +8 : 0)
199	return (new_level < 1) ? 1 : new_level;	110	+ (caster->path_attuned & spell->path_attuned ? -8 : 0);
200	}
201		111
		112	return max (1, new_level);
		113	}
202		114
203	/* This function returns the effective level the spell	115	/* This function returns the effective level the spell
204	* is being cast at.	116	* is being cast at.
205	* Note that I changed the repelled/attuned bonus to 2 from 5.	117	* Note that I changed the repelled/attuned bonus to 2 from 5.
206	* This is because the new code compares casting_level against	118	* This is because the new code compares casting_level against
207	* min_caster_level, so the difference is effectively 4	119	* min_caster_level, so the difference is effectively 4
208	*/	120	*/
209
210	int	121	int
211	caster_level (object caster, object spell)	122	caster_level (object caster, object spell)
212	{	123	{
213	int level = caster->level;	124	int level = caster->level;
214		125
215	/* If this is a player, try to find the matching skill */
216	if (caster->type == PLAYER && spell->skill)
217	{
218	int i;
219
220	for (i = 0; i < NUM_SKILLS; i++)
221	if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
222	{
223	level = caster->contr->last_skill_ob[i]->level;
224	break;
225	}
226	}
227
228	/* if a rod is fired by a player, take the use_magic_item skill in consideration. */	126	/* if a rod is fired by a player, take the use_magic_item skill in consideration. */
229	if (caster->type == ROD && caster->env && caster->env->type == PLAYER)	127	if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
230	{	128	{
231	object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);	129	object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
232	int sk_level = skill ? skill->level : 1;	130	int sk_level = skill ? skill->level : 1;
233		131
234	level = MIN (level, sk_level + level / 10 + 1);	132	level = min (level, sk_level + level / 10 + 1);
235	}	133	}
		134	else if (caster->type == PLAYER && spell->skill) /* If this is a player, try to find the matching skill */
		135	for (int i = 0; i < NUM_SKILLS; i++)
		136	if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
		137	{
		138	level = caster->contr->last_skill_ob[i]->level;
		139	break;
		140	}
236		141
237	/* Got valid caster level. Now adjust for attunement */	142	/* Got valid caster level. Now adjust for attunement */
238	level += ((caster->path_repelled & spell->path_attuned) ? -2 : 0) + ((caster->path_attuned & spell->path_attuned) ? 2 : 0);	143	level += caster->path_repelled & spell->path_attuned ? -8 : 0;
		144	level += caster->path_attuned & spell->path_attuned ? +8 : 0;
239		145
240	/* Always make this at least 1. If this is zero, we get divide by zero	146	/* Always make this at least 1. If this is zero, we get divide by zero
241	* errors in various places.	147	* errors in various places.
242	*/	148	*/
243	if (level < 1)
244	level = 1;
245	return level;	149	return max (level, 1);
246	}	150	}
247		151
248	/* The following function scales the spellpoint cost of	152	/* The following function scales the spellpoint cost of
249	* a spell by it's increased effectiveness. Some of the	153	* a spell by it's increased effectiveness. Some of the
250	* lower level spells become incredibly vicious at high	154	* lower level spells become incredibly vicious at high
…		…
289	else	193	else
290	{	194	{
291	sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));	195	sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
292	if (spell->stats.sp && !sp)	196	if (spell->stats.sp && !sp)
293	sp = 1;	197	sp = 1;
		198
294	grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));	199	grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
295	if (spell->stats.grace && !grace)	200	if (spell->stats.grace && !grace)
296	grace = 1;	201	grace = 1;
297	}	202	}
		203
298	if (flags == SPELL_HIGHEST)	204	if (flags == SPELL_HIGHEST)
299	return MAX (sp, grace);	205	return MAX (sp, grace);
300	else if (flags == SPELL_GRACE)	206	else if (flags == SPELL_GRACE)
301	return grace;	207	return grace;
302	else if (flags == SPELL_MANA)	208	else if (flags == SPELL_MANA)
…		…
306	LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);	212	LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
307	return 0;	213	return 0;
308	}	214	}
309	}	215	}
310		216
311
312	/* SP_level_dam_adjust: Returns adjusted damage based on the caster.	217	/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
313	* spob is the spell we are adjusting.	218	* spob is the spell we are adjusting.
314	*/	219	*/
315	int	220	int
316	SP_level_dam_adjust (object caster, object spob)	221	SP_level_dam_adjust (object caster, object spob)
317	{	222	{
		223	if (!spob->dam_modifier)
		224	return 0;
		225
318	int level = caster_level (caster, spob);	226	int level = caster_level (caster, spob);
319	int adj = level - min_casting_level (caster, spob);	227	return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier;
320
321	if (adj < 0)
322	adj = 0;
323	if (spob->dam_modifier)
324	adj /= spob->dam_modifier;
325	else
326	adj = 0;
327	return adj;
328	}	228	}
329		229
330	/* Adjust the strength of the spell based on level.	230	/* Adjust the strength of the spell based on level.
331	* This is basically the same as SP_level_dam_adjust above,	231	* This is basically the same as SP_level_dam_adjust above,
332	* but instead looks at the level_modifier value.	232	* but instead looks at the level_modifier value.
333	*/	233	*/
334	int	234	int
335	SP_level_duration_adjust (object caster, object spob)	235	SP_level_duration_adjust (object caster, object spob)
336	{	236	{
		237	if (!spob->duration_modifier)
		238	return 0;
		239
337	int level = caster_level (caster, spob);	240	int level = caster_level (caster, spob);
338	int adj = level - min_casting_level (caster, spob);	241	return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier;
339
340	if (adj < 0)
341	adj = 0;
342	if (spob->duration_modifier)
343	adj /= spob->duration_modifier;
344	else
345	adj = 0;
346
347	return adj;
348	}	242	}
349		243
350	/* Adjust the strength of the spell based on level.	244	/* Adjust the strength of the spell based on level.
351	* This is basically the same as SP_level_dam_adjust above,	245	* This is basically the same as SP_level_dam_adjust above,
352	* but instead looks at the level_modifier value.	246	* but instead looks at the level_modifier value.
353	*/	247	*/
354	int	248	int
355	SP_level_range_adjust (object caster, object spob)	249	SP_level_range_adjust (object caster, object spob)
356	{	250	{
		251	if (!spob->range_modifier)
		252	return 0;
		253
357	int level = caster_level (caster, spob);	254	int level = caster_level (caster, spob);
358	int adj = level - min_casting_level (caster, spob);	255	return (level - min_casting_level (caster, spob)) / spob->range_modifier;
359
360	if (adj < 0)
361	adj = 0;
362	if (spob->range_modifier)
363	adj /= spob->range_modifier;
364	else
365	adj = 0;
366
367	return adj;
368	}	256	}
369		257
370	/* Checks to see if player knows the spell. If the name is the same	258	/* Checks to see if player knows the spell. If the name is the same
371	* as an existing spell, we presume they know it.	259	* as an existing spell, we presume they know it.
372	* returns 1 if they know the spell, 0 if they don't.	260	* returns 1 if they know the spell, 0 if they don't.
373	*/	261	*/
374	object *	262	object *
375	check_spell_known (object op, const char name)	263	check_spell_known (object op, const char name)
376	{	264	{
377	object *spop;	265	object *spop;
		266	shstr_cmp name_ (name);
378		267
379	for (spop = op->inv; spop; spop = spop->below)	268	for (spop = op->inv; spop; spop = spop->below)
380	if (spop->type == SPELL && !strcmp (spop->name, name))	269	if (spop->type == SPELL && spop->name == name)
381	return spop;	270	return spop;
382		271
383	return NULL;	272	return 0;
384	}	273	}
385		274
386		275
387	/*	276	/*
388	* Look at object 'op' and see if they know the spell	277	* Look at object 'op' and see if they know the spell
…		…
444	* reflect_spell fails.)	333	* reflect_spell fails.)
445	* Caller should be sure it passes us valid map coordinates	334	* Caller should be sure it passes us valid map coordinates
446	* eg, updated for tiled maps.	335	* eg, updated for tiled maps.
447	*/	336	*/
448	int	337	int
449	reflwall (mapstruct m, int x, int y, object sp_op)	338	reflwall (maptile m, int x, int y, object sp_op)
450	{	339	{
451	object *op;	340	object *op;
452		341
453	if (OUT_OF_REAL_MAP (m, x, y))	342	if (OUT_OF_REAL_MAP (m, x, y))
454	return 0;	343	return 0;
455	for (op = get_map_ob (m, x, y); op != NULL; op = op->above)	344	for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
456	if (QUERY_FLAG (op, FLAG_REFL_SPELL) && (!QUERY_FLAG (op, FLAG_ALIVE) \|\|	345	if (QUERY_FLAG (op, FLAG_REFL_SPELL)
457	sp_op->type == LIGHTNING \|\| (rndm (0, 99)) < 90 - (sp_op->level / 10)))	346	&& (!QUERY_FLAG (op, FLAG_ALIVE)
		347	\|\| (rndm (0, 99)) < 90 - (sp_op->level / 10)))
458	return 1;	348	return 1;
459		349
460	return 0;	350	return 0;
461	}	351	}
462		352
…		…
468	* in.	358	* in.
469	*/	359	*/
470	int	360	int
471	cast_create_obj (object op, object caster, object *new_op, int dir)	361	cast_create_obj (object op, object caster, object *new_op, int dir)
472	{	362	{
473	mapstruct *m;	363	maptile *m;
474	sint16 sx, sy;	364	sint16 sx, sy;
475		365
476	if (dir &&	366	if (dir &&
477	((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) \|\|	367	((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) \|\|
478	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))))	368	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))))
479	{	369	{
480	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	370	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
481	new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");	371	new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
482	dir = 0;	372	dir = 0;
483	}	373	}
484	new_op->x = op->x + freearr_x[dir];	374
485	new_op->y = op->y + freearr_y[dir];	375	SET_FLAG (new_op, FLAG_IDENTIFIED);
486	if (dir == 0)	376	op->map->insert (new_op,
487	insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR);	377	op->x + freearr_x[dir], op->y + freearr_y[dir],
488	else	378	op,
489	insert_ob_in_map (new_op, op->map, op, 0);	379	dir ? 0 : INS_BELOW_ORIGINATOR);
		380
490	return dir;	381	return dir;
491	}	382	}
492		383
493	/* Returns true if it is ok to put spell *op on the space/may provided.	384	/* Returns true if it is ok to put spell *op on the space/may provided.
494	* immune_stop is basically the attacktype of the spell (why	385	* immune_stop is basically the attacktype of the spell (why
…		…
496	* has the AT_MAGIC bit set, and there is a counterwall	387	* has the AT_MAGIC bit set, and there is a counterwall
497	* on the space, the object doesn't get placed. if immune stop	388	* on the space, the object doesn't get placed. if immune stop
498	* does not have AT_MAGIC, then counterwalls do not effect the spell.	389	* does not have AT_MAGIC, then counterwalls do not effect the spell.
499	*	390	*
500	*/	391	*/
501
502	int	392	int
503	ok_to_put_more (mapstruct m, sint16 x, sint16 y, object op, int immune_stop)	393	ok_to_put_more (maptile m, sint16 x, sint16 y, object op, int immune_stop)
504	{	394	{
505	object *tmp;	395	if (!xy_normalise (m, x, y))
506	int mflags;
507	mapstruct *mp;
508
509	mp = m;
510	mflags = get_map_flags (m, &mp, x, y, &x, &y);
511
512	if (mflags & P_OUT_OF_MAP)
513	return 0;	396	return 0;
514		397
515	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y)))	398	mapspace &ms = m->at (x, y);
		399	ms.update ();
		400
		401	if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
516	return 0;	402	return 0;
517		403
518	for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)	404	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
519	{	405	{
520	/* If there is a counterspell on the space, and this	406	/* If there is a counterspell on the space, and this
521	* object is using magic, don't progress. I believe we could	407	* object is using magic, don't progress. I believe we could
522	* leave this out and let in progress, and other areas of the code	408	* leave this out and let in progress, and other areas of the code
523	* will then remove it, but that would seem to to use more	409	* will then remove it, but that would seem to to use more
524	* resources, and may not work as well if a player is standing	410	* resources, and may not work as well if a player is standing
525	* on top of a counterwall spell (may hit the player before being	411	* on top of a counterwall spell (may hit the player before being
526	* removed.) On the other hand, it may be more dramatic for the	412	* removed.) On the other hand, it may be more dramatic for the
527	* spell to actually hit the counterwall and be sucked up.	413	* spell to actually hit the counterwall and be sucked up.
528	*/	414	*/
529	if ((tmp->attacktype & AT_COUNTERSPELL) &&	415	if ((tmp->attacktype & AT_COUNTERSPELL)
530	(tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) &&	416	&& !QUERY_FLAG (tmp, FLAG_MONSTER)
531	(tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC))	417	&& (tmp->type != PLAYER)
		418	&& (tmp->type != WEAPON)
		419	&& (tmp->type != BOW)
		420	&& (tmp->type != ARROW)
		421	&& (tmp->type != GOLEM)
		422	&& !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
		423	// we special case floor here because there
		424	// are sometimes spell effect floors
		425	// which are used to inflict damage
		426	// (and those shouldn't go away from
		427	// sanctuary) see also: permanent lava
		428	&& (immune_stop & AT_MAGIC))
532	return 0;	429	return 0;
533		430
534	/* This is to prevent 'out of control' spells. Basically, this	431	/* This is to prevent 'out of control' spells. Basically, this
535	* limits one spell effect per space per spell. This is definately	432	* limits one spell effect per space per spell. This is definately
536	* needed for performance reasons, and just for playability I believe.	433	* needed for performance reasons, and just for playability I believe.
…		…
543	/*	440	/*
544	* Combine similar spell effects into one spell effect. Needed for	441	* Combine similar spell effects into one spell effect. Needed for
545	* performance reasons with meteor swarm and the like, but also for	442	* performance reasons with meteor swarm and the like, but also for
546	* playability reasons.	443	* playability reasons.
547	*/	444	*/
548	if (tmp->arch == op->arch	445	if (tmp->arch == op->arch /* no harm if not comparing by name here */
549	&& tmp->type == op->type	446	&& tmp->type == op->type
550	&& tmp->subtype == op->subtype	447	&& tmp->subtype == op->subtype
		448	&& tmp->owner == op->owner
551	&& tmp->owner == op->owner && ((tmp->subtype == SP_EXPLOSION) \|\| (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))	449	&& ((tmp->subtype == SP_EXPLOSION) \|\| (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
552	{	450	{
553	tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);	451	tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
554	tmp->range = MAX (tmp->range, op->range);	452	tmp->range = MAX (tmp->range, op->range);
555	tmp->duration = MAX (tmp->duration, op->duration);	453	tmp->duration = MAX (tmp->duration, op->duration);
556	return 0;	454	return 0;
…		…
558		456
559	/* Perhaps we should also put checks in for no magic and unholy	457	/* Perhaps we should also put checks in for no magic and unholy
560	* ground to prevent it from moving along?	458	* ground to prevent it from moving along?
561	*/	459	*/
562	}	460	}
		461
563	/* If it passes the above tests, it must be OK */	462	/* If it passes the above tests, it must be OK */
564	return 1;	463	return 1;
565	}	464	}
566		465
567	/* fire_arch_from_position: fires an archetype.	466	/* fire_arch_from_position: fires an archetype.
…		…
572	* dir: direction to fire in.	471	* dir: direction to fire in.
573	* spell: spell that is being fired. It uses other_arch for the archetype	472	* spell: spell that is being fired. It uses other_arch for the archetype
574	* to fire.	473	* to fire.
575	* returns 0 on failure, 1 on success.	474	* returns 0 on failure, 1 on success.
576	*/	475	*/
577
578	int	476	int
579	fire_arch_from_position (object op, object caster, sint16 x, sint16 y, int dir, object *spell)	477	fire_arch_from_position (object op, object caster, sint16 x, sint16 y, int dir, object *spell)
580	{	478	{
581	object *tmp;
582	int mflags;
583	mapstruct *m;
584
585	if (spell->other_arch == NULL)	479	if (!spell->other_arch)
586	return 0;	480	return 0;
587		481
588	m = op->map;	482	object *tmp = spell->other_arch->instance ();
589	mflags = get_map_flags (m, &m, x, y, &x, &y);
590	if (mflags & P_OUT_OF_MAP)
591	{
592	return 0;
593	}
594		483
595	tmp = arch_to_object (spell->other_arch);	484	if (!tmp)
596
597	if (tmp == NULL)
598	return 0;	485	return 0;
599
600	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
601	{
602	new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
603	free_object (tmp);
604	return 0;
605	}
606
607
608		486
609	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	487	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
610	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);	488	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
611	/* code in time.c uses food for some things, duration for others */	489	/* code in time.c uses food for some things, duration for others */
612	tmp->stats.food = tmp->duration;	490	tmp->stats.food = tmp->duration;
613	tmp->range = spell->range + SP_level_range_adjust (caster, spell);	491	tmp->range = spell->range + SP_level_range_adjust (caster, spell);
614	tmp->attacktype = spell->attacktype;	492	tmp->attacktype = spell->attacktype;
615	tmp->x = x;
616	tmp->y = y;
617	tmp->direction = dir;	493	tmp->direction = dir;
618	if (get_owner (op) != NULL)	494	tmp->set_owner (op);
619	copy_owner (tmp, op);
620	else
621	set_owner (tmp, op);
622	tmp->level = caster_level (caster, spell);	495	tmp->level = caster_level (caster, spell);
623	set_spell_skill (op, caster, spell, tmp);	496	set_spell_skill (op, caster, spell, tmp);
624		497
625	/* needed for AT_HOLYWORD,AT_GODPOWER stuff */	498	/* needed for AT_HOLYWORD,AT_GODPOWER stuff */
626	if (tmp->attacktype & AT_HOLYWORD \|\| tmp->attacktype & AT_GODPOWER)	499	if (tmp->attacktype & AT_HOLYWORD \|\| tmp->attacktype & AT_GODPOWER)
627	{
628	if (!tailor_god_spell (tmp, op))	500	if (!tailor_god_spell (tmp, op))
629	return 0;	501	return 0;
630	}	502
631	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	503	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
632	SET_ANIMATION (tmp, dir);	504	SET_ANIMATION (tmp, dir);
633		505
634	if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL)	506	if ((tmp = op->map->insert (tmp, x, y, op)))
635	return 1;
636
637	move_spell_effect (tmp);	507	move_spell_effect (tmp);
638		508
639	return 1;	509	return 1;
640	}	510	}
641
642
643		511
644	/*****************************************************************************	512	/*****************************************************************************
645	*	513	*
646	* Code related to rods - perhaps better located in another file?	514	* Code related to rods - perhaps better located in another file?
647	*	515	*
648	****************************************************************************/	516	****************************************************************************/
649
650	void	517	void
651	regenerate_rod (object *rod)	518	regenerate_rod (object *rod)
652	{	519	{
653	if (rod->stats.hp < rod->stats.maxhp)	520	if (rod->stats.hp < rod->stats.maxhp)
654	{	521	rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
655	rod->stats.hp += 1 + rod->stats.maxhp / 10;
656
657	if (rod->stats.hp > rod->stats.maxhp)
658	rod->stats.hp = rod->stats.maxhp;
659	}
660	}	522	}
661
662		523
663	void	524	void
664	drain_rod_charge (object *rod)	525	drain_rod_charge (object *rod)
665	{	526	{
666	rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);	527	rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
667	}	528	}
668
669
670
671		529
672	/* this function is commonly used to find a friendly target for	530	/* this function is commonly used to find a friendly target for
673	* spells such as heal or protection or armour	531	* spells such as heal or protection or armour
674	* op is what is looking for the target (which can be a player),	532	* op is what is looking for the target (which can be a player),
675	* dir is the direction we are looking in. Return object found, or	533	* dir is the direction we are looking in. Return object found, or
676	* NULL if no good object.	534	* NULL if no good object.
677	*/	535	*/
678
679	object *	536	object *
680	find_target_for_friendly_spell (object *op, int dir)	537	find_target_for_friendly_spell (object *op, int dir)
681	{	538	{
682	object *tmp;	539	object *tmp;
683	mapstruct *m;
684	sint16 x, y;
685	int mflags;
686		540
687	/* I don't really get this block - if op isn't a player or rune,	541	/* I don't really get this block - if op isn't a player or rune,
688	* we then make the owner of this object the target.	542	* we then make the owner of this object the target.
689	* The owner could very well be no where near op.	543	* The owner could very well be no where near op.
690	*/	544	*/
691	if (op->type != PLAYER && op->type != RUNE)	545	if (op->type != PLAYER && op->type != RUNE)
692	{	546	{
693	tmp = get_owner (op);	547	tmp = op->owner;
694	/* If the owner does not exist, or is not a monster, than apply the spell	548	/* If the owner does not exist, or is not a monster, than apply the spell
695	* to the caster.	549	* to the caster.
696	*/	550	*/
697	if (!tmp \|\| !QUERY_FLAG (tmp, FLAG_MONSTER))	551	if (!tmp \|\| !QUERY_FLAG (tmp, FLAG_MONSTER))
698	tmp = op;	552	tmp = op;
699	}	553	}
700	else	554	else
701	{	555	{
702	m = op->map;	556	maptile *m = op->map;
703	x = op->x + freearr_x[dir];	557	sint16 x = op->x + freearr_x[dir];
704	y = op->y + freearr_y[dir];	558	sint16 y = op->y + freearr_y[dir];
705
706	mflags = get_map_flags (m, &m, x, y, &x, &y);
707
708	if (mflags & P_OUT_OF_MAP)
709	tmp = NULL;
710	else
711	{	559
712	for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)	560	tmp = xy_normalise (m, x, y)
713	if (tmp->type == PLAYER)	561	? m->at (x, y).player ()
714	break;	562	: 0;
715	}
716	}	563	}
		564
717	/* didn't find a player there, look in current square for a player */	565	/* didn't find a player there, look in current square for a player */
718	if (tmp == NULL)	566	if (!tmp)
719	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	567	tmp = op->ms ().player ();
720	{
721	if (tmp->type == PLAYER)
722	break;
723	}
724		568
725	return tmp;	569	return tmp;
726	}	570	}
727
728
729		571
730	/* raytrace:	572	/* raytrace:
731	* spell_find_dir(map, x, y, exclude) will search first the center square	573	* spell_find_dir(map, x, y, exclude) will search first the center square
732	* then some close squares in the given map at the given coordinates for	574	* then some close squares in the given map at the given coordinates for
733	* live objects.	575	* live objects.
…		…
736	* monsters/generators only. If not, the spell will hunt players only.	578	* monsters/generators only. If not, the spell will hunt players only.
737	* It returns the direction toward the first/closest live object if it finds	579	* It returns the direction toward the first/closest live object if it finds
738	* any, otherwise -1.	580	* any, otherwise -1.
739	* note that exclude can be NULL, in which case all bets are off.	581	* note that exclude can be NULL, in which case all bets are off.
740	*/	582	*/
741
742	int	583	int
743	spell_find_dir (mapstruct m, int x, int y, object exclude)	584	spell_find_dir (maptile m, int x, int y, object exclude)
744	{	585	{
745	int i, max = SIZEOFFREE;	586	int i, max = SIZEOFFREE;
746	sint16 nx, ny;	587	sint16 nx, ny;
747	int owner_type = 0, mflags;	588	int owner_type = 0, mflags;
748	object *tmp;	589	object *tmp;
749	mapstruct *mp;	590	maptile *mp;
750		591
751	if (exclude && exclude->head)	592	if (exclude && exclude->head)
752	exclude = exclude->head;	593	exclude = exclude->head;
753	if (exclude && exclude->type)	594	if (exclude && exclude->type)
754	owner_type = exclude->type;	595	owner_type = exclude->type;
…		…
760	mp = m;	601	mp = m;
761	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	602	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
762	if (mflags & (P_OUT_OF_MAP \| P_BLOCKSVIEW))	603	if (mflags & (P_OUT_OF_MAP \| P_BLOCKSVIEW))
763	continue;	604	continue;
764		605
765	tmp = get_map_ob (mp, nx, ny);	606	tmp = GET_MAP_OB (mp, nx, ny);
766		607
767	while (tmp != NULL && (((owner_type == PLAYER &&	608	while (tmp != NULL && (((owner_type == PLAYER &&
768	!QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) \|\|	609	!QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) \|\|
769	(owner_type != PLAYER && tmp->type != PLAYER)) \|\| (tmp == exclude \|\| (tmp->head && tmp->head == exclude))))	610	(owner_type != PLAYER && tmp->type != PLAYER)) \|\| (tmp == exclude \|\| (tmp->head && tmp->head == exclude))))
770	tmp = tmp->above;	611	tmp = tmp->above;
…		…
773	return freedir[i];	614	return freedir[i];
774	}	615	}
775	return -1; /* flag for "keep going the way you were" */	616	return -1; /* flag for "keep going the way you were" */
776	}	617	}
777		618
778
779
780	/* put_a_monster: puts a monster named monstername near by	619	/* put_a_monster: puts a monster named monstername near by
781	* op. This creates the treasures for the monsters, and	620	* op. This creates the treasures for the monsters, and
782	* also deals with multipart monsters properly.	621	* also deals with multipart monsters properly.
783	*/	622	*/
784
785	void	623	void
786	put_a_monster (object op, const char monstername)	624	put_a_monster (object op, const char monstername)
787	{	625	{
788	object tmp, head = NULL, *prev = NULL;	626	object tmp, head = NULL, *prev = NULL;
789	archetype *at;	627	archetype *at;
790	int dir;	628	int dir;
791		629
792	/* Handle cases where we are passed a bogus mosntername */	630	/* Handle cases where we are passed a bogus mosntername */
793		631
794	if ((at = find_archetype (monstername)) == NULL)	632	if ((at = archetype::find (monstername)) == NULL)
795	return;	633	return;
796		634
797	/* find a free square nearby	635	/* find a free square nearby
798	* first we check the closest square for free squares	636	* first we check the closest square for free squares
799	*/	637	*/
800		638
801	dir = find_first_free_spot (&at->clone, op->map, op->x, op->y);	639	dir = find_first_free_spot (at, op->map, op->x, op->y);
802	if (dir != -1)	640	if (dir != -1)
803	{	641	{
804	/* This is basically grabbed for generate monster. Fixed 971225 to	642	/* This is basically grabbed for generate monster. Fixed 971225 to
805	* insert multipart monsters properly	643	* insert multipart monsters properly
806	*/	644	*/
		645	//TODO: use expand_tail + ...
807	while (at != NULL)	646	while (at != NULL)
808	{	647	{
809	tmp = arch_to_object (at);	648	tmp = arch_to_object (at);
810	tmp->x = op->x + freearr_x[dir] + at->clone.x;	649	tmp->x = op->x + freearr_x[dir] + at->x;
811	tmp->y = op->y + freearr_y[dir] + at->clone.y;	650	tmp->y = op->y + freearr_y[dir] + at->y;
812	tmp->map = op->map;	651	tmp->map = op->map;
813	if (head)	652	if (head)
814	{	653	{
815	tmp->head = head;	654	tmp->head = head;
816	prev->more = tmp;	655	prev->more = tmp;
817	}	656	}
		657
818	if (!head)	658	if (!head)
819	head = tmp;	659	head = tmp;
		660
820	prev = tmp;	661	prev = tmp;
		662
821	at = at->more;	663	at = (archetype *)at->more;
822	}	664	}
823		665
824	if (head->randomitems)	666	if (head->randomitems)
825	create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);	667	create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
826		668
827	insert_ob_in_map (head, op->map, op, 0);	669	insert_ob_in_map (head, op->map, op, 0);
828		670
829	/* thought it'd be cool to insert a burnout, too. */	671	/* thought it'd be cool to insert a burnout, too. */
830	tmp = get_archetype ("burnout");	672	op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
831	tmp->map = op->map;
832	tmp->x = op->x + freearr_x[dir];
833	tmp->y = op->y + freearr_y[dir];
834	insert_ob_in_map (tmp, op->map, op, 0);
835	}	673	}
836	}	674	}
837		675
838	/* peterm: function which summons hostile monsters and	676	/* peterm: function which summons hostile monsters and
839	* places them in nearby squares.	677	* places them in nearby squares.
…		…
866	{	704	{
867	int attacktype;	705	int attacktype;
868	int face;	706	int face;
869	} ATTACKS[22] =	707	} ATTACKS[22] =
870	{	708	{
871	{
872	AT_PHYSICAL, 0},	709	{ AT_PHYSICAL, 0},
873	{
874	AT_PHYSICAL, 0}, /face = explosion /	710	{ AT_PHYSICAL, 0}, /face = explosion /
875	{
876	AT_PHYSICAL, 0},	711	{ AT_PHYSICAL, 0},
877	{
878	AT_MAGIC, 1},	712	{ AT_MAGIC, 1},
879	{
880	AT_MAGIC, 1}, /* face = last-burnout */	713	{ AT_MAGIC, 1}, /* face = last-burnout */
881	{
882	AT_MAGIC, 1},	714	{ AT_MAGIC, 1},
883	{
884	AT_FIRE, 2},	715	{ AT_FIRE, 2},
885	{
886	AT_FIRE, 2}, /* face = fire.... */	716	{ AT_FIRE, 2}, /* face = fire.... */
887	{
888	AT_FIRE, 2},	717	{ AT_FIRE, 2},
889	{
890	AT_ELECTRICITY, 3},	718	{ AT_ELECTRICITY, 3},
891	{
892	AT_ELECTRICITY, 3}, /* ball_lightning */	719	{ AT_ELECTRICITY, 3}, /* ball_lightning */
893	{
894	AT_ELECTRICITY, 3},	720	{ AT_ELECTRICITY, 3},
895	{
896	AT_COLD, 4},	721	{ AT_COLD, 4},
897	{
898	AT_COLD, 4}, /* face=icestorm */	722	{ AT_COLD, 4}, /* face=icestorm */
899	{
900	AT_COLD, 4},	723	{ AT_COLD, 4},
901	{
902	AT_CONFUSION, 5},	724	{ AT_CONFUSION, 5},
903	{
904	AT_POISON, 7},	725	{ AT_POISON, 7},
905	{
906	AT_POISON, 7}, /* face = acid sphere. generator */	726	{ AT_POISON, 7}, /* face = acid sphere. generator */
907	{
908	AT_POISON, 7}, /* poisoncloud face */	727	{ AT_POISON, 7}, /* poisoncloud face */
909	{
910	AT_SLOW, 8},	728	{ AT_SLOW, 8},
911	{
912	AT_PARALYZE, 9},	729	{ AT_PARALYZE, 9},
913	{
914	AT_FEAR, 10}};	730	{ AT_FEAR, 10},
915		731	};
916
917		732
918	/* shuffle_attack: peterm	733	/* shuffle_attack: peterm
919	* This routine shuffles the attack of op to one of the	734	* This routine shuffles the attack of op to one of the
920	* ones in the list. It does this at random. It also	735	* ones in the list. It does this at random. It also
921	* chooses a face appropriate to the attack that is	736	* chooses a face appropriate to the attack that is
…		…
966	if (failure <= -20 && failure > -40) /* wonder */	781	if (failure <= -20 && failure > -40) /* wonder */
967	{	782	{
968	new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname);	783	new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname);
969	tmp = get_archetype (SPELL_WONDER);	784	tmp = get_archetype (SPELL_WONDER);
970	cast_cone (op, op, 0, tmp);	785	cast_cone (op, op, 0, tmp);
971	free_object (tmp);	786	tmp->destroy ();
972	}	787	}
973		788
974	else if (failure <= -40 && failure > -60) /* confusion */	789	else if (failure <= -40 && failure > -60) /* confusion */
975	{	790	{
976	new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!");	791	new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!");
…		…
1010	if (failure <= -20 && failure > -40) /* wonder */	825	if (failure <= -20 && failure > -40) /* wonder */
1011	{	826	{
1012	new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect.");	827	new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect.");
1013	tmp = get_archetype (SPELL_WONDER);	828	tmp = get_archetype (SPELL_WONDER);
1014	cast_cone (op, op, 0, tmp);	829	cast_cone (op, op, 0, tmp);
1015	free_object (tmp);	830	tmp->destroy ();
1016	}	831	}
1017		832
1018	else if (failure <= -40 && failure > -60) /* confusion */	833	else if (failure <= -40 && failure > -60) /* confusion */
1019	{	834	{
1020	new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!");	835	new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!");
…		…
1039	else	854	else
1040	{	855	{
1041	new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");	856	new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");
1042	tmp = get_archetype (LOOSE_MANA);	857	tmp = get_archetype (LOOSE_MANA);
1043	tmp->level = skill->level;	858	tmp->level = skill->level;
1044	tmp->x = op->x;
1045	tmp->y = op->y;
1046		859
1047	/* increase the area of destruction a little for more powerful spells */	860	/* increase the area of destruction a little for more powerful spells */
1048	tmp->range += isqrt (power);	861	tmp->range += isqrt (power);
1049		862
1050	if (power > 25)	863	if (power > 25)
1051	tmp->stats.dam = 25 + isqrt (power);	864	tmp->stats.dam = 25 + isqrt (power);
1052	else	865	else
1053	tmp->stats.dam = power; /* nasty recoils! */	866	tmp->stats.dam = power; /* nasty recoils! */
1054		867
1055	tmp->stats.maxhp = tmp->count;	868	tmp->stats.maxhp = tmp->count;
1056	insert_ob_in_map (tmp, op->map, NULL, 0);	869
		870	tmp->insert_at (op);
1057	}	871	}
1058	}	872	}
1059	}	873	}
1060		874
1061	int	875	int
1062	cast_party_spell (object op, object caster, int dir, object spell_ob, char stringarg)	876	cast_party_spell (object op, object caster, int dir, object spell_ob, char stringarg)
1063	{	877	{
1064	int success;	878	int success;
1065	player *pl;
1066	object *spell;	879	object *spell;
1067		880
1068	if (!spell_ob->other_arch)	881	if (!spell_ob->other_arch)
1069	{	882	{
1070	LOG (llevError, "cast_party_spell: empty other arch\n");	883	LOG (llevError, "cast_party_spell: empty other arch\n");
1071	return 0;	884	return 0;
1072	}	885	}
		886
1073	spell = arch_to_object (spell_ob->other_arch);	887	spell = arch_to_object (spell_ob->other_arch);
1074		888
1075	/* Always cast spell on caster */	889	/* Always cast spell on caster */
1076	success = cast_spell (op, caster, dir, spell, stringarg);	890	success = cast_spell (op, caster, dir, spell, stringarg);
1077		891
1078	if (caster->contr->party == NULL)	892	if (caster->contr->party == NULL)
1079	{	893	{
1080	remove_ob (spell);	894	spell->remove ();
1081	return success;	895	return success;
1082	}	896	}
1083	for (pl = first_player; pl != NULL; pl = pl->next)	897
		898	for_all_players (pl)
1084	if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))	899	if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1085	{
1086	cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);	900	cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1087	}	901
1088	remove_ob (spell);	902	spell->remove ();
1089	return success;	903	return success;
1090	}	904	}
1091		905
1092	/* This is where the main dispatch when someone casts a spell.	906	/* This is where the main dispatch when someone casts a spell.
1093	*	907	*
…		…
1114	*	928	*
1115	* if it is a player casting the spell (op->type == PLAYER, op == caster),	929	* if it is a player casting the spell (op->type == PLAYER, op == caster),
1116	* this function will decrease the mana/grace appropriately. For other	930	* this function will decrease the mana/grace appropriately. For other
1117	* objects, the caller should do what it considers appropriate.	931	* objects, the caller should do what it considers appropriate.
1118	*/	932	*/
1119
1120	int	933	int
1121	cast_spell (object op, object caster, int dir, object spell_ob, char stringarg)	934	cast_spell (object op, object caster, int dir, object spell_ob, char stringarg)
1122	{	935	{
1123	const char *godname;	936	const char *godname;
1124	int success = 0, mflags, cast_level = 0, old_shoottype;	937	int success = 0, cast_level = 0;
1125	object *skill = NULL;	938	object *skill = NULL;
1126
1127	old_shoottype = op->contr ? op->contr->shoottype : 0;
1128		939
1129	if (!spell_ob)	940	if (!spell_ob)
1130	{	941	{
1131	LOG (llevError, "cast_spell: null spell object passed\n");	942	LOG (llevError, "cast_spell: null spell object passed\n");
1132	return 0;	943	return 0;
…		…
1143	}	954	}
1144		955
1145	/* if caster is a spell casting object, this normally shouldn't be	956	/* if caster is a spell casting object, this normally shouldn't be
1146	* an issue, because they don't have any spellpaths set up.	957	* an issue, because they don't have any spellpaths set up.
1147	*/	958	*/
1148	if (caster->path_denied & spell_ob->path_attuned)	959	if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST))
1149	{	960	{
1150	new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");	961	new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
1151	return 0;	962	return 0;
1152	}	963	}
1153		964
…		…
1161	* at least process that code.	972	* at least process that code.
1162	*/	973	*/
1163	if (op->type == PLAYER && op == caster)	974	if (op->type == PLAYER && op == caster)
1164	{	975	{
1165	cast_level = caster_level (caster, spell_ob);	976	cast_level = caster_level (caster, spell_ob);
		977
1166	if (spell_ob->skill)	978	if (spell_ob->skill)
1167	{	979	{
1168	skill = find_skill_by_name (op, spell_ob->skill);	980	skill = find_skill_by_name (op, spell_ob->skill);
		981
1169	if (!skill)	982	if (!skill)
1170	{	983	{
1171	new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name);	984	op->failmsg (format ("You need the skill %s to cast %s! "
		985	"H<You either need to learn the skill via a skill scroll "
		986	"or you need to wear a talisman or holy symbol.>",
		987	&spell_ob->skill, &spell_ob->name));
1172	return 0;	988	return 0;
1173	}	989	}
		990
		991	int casting_level = min_casting_level (op, spell_ob);
		992
1174	if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))	993	if (casting_level > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
1175	{	994	{
1176	new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell.");	995	op->failmsg (format ("You lack enough skill to cast that spell! "
		996	"H<Your cast level is %d, but level %d is required. Maybe you are repelled?>",
		997	cast_level, casting_level));
1177	return 0;	998	return 0;
1178	}	999	}
1179	}	1000	}
		1001
1180	/* If the caster is the wiz, they don't ever fail, and don't have	1002	/* If the caster is the wiz, they don't ever fail, and don't have
1181	* to have sufficient grace/mana.	1003	* to have sufficient grace/mana.
1182	*/	1004	*/
1183	if (!QUERY_FLAG (op, FLAG_WIZ))	1005	if (!QUERY_FLAG (op, FLAG_WIZ))
1184	{	1006	{
1185	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&	1007	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1186	SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)	1008	SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1187	{	1009	{
1188	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");	1010	op->failmsg ("You don't have enough mana!");
1189	return 0;	1011	return 0;
1190	}	1012	}
		1013
1191	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&	1014	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1192	SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)	1015	SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1193	{	1016	{
1194	if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -	1017	if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1195	10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)	1018	10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1196	{
1197	new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname);	1019	op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1198	}
1199	else	1020	else
1200	{	1021	{
1201	prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);	1022	prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1202	new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname);	1023	op->failmsg (format ("%s ignores your prayer.", godname));
1203	return 0;	1024	return 0;
1204	}	1025	}
1205	}	1026	}
1206		1027
1207	/* player/monster is trying to cast the spell. might fumble it */	1028	/* player/monster is trying to cast the spell. might fumble it */
1208	if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <	1029	if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1209	(spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))	1030	(spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1210	{	1031	{
1211	play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);	1032	op->contr->play_sound (sound_find ("fumble_spell"));
1212	new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell.");	1033	op->failmsg ("You fumble the prayer.");
1213	if (settings.casting_time == TRUE)	1034
1214	{
1215	op->casting_time = -1;
1216	}
1217	op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);	1035	op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1218	return 0;	1036	return 0;
1219	}	1037	}
1220	else if (spell_ob->stats.sp)	1038	else if (spell_ob->stats.sp)
1221	{	1039	{
1222	int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;	1040	int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1223		1041
1224	if (failure < 0)	1042	if (failure < 0)
1225	{	1043	{
1226	new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use.");	1044	op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1227	if (settings.spell_failure_effects == TRUE)	1045	if (settings.spell_failure_effects == TRUE)
1228	spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);	1046	spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1229	op->contr->shoottype = (rangetype) old_shoottype;	1047
1230	op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);	1048	op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1231	return 0;	1049	return 0;
1232	}	1050	}
1233	}	1051	}
1234	}	1052	}
1235	}	1053	}
1236		1054
1237	mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL);	1055	int mflags = op->ms ().flags ();
1238		1056
1239	/* See if we can cast a spell here. If the caster and op are	1057	/* See if we can cast a spell here. If the caster and op are
1240	* not alive, then this would mean that the mapmaker put the	1058	* not alive, then this would mean that the mapmaker put the
1241	* objects on the space - presume that they know what they are	1059	* objects on the space - presume that they know what they are
1242	* doing.	1060	* doing.
1243	*/	1061	*/
1244		1062
1245	if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!	1063	if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1246	{	1064	{
1247	new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!.");	1065	op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1248	return 0;	1066	return 0;
1249	}	1067	}
1250		1068
1251	if ((spell_ob->type == SPELL)	1069	if ((spell_ob->type == SPELL)
1252	&& (caster->type != POTION)	1070	&& (caster->type != POTION)
…		…
1257	{	1075	{
1258	if (op->type != PLAYER)	1076	if (op->type != PLAYER)
1259	return 0;	1077	return 0;
1260		1078
1261	if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)	1079	if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1262	new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname);	1080	op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1263	else	1081	else if (object *item = op->contr->ranged_ob)
1264	switch (op->contr->shoottype)
1265	{	1082	{
1266	case range_magic:	1083	if (item->type == SPELL)
1267	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting.");	1084	op->failmsg ("Something blocks your spellcasting.");
1268	break;	1085	else if (item->type == SCROLL)
1269	case range_misc:	1086	op->failmsg ("Something blocks the magic of your scroll.");
1270	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1271	break;
1272	case range_golem:
1273	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1274	break;
1275	default:
1276	break;
1277	}
1278	return 0;
1279	}
1280
1281	if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1282	{
1283	if (op->casting_time == -1)
1284	{ /* begin the casting */
1285	op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1286	op->spell = spell_ob;
1287	/* put the stringarg into the object struct so that when the
1288	* spell is actually cast, it knows about the stringarg.
1289	* necessary for the invoke command spells.
1290	*/
1291	if (stringarg)
1292	{
1293	op->spellarg = strdup_local (stringarg);
1294	}
1295	else	1087	else
1296	op->spellarg = NULL;	1088	op->failmsg ("Something blocks the magic of your item.");
1297	return 0;
1298	}
1299	else if (op->casting_time != 0)
1300	{
1301	if (op->type == PLAYER)
1302	new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1303	return 0;
1304	}	1089	}
1305	else	1090	else
1306	{ /* casting_time == 0 */	1091	op->failmsg ("Something blocks the spell!");
1307	op->casting_time = -1;	1092
1308	spell_ob = op->spell;	1093	return 0;
1309	stringarg = op->spellarg;
1310	}
1311	}
1312	else
1313	{	1094	}
		1095
1314	/* Take into account how long it takes to cast the spell.	1096	/* Take into account how long it takes to cast the spell.
1315	* if the player is casting it, then we use the time in	1097	* if the player is casting it, then we use the time in
1316	* the spell object. If it is a spell object, have it	1098	* the spell object. If it is a spell object, have it
1317	* take two ticks. Things that cast spells on the players	1099	* take two ticks. Things that cast spells on the players
1318	* behalf (eg, altars, and whatever else) shouldn't cost	1100	* behalf (eg, altars, and whatever else) shouldn't cost
1319	* the player any time.	1101	* the player any time.
1320	* Ignore casting time for firewalls	1102	* Ignore casting time for firewalls
		1103	*/
		1104	if (caster == op && caster->type != FIREWALL)
		1105	{
		1106	op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
		1107	/* Other portions of the code may also decrement the speed of the player, so
		1108	* put a lower limit so that the player isn't stuck here too long
1321	*/	1109	*/
1322	if (caster == op && caster->type != FIREWALL)
1323	{
1324	op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1325	/* Other portions of the code may also decrement the speed of the player, so
1326	* put a lower limit so that the player isn't stuck here too long
1327	*/
1328	if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))	1110	if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1329	op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);	1111	op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1330	}	1112	}
1331	else if (caster->type == WAND \|\| caster->type == HORN \|\| caster->type == ROD \|\| caster->type == POTION \|\| caster->type == SCROLL)	1113	else if (caster->type == WAND \|\| caster->type == HORN \|\| caster->type == ROD \|\| caster->type == POTION \|\| caster->type == SCROLL)
1332	{
1333	op->speed_left -= 2 * FABS (op->speed);	1114	op->speed_left -= 2 * FABS (op->speed);
1334	}
1335	}
1336		1115
1337	if (op->type == PLAYER && op == caster)	1116	if (op->type == PLAYER && op == caster)
1338	{	1117	{
1339	op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);	1118	op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1340	op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);	1119	op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
…		…
1347	if (op != caster && !skill && caster->skill)	1126	if (op != caster && !skill && caster->skill)
1348	{	1127	{
1349	skill = find_skill_by_name (op, caster->skill);	1128	skill = find_skill_by_name (op, caster->skill);
1350	if (!skill)	1129	if (!skill)
1351	{	1130	{
1352	new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));	1131	op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1353	return 0;	1132	return 0;
1354	}	1133	}
		1134
1355	change_skill (op, skill, 0); /* needed for proper exp credit */	1135	op->change_skill (skill); /* needed for proper exp credit */
1356	}	1136	}
		1137
		1138	if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
		1139	return RESULT_INT (0);
1357		1140
1358	switch (spell_ob->subtype)	1141	switch (spell_ob->subtype)
1359	{	1142	{
1360	/* The order of case statements is same as the order they show up	1143	/* The order of case statements is same as the order they show up
1361	* in in spells.h.	1144	* in in spells.h.
1362	*/	1145	*/
1363	case SP_RAISE_DEAD:	1146	case SP_RAISE_DEAD:
1364	success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);	1147	success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1365	break;	1148	break;
1366		1149
1367	case SP_RUNE:	1150	case SP_RUNE:
…		…
1395	case SP_SMITE:	1178	case SP_SMITE:
1396	success = cast_smite_spell (op, caster, dir, spell_ob);	1179	success = cast_smite_spell (op, caster, dir, spell_ob);
1397	break;	1180	break;
1398		1181
1399	case SP_MAGIC_MISSILE:	1182	case SP_MAGIC_MISSILE:
1400	success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);	1183	success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1401	break;	1184	break;
1402		1185
1403	case SP_SUMMON_GOLEM:	1186	case SP_SUMMON_GOLEM:
1404	success = summon_golem (op, caster, dir, spell_ob);	1187	success = summon_golem (op, caster, dir, spell_ob);
1405	old_shoottype = range_golem;
1406	break;	1188	break;
1407		1189
1408	case SP_DIMENSION_DOOR:	1190	case SP_DIMENSION_DOOR:
1409	/* dimension door needs the actual caster, because that is what is	1191	/* dimension door needs the actual caster, because that is what is
1410	* moved.	1192	* moved.
…		…
1483	#ifdef NO_POLYMORPH	1265	#ifdef NO_POLYMORPH
1484	/* Not great, but at least provide feedback so if players do have	1266	/* Not great, but at least provide feedback so if players do have
1485	* polymorph (ie, find it as a preset item or left over from before	1267	* polymorph (ie, find it as a preset item or left over from before
1486	* it was disabled), they get some feedback.	1268	* it was disabled), they get some feedback.
1487	*/	1269	*/
1488	new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles");	1270	op->failmsg ("The spell fizzles!");
1489	success = 0;	1271	success = 0;
1490	#else	1272	#else
1491	success = cast_polymorph (op, caster, spell_ob, dir);	1273	success = cast_polymorph (op, caster, spell_ob, dir);
1492	#endif	1274	#endif
1493	break;	1275	break;
…		…
1513	break;	1295	break;
1514		1296
1515	case SP_MOVING_BALL:	1297	case SP_MOVING_BALL:
1516	if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)	1298	if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1517	{	1299	{
1518	new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name);	1300	op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1519	success = 0;	1301	success = 0;
1520	}	1302	}
1521	else	1303	else
1522	success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);	1304	success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1523	break;	1305	break;
1524		1306
1525	case SP_SWARM:	1307	case SP_SWARM:
1526	success = fire_swarm (op, caster, spell_ob, dir);	1308	success = fire_swarm (op, caster, spell_ob, dir);
1527	break;	1309	break;
…		…
1543	success = cast_consecrate (op, caster, spell_ob);	1325	success = cast_consecrate (op, caster, spell_ob);
1544	break;	1326	break;
1545		1327
1546	case SP_ANIMATE_WEAPON:	1328	case SP_ANIMATE_WEAPON:
1547	success = animate_weapon (op, caster, spell_ob, dir);	1329	success = animate_weapon (op, caster, spell_ob, dir);
1548	old_shoottype = range_golem;
1549	break;	1330	break;
1550		1331
1551	case SP_LIGHT:	1332	case SP_LIGHT:
1552	success = cast_light (op, caster, spell_ob, dir);	1333	success = cast_light (op, caster, spell_ob, dir);
1553	break;	1334	break;
…		…
1566		1347
1567	case SP_AURA:	1348	case SP_AURA:
1568	success = create_aura (op, caster, spell_ob);	1349	success = create_aura (op, caster, spell_ob);
1569	break;	1350	break;
1570		1351
1571	case SP_TOWN_PORTAL:
1572	success = cast_create_town_portal (op, caster, spell_ob, dir);
1573	break;
1574
1575	case SP_PARTY_SPELL:	1352	case SP_PARTY_SPELL:
1576	success = cast_party_spell (op, caster, dir, spell_ob, stringarg);	1353	success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1577	break;	1354	break;
1578		1355
1579	default:	1356	default:
1580	if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1581	LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);	1357	LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1582	}
1583
1584	/* FIXME - we need some better sound suppport */
1585	// yes, for example, augment map info with the spell effect
1586	// so clients can calculate the sounds themselves
1587	//play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1588
1589	/* free the spell arg */
1590	if (settings.casting_time == TRUE && stringarg)
1591	{	1358	}
1592	free (stringarg);	1359
1593	stringarg = NULL;	1360	op->play_sound (
1594	}	1361	success
1595	/* perhaps a bit of a hack, but if using a wand, it has to change the skill	1362	? spell_ob->sound
1596	* to something like use_magic_item, but you really want to be able to fire	1363	? spell_ob->sound
1597	* it again.	1364	: sound_find ("spell_success")
1598	*/	1365	: sound_find ("fumble_spell")
1599	if (op->contr)	1366	);
1600	op->contr->shoottype = (rangetype) old_shoottype;
1601		1367
1602	return success;	1368	return success;
1603	}	1369	}
1604		1370
1605
1606	/* This is called from time.c/process_object(). That function	1371	/* This is called from time.c/process_object(). That function
1607	* calls this for any SPELL_EFFECT type objects. This function	1372	* calls this for any SPELL_EFFECT type objects. This function
1608	* then dispatches them to the appropriate specific routines.	1373	* then dispatches them to the appropriate specific routines.
1609	*/	1374	*/
1610	void	1375	void
1611	move_spell_effect (object *op)	1376	move_spell_effect (object *op)
1612	{	1377	{
…		…
1688	break;	1453	break;
1689		1454
1690	case SP_MAGIC_MISSILE:	1455	case SP_MAGIC_MISSILE:
1691	if (QUERY_FLAG (victim, FLAG_ALIVE))	1456	if (QUERY_FLAG (victim, FLAG_ALIVE))
1692	{	1457	{
1693	tag_t spell_tag = spell->count;
1694
1695	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);	1458	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1696	if (!was_destroyed (spell, spell_tag))	1459
1697	{	1460	if (!spell->destroyed ())
1698	remove_ob (spell);	1461	spell->destroy ();
1699	free_object (spell);
1700	}
1701	}	1462	}
1702	break;	1463	break;
1703		1464
1704	case SP_MOVING_BALL:	1465	case SP_MOVING_BALL:
1705	if (QUERY_FLAG (victim, FLAG_ALIVE))	1466	if (QUERY_FLAG (victim, FLAG_ALIVE))
1706	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);	1467	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1707	else if (victim->material \|\| victim->materialname)	1468	else if (victim->materialname)
1708	save_throw_object (victim, spell->attacktype, spell);	1469	save_throw_object (victim, spell->attacktype, spell);
1709	break;	1470	break;
1710	}	1471	}
1711	}	1472	}
		1473

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.13 by root, Tue Sep 12 17:23:02 2006 UTC vs. Revision 1.75 by root, Mon Jul 14 00:04:57 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.13 by root, Tue Sep 12 17:23:02 2006 UTC vs.
Revision 1.75 by root, Mon Jul 14 00:04:57 2008 UTC