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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.49 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.83 by root, Mon Sep 29 11:52:34 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
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>
37	*/	36	*/
38	object *	37	object *
39	find_random_spell_in_ob (object ob, const char skill)	38	find_random_spell_in_ob (object ob, const char skill)
40	{	39	{
41	int k = 0, s;	40	int k = 0, s;
42	object *tmp;
43		41
44	for (tmp = ob->inv; tmp; tmp = tmp->below)	42	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
45	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))	43	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))
46	k++;	44	k++;
47		45
48	/* No spells, no need to progess further */	46	/* No spells, no need to progess further */
49	if (!k)	47	if (!k)
50	return NULL;	48	return NULL;
51		49
52	s = RANDOM () % k;	50	s = RANDOM () % k;
53		51
54	for (tmp = ob->inv; tmp; tmp = tmp->below)	52	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
55	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))	53	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))
56	{
57	if (!s)	54	if (!s)
58	return tmp;	55	return tmp;
59	else	56	else
60	s--;	57	s--;
61	}	58
62	/* Should never get here, but just in case */	59	/* Should never get here, but just in case */
63	return NULL;	60	return 0;
64	}	61	}
65		62
66	/* Relatively simple function that gets used a lot.	63	/* Relatively simple function that gets used a lot.
67	* Basically, it sets up the skill pointer for the spell being	64	* Basically, it sets up the skill pointer for the spell being
68	* cast. If op is really casting the spell, then the skill	65	* cast. If op is really casting the spell, then the skill
…		…
78	dest->skill = spob->skill;	75	dest->skill = spob->skill;
79	else	76	else
80	dest->skill = caster->skill;	77	dest->skill = caster->skill;
81	}	78	}
82		79
83	/* init_spells: This should really be called check_spells, as that
84	* is what it does. It goes through the spells looking for any
85	* obvious errors. This was most useful in debugging when re-doing
86	* all the spells to catch simple errors. To use it all the time
87	* will result in it spitting out messages that aren't really errors.
88	*/
89	void
90	init_spells (void)
91	{
92	#ifdef SPELL_DEBUG
93	static int init_spells_done = 0;
94	int i;
95	archetype *at;
96
97	if (init_spells_done)
98	return;
99	LOG (llevDebug, "Checking spells...\n");
100
101	for (at = first_archetype; at; at = at->next)
102	{
103	if (at->clone.type == SPELL)
104	{
105	if (at->clone.skill)
106	{
107	for (i = 1; i < NUM_SKILLS; i++)
108	if (!strcmp (skill_names[i], at->clone.skill))
109	break;
110	if (i == NUM_SKILLS)
111	{
112	LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
113	}
114	}
115	/* other_arch is already checked for in the loader */
116	}
117	}
118
119	i = 0;
120	while (spell_mapping[i])
121	{
122	if (!archetype::find (spell_mapping[i]))
123	{
124	LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
125	}
126	i++;
127	}
128	LOG (llevDebug, "Checking spells completed.\n");
129	#endif
130	}
131
132	/* Dumps all the spells - now also dumps skill associated with the spell.
133	* not sure what this would be used for, as the data seems pretty
134	* minimal, but easy enough to keep around.
135	*/
136	void
137	dump_spells (void)
138	{
139	archetype *at;
140
141	for (at = first_archetype; at; at = at->next)
142	{
143	if (at->clone.type == SPELL)
144	{
145	fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
146	&at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
147	}
148	}
149	}
150
151	/* pretty basic function - basically just takes	80	/* pretty basic function - basically just takes
152	* an object, sets the x,y, and calls insert_ob_in_map	81	* an object, sets the x,y, and calls insert_ob_in_map
153	*/	82	*/
154	void	83	void
155	spell_effect (object spob, int x, int y, maptile map, object *originator)	84	spell_effect (object spob, int x, int y, maptile map, object *originator)
156	{	85	{
157	if (spob->other_arch)	86	if (spob->other_arch)
158	map->insert (arch_to_object (spob->other_arch), x, y, originator);	87	map->insert (arch_to_object (spob->other_arch), x, y, originator);
159	}	88	}
160		89
161	/*	90	static int
162	* This function takes a caster and spell and presents the	91	attuned_bonus (object caster, object spell, int level)
163	* effective level the caster needs to be to cast the spell.
164	* basically, it just adjusts the spell->level with attuned/repelled
165	* spellpaths. Was called path_level_mod.
166	*
167	* caster is person casting the spell.
168	* spell is the spell object.
169	* Returns modified level.
170	*/
171	int
172	min_casting_level (object caster, object spell)
173	{	92	{
174	int new_level;	93	// compute the attuned/repelled bonus
175		94	// attuned only increases up to 2 times the original level (i.e. bonus <= level) */
176	if (caster->path_denied & spell->path_attuned)	95	// repell has no such quarrels
177	return 1;	96	return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
178
179	new_level = spell->level
180	+ (caster->path_repelled & spell->path_attuned ? +2 : 0)	97	+ (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
181	+ (caster->path_attuned & spell->path_attuned ? -2 : 0);
182
183	return max (1, new_level);
184	}	98	}
185		99
186	/* This function returns the effective level the spell	100	/* This function returns the effective level the spell
187	* is being cast at.	101	* is being cast at.
188	* Note that I changed the repelled/attuned bonus to 2 from 5.
189	* This is because the new code compares casting_level against
190	* min_caster_level, so the difference is effectively 4
191	*/	102	*/
192	int	103	int
193	caster_level (object caster, object spell)	104	casting_level (object caster, object spell)
194	{	105	{
195	int level = caster->level;	106	int level = caster->level;
196
197	/* If this is a player, try to find the matching skill */
198	if (caster->type == PLAYER && spell->skill)
199	for (int i = 0; i < NUM_SKILLS; i++)
200	if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
201	{
202	level = caster->contr->last_skill_ob[i]->level;
203	break;
204	}
205		107
206	/* if a rod is fired by a player, take the use_magic_item skill in consideration. */	108	/* if a rod is fired by a player, take the use_magic_item skill in consideration. */
207	if (caster->type == ROD && caster->env && caster->env->type == PLAYER)	109	if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
208	{	110	{
209	object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);	111	object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
210	int sk_level = skill ? skill->level : 1;	112	int sk_level = skill ? skill->level : 1;
211		113
212	level = MIN (level, sk_level + level / 10 + 1);	114	level = min (level, sk_level + level / 10 + 1);
213	}	115	}
		116	else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
		117	if (object *skill = caster->contr->find_skill (spell->skill))
		118	level = skill->level;
214		119
215	/* Got valid caster level. Now adjust for attunement */	120	int bonus = attuned_bonus (caster, spell, level);
216	level += caster->path_repelled & spell->path_attuned ? -2 : 0;	121
217	level += caster->path_attuned & spell->path_attuned ? +2 : 0;	122	level += bonus;
		123
		124	// now scale the effective level from the startinglevel..100 range to 1..100
		125	if (level < 100)
		126	level = lerp (level, (int)spell->level, 100, 1, 100);
218		127
219	/* Always make this at least 1. If this is zero, we get divide by zero	128	/* Always make this at least 1. If this is zero, we get divide by zero
220	* errors in various places.	129	* errors in various places.
221	*/	130	*/
222	return max (level, 1);	131	return max (level, 1);
…		…
231	* caster is what is casting the spell, can be op.	140	* caster is what is casting the spell, can be op.
232	* spell is the spell object.	141	* spell is the spell object.
233	* Note that it is now possible for a spell to cost both grace and	142	* Note that it is now possible for a spell to cost both grace and
234	* mana. In that case, we return which ever value is higher.	143	* mana. In that case, we return which ever value is higher.
235	*/	144	*/
236
237	sint16	145	sint16
238	SP_level_spellpoint_cost (object caster, object spell, int flags)	146	SP_level_spellpoint_cost (object caster, object spell, int flags)
239	{	147	{
240	int sp, grace, level = caster_level (caster, spell);	148	int sp, grace, level = casting_level (caster, spell);
241		149
242	if (settings.spellpoint_level_depend == TRUE)	150	if (settings.spellpoint_level_depend == TRUE)
243	{	151	{
244	if (spell->stats.sp && spell->stats.maxsp)	152	if (spell->stats.sp && spell->stats.maxsp)
245	{	153	{
…		…
266	else	174	else
267	{	175	{
268	sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));	176	sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
269	if (spell->stats.sp && !sp)	177	if (spell->stats.sp && !sp)
270	sp = 1;	178	sp = 1;
		179
271	grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));	180	grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
272	if (spell->stats.grace && !grace)	181	if (spell->stats.grace && !grace)
273	grace = 1;	182	grace = 1;
274	}	183	}
		184
275	if (flags == SPELL_HIGHEST)	185	if (flags == SPELL_HIGHEST)
276	return MAX (sp, grace);	186	return MAX (sp, grace);
277	else if (flags == SPELL_GRACE)	187	else if (flags == SPELL_GRACE)
278	return grace;	188	return grace;
279	else if (flags == SPELL_MANA)	189	else if (flags == SPELL_MANA)
…		…
283	LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);	193	LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
284	return 0;	194	return 0;
285	}	195	}
286	}	196	}
287		197
		198	/*
		199	* Return the effective casting level of the spell.
		200	* To make spells independent of their starting level, this function
		201	* scales the range spellstartlevel .. 100 into the range 1..100
		202	*/
		203	static int
		204	SP_casting_level (object caster, object spell)
		205	{
		206	return casting_level (caster, spell);
		207	}
288		208
289	/* SP_level_dam_adjust: Returns adjusted damage based on the caster.	209	/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
290	* spob is the spell we are adjusting.	210	* spob is the spell we are adjusting.
291	*/	211	*/
292	int	212	int
293	SP_level_dam_adjust (object caster, object spob)	213	SP_level_dam_adjust (object caster, object spob)
294	{	214	{
295	int level = caster_level (caster, spob);
296	int adj = level - min_casting_level (caster, spob);
297
298	if (adj < 0)
299	adj = 0;
300	if (spob->dam_modifier)	215	if (!spob->dam_modifier)
301	adj /= spob->dam_modifier;
302	else
303	adj = 0;
304	return adj;	216	return 0;
		217
		218	return SP_casting_level (caster, spob) / spob->dam_modifier;
305	}	219	}
306		220
307	/* Adjust the strength of the spell based on level.	221	/* Adjust the strength of the spell based on level.
308	* This is basically the same as SP_level_dam_adjust above,	222	* This is basically the same as SP_level_dam_adjust above,
309	* but instead looks at the level_modifier value.	223	* but instead looks at the level_modifier value.
310	*/	224	*/
311	int	225	int
312	SP_level_duration_adjust (object caster, object spob)	226	SP_level_duration_adjust (object caster, object spob)
313	{	227	{
314	int level = caster_level (caster, spob);
315	int adj = level - min_casting_level (caster, spob);
316
317	if (adj < 0)
318	adj = 0;
319	if (spob->duration_modifier)	228	if (!spob->duration_modifier)
320	adj /= spob->duration_modifier;
321	else
322	adj = 0;
323
324	return adj;	229	return 0;
		230
		231	return SP_casting_level (caster, spob) / spob->duration_modifier;
325	}	232	}
326		233
327	/* Adjust the strength of the spell based on level.	234	/* Adjust the strength of the spell based on level.
328	* This is basically the same as SP_level_dam_adjust above,	235	* This is basically the same as SP_level_dam_adjust above,
329	* but instead looks at the level_modifier value.	236	* but instead looks at the level_modifier value.
330	*/	237	*/
331	int	238	int
332	SP_level_range_adjust (object caster, object spob)	239	SP_level_range_adjust (object caster, object spob)
333	{	240	{
334	int level = caster_level (caster, spob);
335	int adj = level - min_casting_level (caster, spob);
336
337	if (adj < 0)
338	adj = 0;
339	if (spob->range_modifier)	241	if (!spob->range_modifier)
340	adj /= spob->range_modifier;
341	else
342	adj = 0;
343
344	return adj;	242	return 0;
		243
		244	return SP_casting_level (caster, spob) / spob->range_modifier;
345	}	245	}
346		246
347	/* Checks to see if player knows the spell. If the name is the same	247	/* Checks to see if player knows the spell. If the name is the same
348	* as an existing spell, we presume they know it.	248	* as an existing spell, we presume they know it.
349	* returns 1 if they know the spell, 0 if they don't.	249	* returns 1 if they know the spell, 0 if they don't.
350	*/	250	*/
351	object *	251	object *
352	check_spell_known (object op, const char name)	252	check_spell_known (object op, const char name)
353	{	253	{
354	object *spop;	254	object *spop;
		255	shstr_cmp name_ (name);
355		256
356	for (spop = op->inv; spop; spop = spop->below)	257	for (spop = op->inv; spop; spop = spop->below)
357	if (spop->type == SPELL && !strcmp (spop->name, name))	258	if (spop->type == SPELL && spop->name == name)
358	return spop;	259	return spop;
359		260
360	return NULL;	261	return 0;
361	}	262	}
362
363		263
364	/*	264	/*
365	* Look at object 'op' and see if they know the spell	265	* Look at object 'op' and see if they know the spell
366	* spname. This is pretty close to check_spell_known	266	* spname. This is pretty close to check_spell_known
367	* above, but it uses a looser matching mechanism.	267	* above, but it uses a looser matching mechanism.
368	* returns the matching spell object, or NULL.	268	* returns the matching spell object, or NULL.
369	* If we match multiple spells but don't get an	269	* If we match multiple spells but don't get an
370	* exact match, we also return NULL.	270	* exact match, we also return NULL.
371	*/	271	*/
372
373	object *	272	object *
374	lookup_spell_by_name (object op, const char spname)	273	lookup_spell_by_name (object op, const char spname)
375	{	274	{
376	object spob1 = NULL, spob2 = NULL, *spob;	275	object spob1 = NULL, spob2 = NULL, *spob;
377	int nummatch = 0;	276	int nummatch = 0;
…		…
423	* eg, updated for tiled maps.	322	* eg, updated for tiled maps.
424	*/	323	*/
425	int	324	int
426	reflwall (maptile m, int x, int y, object sp_op)	325	reflwall (maptile m, int x, int y, object sp_op)
427	{	326	{
428	object *op;
429
430	if (OUT_OF_REAL_MAP (m, x, y))	327	if (OUT_OF_REAL_MAP (m, x, y))
431	return 0;	328	return 0;
		329
432	for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)	330	for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
433	if (QUERY_FLAG (op, FLAG_REFL_SPELL)	331	if (QUERY_FLAG (op, FLAG_REFL_SPELL)
434	&& (!QUERY_FLAG (op, FLAG_ALIVE)	332	&& (!QUERY_FLAG (op, FLAG_ALIVE)
435	\|\| (rndm (0, 99)) < 90 - (sp_op->level / 10)))	333	\|\| (rndm (0, 99)) < 90 - (sp_op->level / 10)))
436	return 1;	334	return 1;
437		335
…		…
458	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	356	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
459	new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");	357	new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
460	dir = 0;	358	dir = 0;
461	}	359	}
462		360
		361	SET_FLAG (new_op, FLAG_IDENTIFIED);
463	op->map->insert (new_op,	362	op->map->insert (new_op,
464	op->x + freearr_x[dir], op->y + freearr_y[dir],	363	op->x + freearr_x[dir], op->y + freearr_y[dir],
465	op,	364	op,
466	dir ? 0 : INS_BELOW_ORIGINATOR);	365	dir ? 0 : INS_BELOW_ORIGINATOR);
467		366
…		…
481	{	380	{
482	if (!xy_normalise (m, x, y))	381	if (!xy_normalise (m, x, y))
483	return 0;	382	return 0;
484		383
485	mapspace &ms = m->at (x, y);	384	mapspace &ms = m->at (x, y);
		385	ms.update ();
486		386
487	if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))	387	if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
488	return 0;	388	return 0;
489		389
490	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	390	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
…		…
526	/*	426	/*
527	* Combine similar spell effects into one spell effect. Needed for	427	* Combine similar spell effects into one spell effect. Needed for
528	* performance reasons with meteor swarm and the like, but also for	428	* performance reasons with meteor swarm and the like, but also for
529	* playability reasons.	429	* playability reasons.
530	*/	430	*/
531	if (tmp->arch == op->arch	431	if (tmp->arch == op->arch /* no harm if not comparing by name here */
532	&& tmp->type == op->type	432	&& tmp->type == op->type
533	&& tmp->subtype == op->subtype	433	&& tmp->subtype == op->subtype
534	&& tmp->owner == op->owner	434	&& tmp->owner == op->owner
535	&& ((tmp->subtype == SP_EXPLOSION) \|\| (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))	435	&& ((tmp->subtype == SP_EXPLOSION) \|\| (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
536	{	436	{
…		…
557	* dir: direction to fire in.	457	* dir: direction to fire in.
558	* spell: spell that is being fired. It uses other_arch for the archetype	458	* spell: spell that is being fired. It uses other_arch for the archetype
559	* to fire.	459	* to fire.
560	* returns 0 on failure, 1 on success.	460	* returns 0 on failure, 1 on success.
561	*/	461	*/
562
563	int	462	int
564	fire_arch_from_position (object op, object caster, sint16 x, sint16 y, int dir, object *spell)	463	fire_arch_from_position (object op, object caster, sint16 x, sint16 y, int dir, object *spell)
565	{	464	{
566	object *tmp;
567	int mflags;
568	maptile *m;
569
570	if (spell->other_arch == NULL)	465	if (!spell->other_arch)
571	return 0;	466	return 0;
572		467
573	m = op->map;	468	object *tmp = spell->other_arch->instance ();
574	mflags = get_map_flags (m, &m, x, y, &x, &y);
575	if (mflags & P_OUT_OF_MAP)
576	{
577	return 0;
578	}
579		469
580	tmp = arch_to_object (spell->other_arch);	470	if (!tmp)
581
582	if (tmp == NULL)
583	return 0;	471	return 0;
584
585	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
586	{
587	new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
588	tmp->destroy ();
589	return 0;
590	}
591		472
592	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	473	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
593	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);	474	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
594	/* code in time.c uses food for some things, duration for others */	475	/* code in time.c uses food for some things, duration for others */
595	tmp->stats.food = tmp->duration;	476	tmp->stats.food = tmp->duration;
596	tmp->range = spell->range + SP_level_range_adjust (caster, spell);	477	tmp->range = spell->range + SP_level_range_adjust (caster, spell);
597	tmp->attacktype = spell->attacktype;	478	tmp->attacktype = spell->attacktype;
598	tmp->x = x;
599	tmp->y = y;
600	tmp->direction = dir;	479	tmp->direction = dir;
601	if (op->owner != NULL)
602	tmp->set_owner (op);	480	tmp->set_owner (op);
603	else
604	tmp->set_owner (op);
605	tmp->level = caster_level (caster, spell);	481	tmp->level = casting_level (caster, spell);
606	set_spell_skill (op, caster, spell, tmp);	482	set_spell_skill (op, caster, spell, tmp);
607		483
608	/* needed for AT_HOLYWORD,AT_GODPOWER stuff */	484	/* needed for AT_HOLYWORD,AT_GODPOWER stuff */
609	if (tmp->attacktype & AT_HOLYWORD \|\| tmp->attacktype & AT_GODPOWER)	485	if (tmp->attacktype & AT_HOLYWORD \|\| tmp->attacktype & AT_GODPOWER)
610	{
611	if (!tailor_god_spell (tmp, op))	486	if (!tailor_god_spell (tmp, op))
612	return 0;	487	return 0;
613	}	488
614	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	489	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
615	SET_ANIMATION (tmp, dir);	490	SET_ANIMATION (tmp, dir);
616		491
617	if ((tmp = insert_ob_in_map (tmp, m, op, 0)))	492	if ((tmp = op->map->insert (tmp, x, y, op)))
618	move_spell_effect (tmp);	493	move_spell_effect (tmp);
619		494
620	return 1;	495	return 1;
621	}	496	}
622		497
…		…
677	if (!tmp)	552	if (!tmp)
678	tmp = op->ms ().player ();	553	tmp = op->ms ().player ();
679		554
680	return tmp;	555	return tmp;
681	}	556	}
682
683
684		557
685	/* raytrace:	558	/* raytrace:
686	* spell_find_dir(map, x, y, exclude) will search first the center square	559	* spell_find_dir(map, x, y, exclude) will search first the center square
687	* then some close squares in the given map at the given coordinates for	560	* then some close squares in the given map at the given coordinates for
688	* live objects.	561	* live objects.
…		…
691	* monsters/generators only. If not, the spell will hunt players only.	564	* monsters/generators only. If not, the spell will hunt players only.
692	* It returns the direction toward the first/closest live object if it finds	565	* It returns the direction toward the first/closest live object if it finds
693	* any, otherwise -1.	566	* any, otherwise -1.
694	* note that exclude can be NULL, in which case all bets are off.	567	* note that exclude can be NULL, in which case all bets are off.
695	*/	568	*/
696
697	int	569	int
698	spell_find_dir (maptile m, int x, int y, object exclude)	570	spell_find_dir (maptile m, int x, int y, object exclude)
699	{	571	{
700	int i, max = SIZEOFFREE;	572	int i, max = SIZEOFFREE;
701	sint16 nx, ny;	573	sint16 nx, ny;
…		…
748		620
749	/* find a free square nearby	621	/* find a free square nearby
750	* first we check the closest square for free squares	622	* first we check the closest square for free squares
751	*/	623	*/
752		624
753	dir = find_first_free_spot (&at->clone, op->map, op->x, op->y);	625	dir = find_first_free_spot (at, op->map, op->x, op->y);
754	if (dir != -1)	626	if (dir != -1)
755	{	627	{
756	/* This is basically grabbed for generate monster. Fixed 971225 to	628	/* This is basically grabbed for generate monster. Fixed 971225 to
757	* insert multipart monsters properly	629	* insert multipart monsters properly
758	*/	630	*/
		631	//TODO: use expand_tail + ...
759	while (at != NULL)	632	while (at != NULL)
760	{	633	{
761	tmp = arch_to_object (at);	634	tmp = arch_to_object (at);
762	tmp->x = op->x + freearr_x[dir] + at->clone.x;	635	tmp->x = op->x + freearr_x[dir] + at->x;
763	tmp->y = op->y + freearr_y[dir] + at->clone.y;	636	tmp->y = op->y + freearr_y[dir] + at->y;
764	tmp->map = op->map;	637	tmp->map = op->map;
765	if (head)	638	if (head)
766	{	639	{
767	tmp->head = head;	640	tmp->head = head;
768	prev->more = tmp;	641	prev->more = tmp;
769	}	642	}
		643
770	if (!head)	644	if (!head)
771	head = tmp;	645	head = tmp;
		646
772	prev = tmp;	647	prev = tmp;
		648
773	at = at->more;	649	at = (archetype *)at->more;
774	}	650	}
775		651
776	if (head->randomitems)	652	if (head->randomitems)
777	create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);	653	create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
778		654
779	insert_ob_in_map (head, op->map, op, 0);	655	insert_ob_in_map (head, op->map, op, 0);
780		656
781	/* thought it'd be cool to insert a burnout, too. */	657	/* thought it'd be cool to insert a burnout, too. */
782	op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op);	658	op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
783	}	659	}
784	}	660	}
785		661
786	/* peterm: function which summons hostile monsters and	662	/* peterm: function which summons hostile monsters and
787	* places them in nearby squares.	663	* places them in nearby squares.
…		…
991	if (!spell_ob->other_arch)	867	if (!spell_ob->other_arch)
992	{	868	{
993	LOG (llevError, "cast_party_spell: empty other arch\n");	869	LOG (llevError, "cast_party_spell: empty other arch\n");
994	return 0;	870	return 0;
995	}	871	}
		872
996	spell = arch_to_object (spell_ob->other_arch);	873	spell = arch_to_object (spell_ob->other_arch);
997		874
998	/* Always cast spell on caster */	875	/* Always cast spell on caster */
999	success = cast_spell (op, caster, dir, spell, stringarg);	876	success = cast_spell (op, caster, dir, spell, stringarg);
1000		877
1001	if (caster->contr->party == NULL)	878	if (caster->contr->party == NULL)
1002	{	879	{
1003	spell->remove ();	880	spell->remove ();
1004	return success;	881	return success;
1005	}	882	}
		883
1006	for_all_players (pl)	884	for_all_players (pl)
1007	if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))	885	if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1008	{
1009	cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);	886	cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1010	}	887
1011	spell->remove ();	888	spell->remove ();
1012	return success;	889	return success;
1013	}	890	}
1014		891
1015	/* This is where the main dispatch when someone casts a spell.	892	/* This is where the main dispatch when someone casts a spell.
…		…
1041	*/	918	*/
1042	int	919	int
1043	cast_spell (object op, object caster, int dir, object spell_ob, char stringarg)	920	cast_spell (object op, object caster, int dir, object spell_ob, char stringarg)
1044	{	921	{
1045	const char *godname;	922	const char *godname;
1046	int success = 0, mflags, cast_level = 0;	923	int success = 0, cast_level = 0;
1047	object *skill = NULL;	924	object *skill = NULL;
1048		925
1049	if (!spell_ob)	926	if (!spell_ob)
1050	{	927	{
1051	LOG (llevError, "cast_spell: null spell object passed\n");	928	LOG (llevError, "cast_spell: null spell object passed\n");
…		…
1080	* need to have the right skill pointer passed, so we need to	957	* need to have the right skill pointer passed, so we need to
1081	* at least process that code.	958	* at least process that code.
1082	*/	959	*/
1083	if (op->type == PLAYER && op == caster)	960	if (op->type == PLAYER && op == caster)
1084	{	961	{
1085	cast_level = caster_level (caster, spell_ob);
1086
1087	if (spell_ob->skill)	962	if (spell_ob->skill)
1088	{	963	{
1089	skill = find_skill_by_name (op, spell_ob->skill);	964	skill = find_skill_by_name (op, spell_ob->skill);
1090		965
1091	if (!skill)	966	if (!skill)
1092	{	967	{
1093	new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name);	968	op->failmsg (format ("You need the skill %s to cast %s! "
		969	"H<You either need to learn the skill via a skill scroll "
		970	"or you need to wear a talisman or holy symbol.>",
		971	&spell_ob->skill, &spell_ob->name));
1094	return 0;	972	return 0;
1095	}	973	}
1096		974
1097	if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))	975	const char *msg = "";
		976
		977	int caster_level = skill->level;
		978
		979	if (op->path_attuned & spell_ob->path_attuned)
1098	{	980	{
1099	new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell.");	981	caster_level += min (cast_level * 2, ATTUNE_REPELL);
		982	msg = " (attuned)";
		983	}
		984
		985	if (op->path_repelled & spell_ob->path_attuned)
		986	{
		987	caster_level = ATTUNE_REPELL; // negative is ok
		988	msg = " (repelled)";
		989	}
		990
		991	if (spell_ob->level > caster_level)
		992	{
		993	op->failmsg (format ("You lack enough skill to cast that spell! "
		994	"H<Your effective cast level is %d%s, but level %d is required.>",
		995	caster_level, msg, spell_ob->level));
		996	if (!op->is_wiz ())
1100	return 0;	997	return 0;
1101	}	998	}
1102	}	999	}
1103		1000
1104	/* If the caster is the wiz, they don't ever fail, and don't have	1001	/* If the caster is the wiz, they don't ever fail, and don't have
1105	* to have sufficient grace/mana.	1002	* to have sufficient grace/mana.
…		…
1107	if (!QUERY_FLAG (op, FLAG_WIZ))	1004	if (!QUERY_FLAG (op, FLAG_WIZ))
1108	{	1005	{
1109	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&	1006	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1110	SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)	1007	SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1111	{	1008	{
1112	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");	1009	op->failmsg ("You don't have enough mana!");
1113	return 0;	1010	return 0;
1114	}	1011	}
1115		1012
1116	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&	1013	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1117	SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)	1014	SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1118	{	1015	{
1119	if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -	1016	if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1120	10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)	1017	10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1121	{
1122	new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname);	1018	op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1123	}
1124	else	1019	else
1125	{	1020	{
1126	prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);	1021	prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1127	new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname);	1022	op->failmsg (format ("%s ignores your prayer.", godname));
1128	return 0;	1023	return 0;
1129	}	1024	}
1130	}	1025	}
1131		1026
1132	/* player/monster is trying to cast the spell. might fumble it */	1027	/* player/monster is trying to cast the spell. might fumble it */
1133	if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <	1028	if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1134	(spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))	1029	(spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1135	{	1030	{
1136	play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);	1031	op->contr->play_sound (sound_find ("fumble_spell"));
1137	new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell.");	1032	op->failmsg ("You fumble the prayer.");
1138		1033
1139	op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);	1034	op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1140	return 0;	1035	return 0;
1141	}	1036	}
1142	else if (spell_ob->stats.sp)	1037	else if (spell_ob->stats.sp)
1143	{	1038	{
1144	int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;	1039	int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1145		1040
1146	if (failure < 0)	1041	if (failure < 0)
1147	{	1042	{
1148	new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use.");	1043	op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1149	if (settings.spell_failure_effects == TRUE)	1044	if (settings.spell_failure_effects == TRUE)
1150	spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);	1045	spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1151		1046
1152	op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);	1047	op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1153	return 0;	1048	return 0;
1154	}	1049	}
1155	}	1050	}
1156	}	1051	}
1157	}	1052	}
1158		1053
1159	mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL);	1054	int mflags = op->ms ().flags ();
1160		1055
1161	/* See if we can cast a spell here. If the caster and op are	1056	/* See if we can cast a spell here. If the caster and op are
1162	* not alive, then this would mean that the mapmaker put the	1057	* not alive, then this would mean that the mapmaker put the
1163	* objects on the space - presume that they know what they are	1058	* objects on the space - presume that they know what they are
1164	* doing.	1059	* doing.
1165	*/	1060	*/
1166		1061
1167	if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!	1062	if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1168	{	1063	{
1169	new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!.");	1064	op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1170	return 0;	1065	return 0;
1171	}	1066	}
1172		1067
1173	if ((spell_ob->type == SPELL)	1068	if ((spell_ob->type == SPELL)
1174	&& (caster->type != POTION)	1069	&& (caster->type != POTION)
…		…
1179	{	1074	{
1180	if (op->type != PLAYER)	1075	if (op->type != PLAYER)
1181	return 0;	1076	return 0;
1182		1077
1183	if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)	1078	if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1184	new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname);	1079	op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1185	else if (object *item = op->contr->ranged_ob)	1080	else if (object *item = op->contr->ranged_ob)
1186	{	1081	{
1187	if (item->type == SPELL)	1082	if (item->type == SPELL)
1188	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting.");	1083	op->failmsg ("Something blocks your spellcasting.");
1189	else if (item->type == SCROLL)	1084	else if (item->type == SCROLL)
1190	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");	1085	op->failmsg ("Something blocks the magic of your scroll.");
1191	else	1086	else
1192	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");	1087	op->failmsg ("Something blocks the magic of your item.");
1193	}	1088	}
1194	else	1089	else
1195	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");	1090	op->failmsg ("Something blocks the spell!");
1196		1091
1197	return 0;	1092	return 0;
1198	}	1093	}
1199		1094
1200	/* Take into account how long it takes to cast the spell.	1095	/* Take into account how long it takes to cast the spell.
…		…
1230	if (op != caster && !skill && caster->skill)	1125	if (op != caster && !skill && caster->skill)
1231	{	1126	{
1232	skill = find_skill_by_name (op, caster->skill);	1127	skill = find_skill_by_name (op, caster->skill);
1233	if (!skill)	1128	if (!skill)
1234	{	1129	{
1235	new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));	1130	op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1236	return 0;	1131	return 0;
1237	}	1132	}
1238		1133
1239	op->change_skill (skill); /* needed for proper exp credit */	1134	op->change_skill (skill); /* needed for proper exp credit */
1240	}	1135	}
…		…
1282	case SP_SMITE:	1177	case SP_SMITE:
1283	success = cast_smite_spell (op, caster, dir, spell_ob);	1178	success = cast_smite_spell (op, caster, dir, spell_ob);
1284	break;	1179	break;
1285		1180
1286	case SP_MAGIC_MISSILE:	1181	case SP_MAGIC_MISSILE:
1287	success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);	1182	success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1288	break;	1183	break;
1289		1184
1290	case SP_SUMMON_GOLEM:	1185	case SP_SUMMON_GOLEM:
1291	success = summon_golem (op, caster, dir, spell_ob);	1186	success = summon_golem (op, caster, dir, spell_ob);
1292	break;	1187	break;
…		…
1369	#ifdef NO_POLYMORPH	1264	#ifdef NO_POLYMORPH
1370	/* Not great, but at least provide feedback so if players do have	1265	/* Not great, but at least provide feedback so if players do have
1371	* polymorph (ie, find it as a preset item or left over from before	1266	* polymorph (ie, find it as a preset item or left over from before
1372	* it was disabled), they get some feedback.	1267	* it was disabled), they get some feedback.
1373	*/	1268	*/
1374	new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles");	1269	op->failmsg ("The spell fizzles!");
1375	success = 0;	1270	success = 0;
1376	#else	1271	#else
1377	success = cast_polymorph (op, caster, spell_ob, dir);	1272	success = cast_polymorph (op, caster, spell_ob, dir);
1378	#endif	1273	#endif
1379	break;	1274	break;
…		…
1399	break;	1294	break;
1400		1295
1401	case SP_MOVING_BALL:	1296	case SP_MOVING_BALL:
1402	if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)	1297	if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1403	{	1298	{
1404	new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name);	1299	op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1405	success = 0;	1300	success = 0;
1406	}	1301	}
1407	else	1302	else
1408	success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);	1303	success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1409	break;	1304	break;
1410		1305
1411	case SP_SWARM:	1306	case SP_SWARM:
1412	success = fire_swarm (op, caster, spell_ob, dir);	1307	success = fire_swarm (op, caster, spell_ob, dir);
1413	break;	1308	break;
…		…
1459		1354
1460	default:	1355	default:
1461	LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);	1356	LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1462	}	1357	}
1463		1358
1464	/* FIXME - we need some better sound suppport */	1359	op->play_sound (
1465	// yes, for example, augment map info with the spell effect	1360	success
1466	// so clients can calculate the sounds themselves	1361	? spell_ob->sound
1467	//play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);	1362	? spell_ob->sound
		1363	: sound_find ("spell_success")
		1364	: sound_find ("fumble_spell")
		1365	);
1468		1366
1469	return success;	1367	return success;
1470	}	1368	}
1471		1369
1472
1473	/* This is called from time.c/process_object(). That function	1370	/* This is called from time.c/process_object(). That function
1474	* calls this for any SPELL_EFFECT type objects. This function	1371	* calls this for any SPELL_EFFECT type objects. This function
1475	* then dispatches them to the appropriate specific routines.	1372	* then dispatches them to the appropriate specific routines.
1476	*/	1373	*/
1477	void	1374	void
1478	move_spell_effect (object *op)	1375	move_spell_effect (object *op)
1479	{	1376	{
…		…
1537	check_bullet (op);	1434	check_bullet (op);
1538	return;	1435	return;
1539	}	1436	}
1540	}	1437	}
1541		1438
1542	/* This is called by move_apply. Basically, if someone	1439	/* This is called by move_apply. Basically, if someone
1543	* moves onto a spell effect and the walk_on or fly_on flags	1440	* moves onto a spell effect and the walk_on or fly_on flags
1544	* are set, this is called. This should only be called for	1441	* are set, this is called. This should only be called for
1545	* objects of the appropraite type.	1442	* objects of the appropriate type.
1546	*/	1443	*/
1547	void	1444	void
1548	apply_spell_effect (object spell, object victim)	1445	apply_spell_effect (object spell, object victim)
1549	{	1446	{
1550	switch (spell->subtype)	1447	switch (spell->subtype)
…		…
1556		1453
1557	case SP_MAGIC_MISSILE:	1454	case SP_MAGIC_MISSILE:
1558	if (QUERY_FLAG (victim, FLAG_ALIVE))	1455	if (QUERY_FLAG (victim, FLAG_ALIVE))
1559	{	1456	{
1560	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);	1457	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1561
1562	if (!spell->destroyed ())
1563	spell->destroy ();	1458	spell->destroy ();
1564	}	1459	}
1565	break;	1460	break;
1566		1461
1567	case SP_MOVING_BALL:	1462	case SP_MOVING_BALL:
1568	if (QUERY_FLAG (victim, FLAG_ALIVE))	1463	if (QUERY_FLAG (victim, FLAG_ALIVE))
1569	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);	1464	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1570	else if (victim->materialname)	1465	else if (victim->materialname)
1571	save_throw_object (victim, spell->attacktype, spell);	1466	save_throw_object (victim, spell->attacktype, spell);
		1467
1572	break;	1468	break;
1573	}	1469	}
1574	}	1470	}
		1471

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.49 by root, Mon May 28 21:28:36 2007 UTC vs. Revision 1.83 by root, Mon Sep 29 11:52:34 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.49 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.83 by root, Mon Sep 29 11:52:34 2008 UTC