ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_util.C
(Generate patch)

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.17 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.85 by root, Tue Sep 30 10:12:39 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@schmorp.de>
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
34extern char *spell_mapping[]; 31extern 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
39 */ 36 */
40object * 37object *
41find_random_spell_in_ob (object *ob, const char *skill) 38find_random_spell_in_ob (object *ob, const char *skill)
42{ 39{
43 int k = 0, s; 40 int k = 0, s;
44 object *tmp;
45 41
46 for (tmp = ob->inv; tmp; tmp = tmp->below) 42 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
47 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 43 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
48 k++; 44 k++;
49 45
50 /* No spells, no need to progess further */ 46 /* No spells, no need to progess further */
51 if (!k) 47 if (!k)
52 return NULL; 48 return NULL;
53 49
54 s = RANDOM () % k; 50 s = RANDOM () % k;
55 51
56 for (tmp = ob->inv; tmp; tmp = tmp->below) 52 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
57 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 53 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
58 {
59 if (!s) 54 if (!s)
60 return tmp; 55 return tmp;
61 else 56 else
62 s--; 57 s--;
63 } 58
64 /* Should never get here, but just in case */ 59 /* Should never get here, but just in case */
65 return NULL; 60 return 0;
66} 61}
67 62
68/* Relatively simple function that gets used a lot. 63/* Relatively simple function that gets used a lot.
69 * Basically, it sets up the skill pointer for the spell being 64 * Basically, it sets up the skill pointer for the spell being
70 * cast. If op is really casting the spell, then the skill 65 * cast. If op is really casting the spell, then the skill
80 dest->skill = spob->skill; 75 dest->skill = spob->skill;
81 else 76 else
82 dest->skill = caster->skill; 77 dest->skill = caster->skill;
83} 78}
84 79
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 */
91void
92init_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 (!archetype::find (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 */
138void
139dump_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 80/* pretty basic function - basically just takes
154 * 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
155 */ 82 */
156
157void 83void
158spell_effect (object *spob, int x, int y, maptile *map, object *originator) 84spell_effect (object *spob, int x, int y, maptile *map, object *originator)
159{ 85{
160
161 if (spob->other_arch != NULL) 86 if (spob->other_arch)
162 { 87 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} 88}
171 89
172/* 90static int
173 * This function takes a caster and spell and presents the 91attuned_bonus (object *caster, object *spell, int level)
174 * effective level the caster needs to be to cast the spell.
175 * basically, it just adjusts the spell->level with attuned/repelled
176 * spellpaths. Was called path_level_mod
177 *
178 * caster is person casting hte spell.
179 * spell is the spell object.
180 * Returns modified level.
181 */
182int
183min_casting_level (object *caster, object *spell)
184{ 92{
185 int new_level; 93 // compute the attuned/repelled bonus
186 94 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
187 if (caster->path_denied & spell->path_attuned) 95 // repell has no such quarrels
188 { 96 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
189 /* This case is not a bug, just the fact that this function is 97 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
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;
196 }
197 new_level = spell->level
198 + ((caster->path_repelled & spell->path_attuned) ? +2 : 0) + ((caster->path_attuned & spell->path_attuned) ? -2 : 0);
199 return (new_level < 1) ? 1 : new_level;
200} 98}
201
202 99
203/* This function returns the effective level the spell 100/* This function returns the effective level the spell
204 * is being cast at. 101 * is being cast at.
205 * Note that I changed the repelled/attuned bonus to 2 from 5.
206 * This is because the new code compares casting_level against
207 * min_caster_level, so the difference is effectively 4
208 */ 102 */
209
210int 103int
211caster_level (object *caster, object *spell) 104casting_level (object *caster, object *spell)
212{ 105{
213 int level = caster->level; 106 int level = caster->level;
214
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 107
228 /* 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. */
229 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 109 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
230 { 110 {
231 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);
232 int sk_level = skill ? skill->level : 1; 112 int sk_level = skill ? skill->level : 1;
233 113
234 level = MIN (level, sk_level + level / 10 + 1); 114 level = min (level, sk_level + level / 10 + 1);
235 } 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;
236 119
237 /* Got valid caster level. Now adjust for attunement */ 120 int bonus = attuned_bonus (caster, spell, level);
238 level += ((caster->path_repelled & spell->path_attuned) ? -2 : 0) + ((caster->path_attuned & spell->path_attuned) ? 2 : 0); 121
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);
239 127
240 /* 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
241 * errors in various places. 129 * errors in various places.
242 */ 130 */
243 if (level < 1)
244 level = 1;
245 return level; 131 return max (level, 1);
246} 132}
247 133
248/* The following function scales the spellpoint cost of 134/* The following function scales the spellpoint cost of
249 * a spell by it's increased effectiveness. Some of the 135 * a spell by it's increased effectiveness. Some of the
250 * lower level spells become incredibly vicious at high 136 * lower level spells become incredibly vicious at high
254 * caster is what is casting the spell, can be op. 140 * caster is what is casting the spell, can be op.
255 * spell is the spell object. 141 * spell is the spell object.
256 * 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
257 * mana. In that case, we return which ever value is higher. 143 * mana. In that case, we return which ever value is higher.
258 */ 144 */
259
260sint16 145sint16
261SP_level_spellpoint_cost (object *caster, object *spell, int flags) 146SP_level_spellpoint_cost (object *caster, object *spell, int flags)
262{ 147{
263 int sp, grace, level = caster_level (caster, spell); 148 int sp, grace, level = casting_level (caster, spell);
264 149
265 if (settings.spellpoint_level_depend == TRUE) 150 if (settings.spellpoint_level_depend == TRUE)
266 { 151 {
267 if (spell->stats.sp && spell->stats.maxsp) 152 if (spell->stats.sp && spell->stats.maxsp)
268 { 153 {
289 else 174 else
290 { 175 {
291 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 176 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
292 if (spell->stats.sp && !sp) 177 if (spell->stats.sp && !sp)
293 sp = 1; 178 sp = 1;
179
294 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 180 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
295 if (spell->stats.grace && !grace) 181 if (spell->stats.grace && !grace)
296 grace = 1; 182 grace = 1;
297 } 183 }
184
298 if (flags == SPELL_HIGHEST) 185 if (flags == SPELL_HIGHEST)
299 return MAX (sp, grace); 186 return MAX (sp, grace);
300 else if (flags == SPELL_GRACE) 187 else if (flags == SPELL_GRACE)
301 return grace; 188 return grace;
302 else if (flags == SPELL_MANA) 189 else if (flags == SPELL_MANA)
306 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);
307 return 0; 194 return 0;
308 } 195 }
309} 196}
310 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 */
203static int
204SP_casting_level (object *caster, object *spell)
205{
206 return casting_level (caster, spell);
207}
311 208
312/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 209/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
313 * spob is the spell we are adjusting. 210 * spob is the spell we are adjusting.
314 */ 211 */
315int 212int
316SP_level_dam_adjust (object *caster, object *spob) 213SP_level_dam_adjust (object *caster, object *spob)
317{ 214{
318 int level = caster_level (caster, spob);
319 int adj = level - min_casting_level (caster, spob);
320
321 if (adj < 0)
322 adj = 0;
323 if (spob->dam_modifier) 215 if (!spob->dam_modifier)
324 adj /= spob->dam_modifier;
325 else
326 adj = 0;
327 return adj; 216 return 0;
217
218 return SP_casting_level (caster, spob) / spob->dam_modifier;
328} 219}
329 220
330/* Adjust the strength of the spell based on level. 221/* Adjust the strength of the spell based on level.
331 * This is basically the same as SP_level_dam_adjust above, 222 * This is basically the same as SP_level_dam_adjust above,
332 * but instead looks at the level_modifier value. 223 * but instead looks at the level_modifier value.
333 */ 224 */
334int 225int
335SP_level_duration_adjust (object *caster, object *spob) 226SP_level_duration_adjust (object *caster, object *spob)
336{ 227{
337 int level = caster_level (caster, spob);
338 int adj = level - min_casting_level (caster, spob);
339
340 if (adj < 0)
341 adj = 0;
342 if (spob->duration_modifier) 228 if (!spob->duration_modifier)
343 adj /= spob->duration_modifier;
344 else
345 adj = 0;
346
347 return adj; 229 return 0;
230
231 return SP_casting_level (caster, spob) / spob->duration_modifier;
348} 232}
349 233
350/* Adjust the strength of the spell based on level. 234/* Adjust the strength of the spell based on level.
351 * This is basically the same as SP_level_dam_adjust above, 235 * This is basically the same as SP_level_dam_adjust above,
352 * but instead looks at the level_modifier value. 236 * but instead looks at the level_modifier value.
353 */ 237 */
354int 238int
355SP_level_range_adjust (object *caster, object *spob) 239SP_level_range_adjust (object *caster, object *spob)
356{ 240{
357 int level = caster_level (caster, spob);
358 int adj = level - min_casting_level (caster, spob);
359
360 if (adj < 0)
361 adj = 0;
362 if (spob->range_modifier) 241 if (!spob->range_modifier)
363 adj /= spob->range_modifier;
364 else
365 adj = 0;
366
367 return adj; 242 return 0;
243
244 return SP_casting_level (caster, spob) / spob->range_modifier;
368} 245}
369 246
370/* 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
371 * as an existing spell, we presume they know it. 248 * as an existing spell, we presume they know it.
372 * 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.
373 */ 250 */
374object * 251object *
375check_spell_known (object *op, const char *name) 252check_spell_known (object *op, const char *name)
376{ 253{
377 object *spop; 254 object *spop;
255 shstr_cmp name_ (name);
378 256
379 for (spop = op->inv; spop; spop = spop->below) 257 for (spop = op->inv; spop; spop = spop->below)
380 if (spop->type == SPELL && !strcmp (spop->name, name)) 258 if (spop->type == SPELL && spop->name == name)
381 return spop; 259 return spop;
382 260
383 return NULL; 261 return 0;
384} 262}
385
386 263
387/* 264/*
388 * Look at object 'op' and see if they know the spell 265 * Look at object 'op' and see if they know the spell
389 * spname. This is pretty close to check_spell_known 266 * spname. This is pretty close to check_spell_known
390 * above, but it uses a looser matching mechanism. 267 * above, but it uses a looser matching mechanism.
391 * returns the matching spell object, or NULL. 268 * returns the matching spell object, or NULL.
392 * If we match multiple spells but don't get an 269 * If we match multiple spells but don't get an
393 * exact match, we also return NULL. 270 * exact match, we also return NULL.
394 */ 271 */
395
396object * 272object *
397lookup_spell_by_name (object *op, const char *spname) 273lookup_spell_by_name (object *op, const char *spname)
398{ 274{
399 object *spob1 = NULL, *spob2 = NULL, *spob; 275 object *spob1 = NULL, *spob2 = NULL, *spob;
400 int nummatch = 0; 276 int nummatch = 0;
446 * eg, updated for tiled maps. 322 * eg, updated for tiled maps.
447 */ 323 */
448int 324int
449reflwall (maptile *m, int x, int y, object *sp_op) 325reflwall (maptile *m, int x, int y, object *sp_op)
450{ 326{
451 object *op;
452
453 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
454 return 0; 328 return 0;
455 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 329
456 if (QUERY_FLAG (op, FLAG_REFL_SPELL) && (!QUERY_FLAG (op, FLAG_ALIVE) || 330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
457 sp_op->type == LIGHTNING || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 331 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
332 && (!QUERY_FLAG (op, FLAG_ALIVE)
333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
458 return 1; 334 return 1;
459 335
460 return 0; 336 return 0;
461} 337}
462 338
479 { 355 {
480 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.");
481 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.");
482 dir = 0; 358 dir = 0;
483 } 359 }
484 new_op->x = op->x + freearr_x[dir]; 360
485 new_op->y = op->y + freearr_y[dir]; 361 SET_FLAG (new_op, FLAG_IDENTIFIED);
486 if (dir == 0) 362 op->map->insert (new_op,
487 insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); 363 op->x + freearr_x[dir], op->y + freearr_y[dir],
488 else 364 op,
489 insert_ob_in_map (new_op, op->map, op, 0); 365 dir ? 0 : INS_BELOW_ORIGINATOR);
366
490 return dir; 367 return dir;
491} 368}
492 369
493/* Returns true if it is ok to put spell *op on the space/may provided. 370/* 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 371 * immune_stop is basically the attacktype of the spell (why
496 * has the AT_MAGIC bit set, and there is a counterwall 373 * has the AT_MAGIC bit set, and there is a counterwall
497 * on the space, the object doesn't get placed. if immune stop 374 * 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. 375 * does not have AT_MAGIC, then counterwalls do not effect the spell.
499 * 376 *
500 */ 377 */
501
502int 378int
503ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 379ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
504{ 380{
505 object *tmp; 381 if (!xy_normalise (m, x, y))
506 int mflags;
507 maptile *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; 382 return 0;
514 383
515 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y))) 384 mapspace &ms = m->at (x, y);
385 ms.update ();
386
387 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
516 return 0; 388 return 0;
517 389
518 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) 390 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
519 { 391 {
520 /* If there is a counterspell on the space, and this 392 /* If there is a counterspell on the space, and this
521 * object is using magic, don't progress. I believe we could 393 * 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 394 * 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 395 * 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 396 * 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 397 * 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 398 * removed.) On the other hand, it may be more dramatic for the
527 * spell to actually hit the counterwall and be sucked up. 399 * spell to actually hit the counterwall and be sucked up.
528 */ 400 */
529 if ((tmp->attacktype & AT_COUNTERSPELL) && 401 if ((tmp->attacktype & AT_COUNTERSPELL)
530 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 402 && !QUERY_FLAG (tmp, FLAG_MONSTER)
531 (tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC)) 403 && (tmp->type != PLAYER)
404 && (tmp->type != WEAPON)
405 && (tmp->type != BOW)
406 && (tmp->type != ARROW)
407 && (tmp->type != GOLEM)
408 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
409 // we special case floor here because there
410 // are sometimes spell effect floors
411 // which are used to inflict damage
412 // (and those shouldn't go away from
413 // sanctuary) see also: permanent lava
414 && (immune_stop & AT_MAGIC))
532 return 0; 415 return 0;
533 416
534 /* This is to prevent 'out of control' spells. Basically, this 417 /* This is to prevent 'out of control' spells. Basically, this
535 * limits one spell effect per space per spell. This is definately 418 * limits one spell effect per space per spell. This is definately
536 * needed for performance reasons, and just for playability I believe. 419 * needed for performance reasons, and just for playability I believe.
543 /* 426 /*
544 * Combine similar spell effects into one spell effect. Needed for 427 * Combine similar spell effects into one spell effect. Needed for
545 * performance reasons with meteor swarm and the like, but also for 428 * performance reasons with meteor swarm and the like, but also for
546 * playability reasons. 429 * playability reasons.
547 */ 430 */
548 if (tmp->arch == op->arch 431 if (tmp->arch == op->arch /* no harm if not comparing by name here */
549 && tmp->type == op->type 432 && tmp->type == op->type
550 && tmp->subtype == op->subtype 433 && tmp->subtype == op->subtype
434 && tmp->owner == op->owner
551 && tmp->owner == op->owner && ((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)))
552 { 436 {
553 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 437 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
554 tmp->range = MAX (tmp->range, op->range); 438 tmp->range = MAX (tmp->range, op->range);
555 tmp->duration = MAX (tmp->duration, op->duration); 439 tmp->duration = MAX (tmp->duration, op->duration);
556 return 0; 440 return 0;
558 442
559 /* Perhaps we should also put checks in for no magic and unholy 443 /* Perhaps we should also put checks in for no magic and unholy
560 * ground to prevent it from moving along? 444 * ground to prevent it from moving along?
561 */ 445 */
562 } 446 }
447
563 /* If it passes the above tests, it must be OK */ 448 /* If it passes the above tests, it must be OK */
564 return 1; 449 return 1;
565} 450}
566 451
567/* fire_arch_from_position: fires an archetype. 452/* fire_arch_from_position: fires an archetype.
572 * dir: direction to fire in. 457 * dir: direction to fire in.
573 * 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
574 * to fire. 459 * to fire.
575 * returns 0 on failure, 1 on success. 460 * returns 0 on failure, 1 on success.
576 */ 461 */
577
578int 462int
579fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 463fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
580{ 464{
581 object *tmp;
582 int mflags;
583 maptile *m;
584
585 if (spell->other_arch == NULL) 465 if (!spell->other_arch)
586 return 0; 466 return 0;
587 467
588 m = op->map; 468 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 469
595 tmp = arch_to_object (spell->other_arch); 470 if (!tmp)
596
597 if (tmp == NULL)
598 return 0; 471 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 472
609 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);
610 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 474 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
611 /* 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 */
612 tmp->stats.food = tmp->duration; 476 tmp->stats.food = tmp->duration;
613 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 477 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
614 tmp->attacktype = spell->attacktype; 478 tmp->attacktype = spell->attacktype;
615 tmp->x = x;
616 tmp->y = y;
617 tmp->direction = dir; 479 tmp->direction = dir;
618 if (get_owner (op) != NULL) 480 tmp->set_owner (op);
619 copy_owner (tmp, op);
620 else
621 set_owner (tmp, op);
622 tmp->level = caster_level (caster, spell); 481 tmp->level = casting_level (caster, spell);
623 set_spell_skill (op, caster, spell, tmp); 482 set_spell_skill (op, caster, spell, tmp);
624 483
625 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 484 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
626 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 485 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
627 {
628 if (!tailor_god_spell (tmp, op)) 486 if (!tailor_god_spell (tmp, op))
629 return 0; 487 return 0;
630 } 488
631 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 489 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
632 SET_ANIMATION (tmp, dir); 490 SET_ANIMATION (tmp, dir);
633 491
634 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 492 if ((tmp = op->map->insert (tmp, x, y, op)))
635 return 1;
636
637 move_spell_effect (tmp); 493 move_spell_effect (tmp);
638 494
639 return 1; 495 return 1;
640} 496}
641
642
643 497
644/***************************************************************************** 498/*****************************************************************************
645 * 499 *
646 * Code related to rods - perhaps better located in another file? 500 * Code related to rods - perhaps better located in another file?
647 * 501 *
648 ****************************************************************************/ 502 ****************************************************************************/
649
650void 503void
651regenerate_rod (object *rod) 504regenerate_rod (object *rod)
652{ 505{
653 if (rod->stats.hp < rod->stats.maxhp) 506 if (rod->stats.hp < rod->stats.maxhp)
654 { 507 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} 508}
661
662 509
663void 510void
664drain_rod_charge (object *rod) 511drain_rod_charge (object *rod)
665{ 512{
666 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 513 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
667} 514}
668
669
670
671 515
672/* this function is commonly used to find a friendly target for 516/* this function is commonly used to find a friendly target for
673 * spells such as heal or protection or armour 517 * spells such as heal or protection or armour
674 * op is what is looking for the target (which can be a player), 518 * 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 519 * dir is the direction we are looking in. Return object found, or
676 * NULL if no good object. 520 * NULL if no good object.
677 */ 521 */
678
679object * 522object *
680find_target_for_friendly_spell (object *op, int dir) 523find_target_for_friendly_spell (object *op, int dir)
681{ 524{
682 object *tmp; 525 object *tmp;
683 maptile *m;
684 sint16 x, y;
685 int mflags;
686 526
687 /* I don't really get this block - if op isn't a player or rune, 527 /* 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. 528 * we then make the owner of this object the target.
689 * The owner could very well be no where near op. 529 * The owner could very well be no where near op.
690 */ 530 */
691 if (op->type != PLAYER && op->type != RUNE) 531 if (op->type != PLAYER && op->type != RUNE)
692 { 532 {
693 tmp = get_owner (op); 533 tmp = op->owner;
694 /* If the owner does not exist, or is not a monster, than apply the spell 534 /* If the owner does not exist, or is not a monster, than apply the spell
695 * to the caster. 535 * to the caster.
696 */ 536 */
697 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 537 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
698 tmp = op; 538 tmp = op;
699 } 539 }
700 else 540 else
701 { 541 {
702 m = op->map; 542 maptile *m = op->map;
703 x = op->x + freearr_x[dir]; 543 sint16 x = op->x + freearr_x[dir];
704 y = op->y + freearr_y[dir]; 544 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 { 545
712 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 546 tmp = xy_normalise (m, x, y)
713 if (tmp->type == PLAYER) 547 ? m->at (x, y).player ()
714 break; 548 : 0;
715 }
716 } 549 }
550
717 /* didn't find a player there, look in current square for a player */ 551 /* didn't find a player there, look in current square for a player */
718 if (tmp == NULL) 552 if (!tmp)
719 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 553 tmp = op->ms ().player ();
720 {
721 if (tmp->type == PLAYER)
722 break;
723 }
724 554
725 return tmp; 555 return tmp;
726} 556}
727
728
729 557
730/* raytrace: 558/* raytrace:
731 * 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
732 * 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
733 * live objects. 561 * live objects.
736 * monsters/generators only. If not, the spell will hunt players only. 564 * 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 565 * It returns the direction toward the first/closest live object if it finds
738 * any, otherwise -1. 566 * any, otherwise -1.
739 * 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.
740 */ 568 */
741
742int 569int
743spell_find_dir (maptile *m, int x, int y, object *exclude) 570spell_find_dir (maptile *m, int x, int y, object *exclude)
744{ 571{
745 int i, max = SIZEOFFREE; 572 int i, max = SIZEOFFREE;
746 sint16 nx, ny; 573 sint16 nx, ny;
760 mp = m; 587 mp = m;
761 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 588 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
762 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) 589 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
763 continue; 590 continue;
764 591
765 tmp = get_map_ob (mp, nx, ny); 592 tmp = GET_MAP_OB (mp, nx, ny);
766 593
767 while (tmp != NULL && (((owner_type == PLAYER && 594 while (tmp != NULL && (((owner_type == PLAYER &&
768 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 595 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) ||
769 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 596 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
770 tmp = tmp->above; 597 tmp = tmp->above;
773 return freedir[i]; 600 return freedir[i];
774 } 601 }
775 return -1; /* flag for "keep going the way you were" */ 602 return -1; /* flag for "keep going the way you were" */
776} 603}
777 604
778
779
780/* put_a_monster: puts a monster named monstername near by 605/* put_a_monster: puts a monster named monstername near by
781 * op. This creates the treasures for the monsters, and 606 * op. This creates the treasures for the monsters, and
782 * also deals with multipart monsters properly. 607 * also deals with multipart monsters properly.
783 */ 608 */
784
785void 609void
786put_a_monster (object *op, const char *monstername) 610put_a_monster (object *op, const char *monstername)
787{ 611{
788 object *tmp, *head = NULL, *prev = NULL; 612 object *tmp, *head = NULL, *prev = NULL;
789 archetype *at; 613 archetype *at;
796 620
797 /* find a free square nearby 621 /* find a free square nearby
798 * first we check the closest square for free squares 622 * first we check the closest square for free squares
799 */ 623 */
800 624
801 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);
802 if (dir != -1) 626 if (dir != -1)
803 { 627 {
804 /* This is basically grabbed for generate monster. Fixed 971225 to 628 /* This is basically grabbed for generate monster. Fixed 971225 to
805 * insert multipart monsters properly 629 * insert multipart monsters properly
806 */ 630 */
631 //TODO: use expand_tail + ...
807 while (at != NULL) 632 while (at != NULL)
808 { 633 {
809 tmp = arch_to_object (at); 634 tmp = arch_to_object (at);
810 tmp->x = op->x + freearr_x[dir] + at->clone.x; 635 tmp->x = op->x + freearr_x[dir] + at->x;
811 tmp->y = op->y + freearr_y[dir] + at->clone.y; 636 tmp->y = op->y + freearr_y[dir] + at->y;
812 tmp->map = op->map; 637 tmp->map = op->map;
813 if (head) 638 if (head)
814 { 639 {
815 tmp->head = head; 640 tmp->head = head;
816 prev->more = tmp; 641 prev->more = tmp;
817 } 642 }
643
818 if (!head) 644 if (!head)
819 head = tmp; 645 head = tmp;
646
820 prev = tmp; 647 prev = tmp;
648
821 at = at->more; 649 at = (archetype *)at->more;
822 } 650 }
823 651
824 if (head->randomitems) 652 if (head->randomitems)
825 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 653 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
826 654
827 insert_ob_in_map (head, op->map, op, 0); 655 insert_ob_in_map (head, op->map, op, 0);
828 656
829 /* thought it'd be cool to insert a burnout, too. */ 657 /* thought it'd be cool to insert a burnout, too. */
830 tmp = get_archetype ("burnout"); 658 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 } 659 }
836} 660}
837 661
838/* peterm: function which summons hostile monsters and 662/* peterm: function which summons hostile monsters and
839 * places them in nearby squares. 663 * places them in nearby squares.
866{ 690{
867 int attacktype; 691 int attacktype;
868 int face; 692 int face;
869} ATTACKS[22] = 693} ATTACKS[22] =
870{ 694{
871 {
872 AT_PHYSICAL, 0}, 695 { AT_PHYSICAL, 0},
873 {
874 AT_PHYSICAL, 0}, /*face = explosion */ 696 { AT_PHYSICAL, 0}, /*face = explosion */
875 {
876 AT_PHYSICAL, 0}, 697 { AT_PHYSICAL, 0},
877 {
878 AT_MAGIC, 1}, 698 { AT_MAGIC, 1},
879 {
880 AT_MAGIC, 1}, /* face = last-burnout */ 699 { AT_MAGIC, 1}, /* face = last-burnout */
881 {
882 AT_MAGIC, 1}, 700 { AT_MAGIC, 1},
883 {
884 AT_FIRE, 2}, 701 { AT_FIRE, 2},
885 {
886 AT_FIRE, 2}, /* face = fire.... */ 702 { AT_FIRE, 2}, /* face = fire.... */
887 {
888 AT_FIRE, 2}, 703 { AT_FIRE, 2},
889 {
890 AT_ELECTRICITY, 3}, 704 { AT_ELECTRICITY, 3},
891 {
892 AT_ELECTRICITY, 3}, /* ball_lightning */ 705 { AT_ELECTRICITY, 3}, /* ball_lightning */
893 {
894 AT_ELECTRICITY, 3}, 706 { AT_ELECTRICITY, 3},
895 {
896 AT_COLD, 4}, 707 { AT_COLD, 4},
897 {
898 AT_COLD, 4}, /* face=icestorm */ 708 { AT_COLD, 4}, /* face=icestorm */
899 {
900 AT_COLD, 4}, 709 { AT_COLD, 4},
901 {
902 AT_CONFUSION, 5}, 710 { AT_CONFUSION, 5},
903 {
904 AT_POISON, 7}, 711 { AT_POISON, 7},
905 {
906 AT_POISON, 7}, /* face = acid sphere. generator */ 712 { AT_POISON, 7}, /* face = acid sphere. generator */
907 {
908 AT_POISON, 7}, /* poisoncloud face */ 713 { AT_POISON, 7}, /* poisoncloud face */
909 {
910 AT_SLOW, 8}, 714 { AT_SLOW, 8},
911 {
912 AT_PARALYZE, 9}, 715 { AT_PARALYZE, 9},
913 {
914AT_FEAR, 10}}; 716 { AT_FEAR, 10},
915 717};
916
917 718
918/* shuffle_attack: peterm 719/* shuffle_attack: peterm
919 * This routine shuffles the attack of op to one of the 720 * This routine shuffles the attack of op to one of the
920 * ones in the list. It does this at random. It also 721 * ones in the list. It does this at random. It also
921 * chooses a face appropriate to the attack that is 722 * chooses a face appropriate to the attack that is
966 if (failure <= -20 && failure > -40) /* wonder */ 767 if (failure <= -20 && failure > -40) /* wonder */
967 { 768 {
968 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 769 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname);
969 tmp = get_archetype (SPELL_WONDER); 770 tmp = get_archetype (SPELL_WONDER);
970 cast_cone (op, op, 0, tmp); 771 cast_cone (op, op, 0, tmp);
971 free_object (tmp); 772 tmp->destroy ();
972 } 773 }
973 774
974 else if (failure <= -40 && failure > -60) /* confusion */ 775 else if (failure <= -40 && failure > -60) /* confusion */
975 { 776 {
976 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 777 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!");
1010 if (failure <= -20 && failure > -40) /* wonder */ 811 if (failure <= -20 && failure > -40) /* wonder */
1011 { 812 {
1012 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 813 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect.");
1013 tmp = get_archetype (SPELL_WONDER); 814 tmp = get_archetype (SPELL_WONDER);
1014 cast_cone (op, op, 0, tmp); 815 cast_cone (op, op, 0, tmp);
1015 free_object (tmp); 816 tmp->destroy ();
1016 } 817 }
1017 818
1018 else if (failure <= -40 && failure > -60) /* confusion */ 819 else if (failure <= -40 && failure > -60) /* confusion */
1019 { 820 {
1020 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 821 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!");
1039 else 840 else
1040 { 841 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 842 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");
1042 tmp = get_archetype (LOOSE_MANA); 843 tmp = get_archetype (LOOSE_MANA);
1043 tmp->level = skill->level; 844 tmp->level = skill->level;
1044 tmp->x = op->x;
1045 tmp->y = op->y;
1046 845
1047 /* increase the area of destruction a little for more powerful spells */ 846 /* increase the area of destruction a little for more powerful spells */
1048 tmp->range += isqrt (power); 847 tmp->range += isqrt (power);
1049 848
1050 if (power > 25) 849 if (power > 25)
1051 tmp->stats.dam = 25 + isqrt (power); 850 tmp->stats.dam = 25 + isqrt (power);
1052 else 851 else
1053 tmp->stats.dam = power; /* nasty recoils! */ 852 tmp->stats.dam = power; /* nasty recoils! */
1054 853
1055 tmp->stats.maxhp = tmp->count; 854 tmp->stats.maxhp = tmp->count;
1056 insert_ob_in_map (tmp, op->map, NULL, 0); 855
856 tmp->insert_at (op);
1057 } 857 }
1058 } 858 }
1059} 859}
1060 860
1061int 861int
1062cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 862cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1063{ 863{
1064 int success; 864 int success;
1065 player *pl;
1066 object *spell; 865 object *spell;
1067 866
1068 if (!spell_ob->other_arch) 867 if (!spell_ob->other_arch)
1069 { 868 {
1070 LOG (llevError, "cast_party_spell: empty other arch\n"); 869 LOG (llevError, "cast_party_spell: empty other arch\n");
1071 return 0; 870 return 0;
1072 } 871 }
872
1073 spell = arch_to_object (spell_ob->other_arch); 873 spell = arch_to_object (spell_ob->other_arch);
1074 874
1075 /* Always cast spell on caster */ 875 /* Always cast spell on caster */
1076 success = cast_spell (op, caster, dir, spell, stringarg); 876 success = cast_spell (op, caster, dir, spell, stringarg);
1077 877
1078 if (caster->contr->party == NULL) 878 if (caster->contr->party == NULL)
1079 { 879 {
1080 remove_ob (spell); 880 spell->remove ();
1081 return success; 881 return success;
1082 } 882 }
1083 for (pl = first_player; pl != NULL; pl = pl->next) 883
884 for_all_players (pl)
1084 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)))
1085 {
1086 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 886 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1087 } 887
1088 remove_ob (spell); 888 spell->remove ();
1089 return success; 889 return success;
1090} 890}
1091 891
1092/* This is where the main dispatch when someone casts a spell. 892/* This is where the main dispatch when someone casts a spell.
1093 * 893 *
1114 * 914 *
1115 * if it is a player casting the spell (op->type == PLAYER, op == caster), 915 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1116 * this function will decrease the mana/grace appropriately. For other 916 * this function will decrease the mana/grace appropriately. For other
1117 * objects, the caller should do what it considers appropriate. 917 * objects, the caller should do what it considers appropriate.
1118 */ 918 */
1119
1120int 919int
1121cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 920cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1122{ 921{
1123 const char *godname; 922 const char *godname;
1124 int success = 0, mflags, cast_level = 0, old_shoottype; 923 int success = 0, cast_level = 0;
1125 object *skill = NULL; 924 object *skill = NULL;
1126
1127 old_shoottype = op->contr ? op->contr->shoottype : 0;
1128 925
1129 if (!spell_ob) 926 if (!spell_ob)
1130 { 927 {
1131 LOG (llevError, "cast_spell: null spell object passed\n"); 928 LOG (llevError, "cast_spell: null spell object passed\n");
1132 return 0; 929 return 0;
1143 } 940 }
1144 941
1145 /* if caster is a spell casting object, this normally shouldn't be 942 /* if caster is a spell casting object, this normally shouldn't be
1146 * an issue, because they don't have any spellpaths set up. 943 * an issue, because they don't have any spellpaths set up.
1147 */ 944 */
1148 if (caster->path_denied & spell_ob->path_attuned) 945 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST))
1149 { 946 {
1150 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 947 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
1151 return 0; 948 return 0;
1152 } 949 }
1153 950
1160 * 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
1161 * at least process that code. 958 * at least process that code.
1162 */ 959 */
1163 if (op->type == PLAYER && op == caster) 960 if (op->type == PLAYER && op == caster)
1164 { 961 {
1165 cast_level = caster_level (caster, spell_ob);
1166 if (spell_ob->skill) 962 if (spell_ob->skill)
1167 { 963 {
1168 skill = find_skill_by_name (op, spell_ob->skill); 964 skill = find_skill_by_name (op, spell_ob->skill);
965
1169 if (!skill) 966 if (!skill)
1170 { 967 {
1171 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));
1172 return 0; 972 return 0;
1173 } 973 }
1174 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 974
975 const char *msg = "";
976
977 int caster_level = skill->level;
978
979 if (op->path_attuned & spell_ob->path_attuned)
1175 { 980 {
1176 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 981 caster_level += min (cast_level, 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 ())
1177 return 0; 997 return 0;
1178 } 998 }
1179 } 999 }
1000
1180 /* 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
1181 * to have sufficient grace/mana. 1002 * to have sufficient grace/mana.
1182 */ 1003 */
1183 if (!QUERY_FLAG (op, FLAG_WIZ)) 1004 if (!QUERY_FLAG (op, FLAG_WIZ))
1184 { 1005 {
1185 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1006 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1186 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)
1187 { 1008 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1009 op->failmsg ("You don't have enough mana!");
1189 return 0; 1010 return 0;
1190 } 1011 }
1012
1191 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1013 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1192 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)
1193 { 1015 {
1194 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 -
1195 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)
1196 {
1197 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));
1198 }
1199 else 1019 else
1200 { 1020 {
1201 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);
1202 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1022 op->failmsg (format ("%s ignores your prayer.", godname));
1203 return 0; 1023 return 0;
1204 } 1024 }
1205 } 1025 }
1206 1026
1207 /* player/monster is trying to cast the spell. might fumble it */ 1027 /* player/monster is trying to cast the spell. might fumble it */
1208 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) <
1209 (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]))
1210 { 1030 {
1211 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1031 op->contr->play_sound (sound_find ("fumble_spell"));
1212 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1032 op->failmsg ("You fumble the prayer.");
1213 if (settings.casting_time == TRUE) 1033
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); 1034 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1218 return 0; 1035 return 0;
1219 } 1036 }
1220 else if (spell_ob->stats.sp) 1037 else if (spell_ob->stats.sp)
1221 { 1038 {
1222 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;
1223 1040
1224 if (failure < 0) 1041 if (failure < 0)
1225 { 1042 {
1226 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.");
1227 if (settings.spell_failure_effects == TRUE) 1044 if (settings.spell_failure_effects == TRUE)
1228 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);
1229 op->contr->shoottype = (rangetype) old_shoottype; 1046
1230 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);
1231 return 0; 1048 return 0;
1232 } 1049 }
1233 } 1050 }
1234 } 1051 }
1235 } 1052 }
1236 1053
1237 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1054 int mflags = op->ms ().flags ();
1238 1055
1239 /* 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
1240 * not alive, then this would mean that the mapmaker put the 1057 * not alive, then this would mean that the mapmaker put the
1241 * objects on the space - presume that they know what they are 1058 * objects on the space - presume that they know what they are
1242 * doing. 1059 * doing.
1243 */ 1060 */
1244 1061
1245 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 :-)!
1246 { 1063 {
1247 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!");
1248 return 0; 1065 return 0;
1249 } 1066 }
1250 1067
1251 if ((spell_ob->type == SPELL) 1068 if ((spell_ob->type == SPELL)
1252 && (caster->type != POTION) 1069 && (caster->type != POTION)
1257 { 1074 {
1258 if (op->type != PLAYER) 1075 if (op->type != PLAYER)
1259 return 0; 1076 return 0;
1260 1077
1261 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1078 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); 1079 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1263 else 1080 else if (object *item = op->contr->ranged_ob)
1264 switch (op->contr->shoottype)
1265 { 1081 {
1266 case range_magic: 1082 if (item->type == SPELL)
1267 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1083 op->failmsg ("Something blocks your spellcasting.");
1268 break; 1084 else if (item->type == SCROLL)
1269 case range_misc: 1085 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 1086 else
1296 op->spellarg = NULL; 1087 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 } 1088 }
1305 else 1089 else
1306 { /* casting_time == 0 */ 1090 op->failmsg ("Something blocks the spell!");
1307 op->casting_time = -1; 1091
1308 spell_ob = op->spell; 1092 return 0;
1309 stringarg = op->spellarg;
1310 }
1311 }
1312 else
1313 { 1093 }
1094
1314 /* Take into account how long it takes to cast the spell. 1095 /* Take into account how long it takes to cast the spell.
1315 * if the player is casting it, then we use the time in 1096 * if the player is casting it, then we use the time in
1316 * the spell object. If it is a spell object, have it 1097 * the spell object. If it is a spell object, have it
1317 * take two ticks. Things that cast spells on the players 1098 * take two ticks. Things that cast spells on the players
1318 * behalf (eg, altars, and whatever else) shouldn't cost 1099 * behalf (eg, altars, and whatever else) shouldn't cost
1319 * the player any time. 1100 * the player any time.
1320 * Ignore casting time for firewalls 1101 * Ignore casting time for firewalls
1102 */
1103 if (caster == op && caster->type != FIREWALL)
1104 {
1105 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1106 /* Other portions of the code may also decrement the speed of the player, so
1107 * put a lower limit so that the player isn't stuck here too long
1321 */ 1108 */
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)) 1109 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); 1110 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1330 } 1111 }
1331 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1112 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); 1113 op->speed_left -= 2 * FABS (op->speed);
1334 }
1335 }
1336 1114
1337 if (op->type == PLAYER && op == caster) 1115 if (op->type == PLAYER && op == caster)
1338 { 1116 {
1339 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1117 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); 1118 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
1347 if (op != caster && !skill && caster->skill) 1125 if (op != caster && !skill && caster->skill)
1348 { 1126 {
1349 skill = find_skill_by_name (op, caster->skill); 1127 skill = find_skill_by_name (op, caster->skill);
1350 if (!skill) 1128 if (!skill)
1351 { 1129 {
1352 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)));
1353 return 0; 1131 return 0;
1354 } 1132 }
1133
1355 change_skill (op, skill, 0); /* needed for proper exp credit */ 1134 op->change_skill (skill); /* needed for proper exp credit */
1356 } 1135 }
1136
1137 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1138 return RESULT_INT (0);
1357 1139
1358 switch (spell_ob->subtype) 1140 switch (spell_ob->subtype)
1359 { 1141 {
1360 /* The order of case statements is same as the order they show up 1142 /* The order of case statements is same as the order they show up
1361 * in in spells.h. 1143 * in in spells.h.
1362 */ 1144 */
1363 case SP_RAISE_DEAD: 1145 case SP_RAISE_DEAD:
1364 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1146 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1365 break; 1147 break;
1366 1148
1367 case SP_RUNE: 1149 case SP_RUNE:
1395 case SP_SMITE: 1177 case SP_SMITE:
1396 success = cast_smite_spell (op, caster, dir, spell_ob); 1178 success = cast_smite_spell (op, caster, dir, spell_ob);
1397 break; 1179 break;
1398 1180
1399 case SP_MAGIC_MISSILE: 1181 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); 1182 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1401 break; 1183 break;
1402 1184
1403 case SP_SUMMON_GOLEM: 1185 case SP_SUMMON_GOLEM:
1404 success = summon_golem (op, caster, dir, spell_ob); 1186 success = summon_golem (op, caster, dir, spell_ob);
1405 old_shoottype = range_golem;
1406 break; 1187 break;
1407 1188
1408 case SP_DIMENSION_DOOR: 1189 case SP_DIMENSION_DOOR:
1409 /* dimension door needs the actual caster, because that is what is 1190 /* dimension door needs the actual caster, because that is what is
1410 * moved. 1191 * moved.
1483#ifdef NO_POLYMORPH 1264#ifdef NO_POLYMORPH
1484 /* 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
1485 * 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
1486 * it was disabled), they get some feedback. 1267 * it was disabled), they get some feedback.
1487 */ 1268 */
1488 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1269 op->failmsg ("The spell fizzles!");
1489 success = 0; 1270 success = 0;
1490#else 1271#else
1491 success = cast_polymorph (op, caster, spell_ob, dir); 1272 success = cast_polymorph (op, caster, spell_ob, dir);
1492#endif 1273#endif
1493 break; 1274 break;
1513 break; 1294 break;
1514 1295
1515 case SP_MOVING_BALL: 1296 case SP_MOVING_BALL:
1516 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)
1517 { 1298 {
1518 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));
1519 success = 0; 1300 success = 0;
1520 } 1301 }
1521 else 1302 else
1522 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);
1523 break; 1304 break;
1524 1305
1525 case SP_SWARM: 1306 case SP_SWARM:
1526 success = fire_swarm (op, caster, spell_ob, dir); 1307 success = fire_swarm (op, caster, spell_ob, dir);
1527 break; 1308 break;
1543 success = cast_consecrate (op, caster, spell_ob); 1324 success = cast_consecrate (op, caster, spell_ob);
1544 break; 1325 break;
1545 1326
1546 case SP_ANIMATE_WEAPON: 1327 case SP_ANIMATE_WEAPON:
1547 success = animate_weapon (op, caster, spell_ob, dir); 1328 success = animate_weapon (op, caster, spell_ob, dir);
1548 old_shoottype = range_golem;
1549 break; 1329 break;
1550 1330
1551 case SP_LIGHT: 1331 case SP_LIGHT:
1552 success = cast_light (op, caster, spell_ob, dir); 1332 success = cast_light (op, caster, spell_ob, dir);
1553 break; 1333 break;
1566 1346
1567 case SP_AURA: 1347 case SP_AURA:
1568 success = create_aura (op, caster, spell_ob); 1348 success = create_aura (op, caster, spell_ob);
1569 break; 1349 break;
1570 1350
1571 case SP_TOWN_PORTAL:
1572 success = cast_create_town_portal (op, caster, spell_ob, dir);
1573 break;
1574
1575 case SP_PARTY_SPELL: 1351 case SP_PARTY_SPELL:
1576 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1352 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1577 break; 1353 break;
1578 1354
1579 default: 1355 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); 1356 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 { 1357 }
1592 free (stringarg); 1358
1593 stringarg = NULL; 1359 op->play_sound (
1594 } 1360 success
1595 /* perhaps a bit of a hack, but if using a wand, it has to change the skill 1361 ? spell_ob->sound
1596 * to something like use_magic_item, but you really want to be able to fire 1362 ? spell_ob->sound
1597 * it again. 1363 : sound_find ("spell_success")
1598 */ 1364 : sound_find ("fumble_spell")
1599 if (op->contr) 1365 );
1600 op->contr->shoottype = (rangetype) old_shoottype;
1601 1366
1602 return success; 1367 return success;
1603} 1368}
1604 1369
1605
1606/* This is called from time.c/process_object(). That function 1370/* This is called from time.c/process_object(). That function
1607 * calls this for any SPELL_EFFECT type objects. This function 1371 * calls this for any SPELL_EFFECT type objects. This function
1608 * then dispatches them to the appropriate specific routines. 1372 * then dispatches them to the appropriate specific routines.
1609 */ 1373 */
1610void 1374void
1611move_spell_effect (object *op) 1375move_spell_effect (object *op)
1612{ 1376{
1670 check_bullet (op); 1434 check_bullet (op);
1671 return; 1435 return;
1672 } 1436 }
1673} 1437}
1674 1438
1675/* This is called by move_apply. Basically, if someone 1439/* This is called by move_apply. Basically, if someone
1676 * 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
1677 * are set, this is called. This should only be called for 1441 * are set, this is called. This should only be called for
1678 * objects of the appropraite type. 1442 * objects of the appropriate type.
1679 */ 1443 */
1680void 1444void
1681apply_spell_effect (object *spell, object *victim) 1445apply_spell_effect (object *spell, object *victim)
1682{ 1446{
1683 switch (spell->subtype) 1447 switch (spell->subtype)
1689 1453
1690 case SP_MAGIC_MISSILE: 1454 case SP_MAGIC_MISSILE:
1691 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1455 if (QUERY_FLAG (victim, FLAG_ALIVE))
1692 { 1456 {
1693 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1457 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1694
1695 if (!spell->destroyed ()) 1458 spell->destroy ();
1696 {
1697 remove_ob (spell);
1698 free_object (spell);
1699 }
1700 } 1459 }
1701 break; 1460 break;
1702 1461
1703 case SP_MOVING_BALL: 1462 case SP_MOVING_BALL:
1704 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1463 if (QUERY_FLAG (victim, FLAG_ALIVE))
1705 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1464 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1706 else if (victim->material || victim->materialname) 1465 else if (victim->materialname)
1707 save_throw_object (victim, spell->attacktype, spell); 1466 save_throw_object (victim, spell->attacktype, spell);
1467
1708 break; 1468 break;
1709 } 1469 }
1710} 1470}
1471

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines