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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.11 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.57 by root, Sat May 17 14:11:13 2008 UTC

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

Diff Legend

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