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.10 by root, Sun Sep 10 23:24:12 2006 UTC vs.
Revision 1.26 by pippijn, Sat Jan 6 14:42:31 2007 UTC

1
2/*
3 * static char *rcsid_spell_attack_c =
4 * "$Id: spell_attack.C,v 1.10 2006/09/10 23:24:12 root Exp $";
5 */
6
7
8/* 1/*
9 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
10 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
11 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
13 7
14 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
15 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
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, write to the Free Software
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27 21
28 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 The authors can be reached via e-mail at <crossfire@schmorp.de>
29*/ 23*/
30 24
31/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
32 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
33 * of code 27 * of code
34 */ 28 */
35 29
36#include <global.h> 30#include <global.h>
37#include <object.h> 31#include <object.h>
38#include <living.h> 32#include <living.h>
39#ifndef __CEXTRACT__
40# include <sproto.h> 33#include <sproto.h>
41#endif
42#include <spells.h> 34#include <spells.h>
43#include <sounds.h> 35#include <sounds.h>
44 36
45/* this function checks to see if a spell pushes objects as well 37/* 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) 38 * as flies over and damages them (only used for cones for now)
… …
64 { 56 {
65 weight_move = op->weight + (op->weight * op->level) / 3; 57 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); */ 58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
67 } 59 }
68 60
69 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 61 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
70 { 62 {
71 int num_sections = 1; 63 int num_sections = 1;
72 64
73 /* don't move DM */ 65 /* don't move DM */
74 if (QUERY_FLAG (tmp, FLAG_WIZ)) 66 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
124void 116void
125forklightning (object *op, object *tmp) 117forklightning (object *op, object *tmp)
126{ 118{
127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 119 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 */ 120 int t_dir; /* stores temporary dir calculation */
129 mapstruct *m; 121 maptile *m;
130 sint16 sx, sy; 122 sint16 sx, sy;
131 object *new_bolt; 123 object *new_bolt;
132 124
133 /* pick a fork direction. tmp->stats.Con is the left bias 125 /* pick a fork direction. tmp->stats.Con is the left bias
134 * i.e., the chance in 100 of forking LEFT 126 * i.e., the chance in 100 of forking LEFT
… …
147 139
148 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 140 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
149 return; 141 return;
150 142
151 /* OK, we made a fork */ 143 /* OK, we made a fork */
152 new_bolt = get_object (); 144 new_bolt = tmp->clone ();
153 copy_object (tmp, new_bolt);
154 145
155 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
156 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
157 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
159 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1;
160 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
161 new_bolt->duration++; 152 new_bolt->duration++;
162 new_bolt->x = sx;
163 new_bolt->y = sy;
164 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
165 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
166 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
167 tmp->stats.dam++; 156 tmp->stats.dam++;
168 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 157 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
169 update_turn_face (new_bolt); 158 update_turn_face (new_bolt);
170} 159}
171 160
172/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 161/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
173 * and checks for various things that may stop it. 162 * and checks for various things that may stop it.
174 */ 163 */
… …
177move_bolt (object *op) 166move_bolt (object *op)
178{ 167{
179 object *tmp; 168 object *tmp;
180 int mflags; 169 int mflags;
181 sint16 x, y; 170 sint16 x, y;
182 mapstruct *m; 171 maptile *m;
183 172
184 if (--(op->duration) < 0) 173 if (--op->duration < 0)
185 { 174 {
186 remove_ob (op); 175 op->destroy ();
187 free_object (op);
188 return; 176 return;
189 } 177 }
178
190 hit_map (op, 0, op->attacktype, 1); 179 hit_map (op, 0, op->attacktype, 1);
191 180
192 if (!op->direction) 181 if (!op->direction)
193 return; 182 return;
194 183
195 if (--op->range < 0) 184 if (--op->range < 0)
196 {
197 op->range = 0; 185 op->range = 0;
198 }
199 else 186 else
200 { 187 {
201 x = op->x + DIRX (op); 188 x = op->x + DIRX (op);
202 y = op->y + DIRY (op); 189 y = op->y + DIRY (op);
203 m = op->map; 190 m = op->map;
… …
211 * on the space. So only call reflwall if we think the data it returns 198 * on the space. So only call reflwall if we think the data it returns
212 * will be useful. 199 * will be useful.
213 */ 200 */
214 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 201 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
215 { 202 {
216
217 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 203 if (!QUERY_FLAG (op, FLAG_REFLECTING))
218 return; 204 return;
219 205
220 /* Since walls don't run diagonal, if the bolt is in 206 /* Since walls don't run diagonal, if the bolt is in
221 * one of 4 main directions, it just reflects back in the 207 * one of 4 main directions, it just reflects back in the
… …
251 else if (left) 237 else if (left)
252 op->direction = absdir (op->direction + 2); 238 op->direction = absdir (op->direction + 2);
253 else if (right) 239 else if (right)
254 op->direction = absdir (op->direction - 2); 240 op->direction = absdir (op->direction - 2);
255 } 241 }
242
256 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 243 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
257 return; 244 return;
258 } 245 }
259 else 246 else
260 { /* Create a copy of this object and put it ahead */ 247 { /* Create a copy of this object and put it ahead */
261 tmp = get_object (); 248 object *tmp = op->clone ();
262 copy_object (op, tmp); 249
250 m->insert (tmp, x, y, op);
263 tmp->speed_left = -0.1; 251 tmp->speed_left = -0.1;
264 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
265 tmp = insert_ob_in_map (tmp, op->map, op, 0);
266 /* To make up for the decrease at the top of the function */ 252 /* To make up for the decrease at the top of the function */
267 tmp->duration++; 253 tmp->duration++;
268 254
269 /* New forking code. Possibly create forks of this object 255 /* New forking code. Possibly create forks of this object
270 * going off in other directions. 256 * going off in other directions.
271 */ 257 */
272
273 if (rndm (0, 99) < tmp->stats.Dex) 258 if (rndm (0, 99) < tmp->stats.Dex)
274 { /* stats.Dex % of forking */ 259 { /* stats.Dex % of forking */
275 forklightning (op, tmp); 260 forklightning (op, tmp);
276 } 261 }
262
277 /* In this way, the object left behind sticks on the space, but 263 /* In this way, the object left behind sticks on the space, but
278 * doesn't create any bolts that continue to move onward. 264 * doesn't create any bolts that continue to move onward.
279 */ 265 */
280 op->range = 0; 266 op->range = 0;
281 } /* copy object and move it along */ 267 } /* copy object and move it along */
… …
288 * we remove the magic flag - that can be derived from 274 * we remove the magic flag - that can be derived from
289 * spob->attacktype. 275 * spob->attacktype.
290 * This function sets up the appropriate owner and skill 276 * This function sets up the appropriate owner and skill
291 * pointers. 277 * pointers.
292 */ 278 */
293
294int 279int
295fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 280fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
296{ 281{
297 object *tmp = NULL; 282 object *tmp = NULL;
298 int mflags; 283 int mflags;
… …
316 301
317 tmp->direction = dir; 302 tmp->direction = dir;
318 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 303 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
319 SET_ANIMATION (tmp, dir); 304 SET_ANIMATION (tmp, dir);
320 305
321 set_owner (tmp, op); 306 tmp->set_owner (op);
322 set_spell_skill (op, caster, spob, tmp); 307 set_spell_skill (op, caster, spob, tmp);
323 308
324 tmp->x = op->x + DIRX (tmp); 309 tmp->x = op->x + DIRX (tmp);
325 tmp->y = op->y + DIRY (tmp); 310 tmp->y = op->y + DIRY (tmp);
326 tmp->map = op->map; 311 tmp->map = op->map;
327 312
313 maptile *newmap;
328 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 314 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
329 if (mflags & P_OUT_OF_MAP) 315 if (mflags & P_OUT_OF_MAP)
330 { 316 {
331 free_object (tmp); 317 tmp->destroy ();
332 return 0; 318 return 0;
333 } 319 }
320
321 tmp->map = newmap;
322
334 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 323 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
335 { 324 {
336 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 325 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
337 { 326 {
338 free_object (tmp); 327 tmp->destroy ();
339 return 0; 328 return 0;
340 } 329 }
330
341 tmp->x = op->x; 331 tmp->x = op->x;
342 tmp->y = op->y; 332 tmp->y = op->y;
343 tmp->direction = absdir (tmp->direction + 4); 333 tmp->direction = absdir (tmp->direction + 4);
344 tmp->map = op->map; 334 tmp->map = op->map;
345 } 335 }
346 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 336
337 if ((tmp = tmp->insert_at (tmp, op)))
347 move_bolt (tmp); 338 move_bolt (tmp);
339
348 return 1; 340 return 1;
349} 341}
350 342
351 343
352 344
… …
361 * At least that is what I think this does. 353 * At least that is what I think this does.
362 */ 354 */
363void 355void
364explosion (object *op) 356explosion (object *op)
365{ 357{
366 object *tmp;
367 mapstruct *m = op->map; 358 maptile *m = op->map;
368 int i; 359 int i;
369 360
370 if (--(op->duration) < 0) 361 if (--op->duration < 0)
371 { 362 {
372 remove_ob (op); 363 op->destroy ();
373 free_object (op);
374 return; 364 return;
375 } 365 }
366
376 hit_map (op, 0, op->attacktype, 0); 367 hit_map (op, 0, op->attacktype, 0);
377 368
378 if (op->range > 0) 369 if (op->range > 0)
379 { 370 {
380 for (i = 1; i < 9; i++) 371 for (i = 1; i < 9; i++)
381 { 372 {
382 sint16 dx, dy; 373 sint16 dx, dy;
383 374
384 dx = op->x + freearr_x[i]; 375 dx = op->x + freearr_x[i];
385 dy = op->y + freearr_y[i]; 376 dy = op->y + freearr_y[i];
377
386 /* ok_to_put_more already does things like checks for walls, 378 /* ok_to_put_more already does things like checks for walls,
387 * out of map, etc. 379 * out of map, etc.
388 */ 380 */
389 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 381 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
390 { 382 {
391 tmp = get_object (); 383 object *tmp = op->clone ();
392 copy_object (op, tmp); 384
393 tmp->state = 0; 385 tmp->state = 0;
394 tmp->speed_left = -0.21; 386 tmp->speed_left = -0.21;
395 tmp->range--; 387 tmp->range--;
396 tmp->value = 0; 388 tmp->value = 0;
397 tmp->x = dx; 389
398 tmp->y = dy; 390 m->insert (tmp, dx, dy, op);
399 insert_ob_in_map (tmp, m, op, 0);
400 } 391 }
401 } 392 }
402 } 393 }
403} 394}
404 395
… …
408 * explode. 399 * explode.
409 */ 400 */
410void 401void
411explode_bullet (object *op) 402explode_bullet (object *op)
412{ 403{
413 tag_t op_tag = op->count;
414 object *tmp, *owner; 404 object *tmp, *owner;
415 405
416 if (op->other_arch == NULL) 406 if (op->other_arch == NULL)
417 { 407 {
418 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 408 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
419 remove_ob (op); 409 op->destroy ();
420 free_object (op);
421 return; 410 return;
422 } 411 }
423 412
424 if (op->env) 413 if (op->env)
425 { 414 {
426 object *env;
427
428 env = object_get_env_recursive (op); 415 object *env = object_get_env_recursive (op);
429 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 416 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
430 { 417 {
431 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 418 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
432 remove_ob (op); 419 op->destroy ();
433 free_object (op);
434 return; 420 return;
435 } 421 }
436 remove_ob (op); 422
437 op->x = env->x; 423 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
438 op->y = env->y;
439 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
440 } 424 }
441 else if (out_of_map (op->map, op->x, op->y)) 425 else if (out_of_map (op->map, op->x, op->y))
442 { 426 {
443 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 427 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
444 remove_ob (op); 428 op->destroy ();
445 free_object (op);
446 return; 429 return;
447 } 430 }
448 431
449 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 432 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
450 // NOTE: If this breaks something important: remove this. I can't think of anything 433 // NOTE: If this breaks something important: remove this. I can't think of anything
451 // bad at the moment that might happen from this. 434 // bad at the moment that might happen from this.
452 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 435 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
453 { 436 {
454 remove_ob (op); 437 op->destroy ();
455 free_object (op);
456 return; 438 return;
457 } 439 }
458 440
459 if (op->attacktype) 441 if (op->attacktype)
460 { 442 {
461 hit_map (op, 0, op->attacktype, 1); 443 hit_map (op, 0, op->attacktype, 1);
462 if (was_destroyed (op, op_tag)) 444 if (op->destroyed ())
463 return; 445 return;
464 } 446 }
465 447
466 /* other_arch contains what this explodes into */ 448 /* other_arch contains what this explodes into */
467 tmp = arch_to_object (op->other_arch); 449 tmp = arch_to_object (op->other_arch);
468 450
469 copy_owner (tmp, op); 451 tmp->set_owner (op);
470 tmp->skill = op->skill; 452 tmp->skill = op->skill;
471 453
472 owner = get_owner (op); 454 owner = op->owner;
473 455
474 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 456 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
475 { 457 {
476 remove_ob (op); 458 op->destroy ();
477 free_object (op);
478 return; 459 return;
479 } 460 }
480
481 tmp->x = op->x;
482 tmp->y = op->y;
483 461
484 /* special for bombs - it actually has sane values for these */ 462 /* special for bombs - it actually has sane values for these */
485 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 463 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
486 { 464 {
487 tmp->attacktype = op->attacktype; 465 tmp->attacktype = op->attacktype;
… …
491 } 469 }
492 else 470 else
493 { 471 {
494 if (op->attacktype & AT_MAGIC) 472 if (op->attacktype & AT_MAGIC)
495 tmp->attacktype |= AT_MAGIC; 473 tmp->attacktype |= AT_MAGIC;
474
496 /* Spell doc describes what is going on here */ 475 /* Spell doc describes what is going on here */
497 tmp->stats.dam = op->dam_modifier; 476 tmp->stats.dam = op->dam_modifier;
498 tmp->range = op->stats.maxhp; 477 tmp->range = op->stats.maxhp;
499 tmp->duration = op->stats.hp; 478 tmp->duration = op->stats.hp;
500 /* Used for spell tracking - just need a unique val for this spell - 479 /* Used for spell tracking - just need a unique val for this spell -
… …
508 tmp->stats.sp = op->direction; 487 tmp->stats.sp = op->direction;
509 488
510 /* Prevent recursion */ 489 /* Prevent recursion */
511 op->move_on = 0; 490 op->move_on = 0;
512 491
513 insert_ob_in_map (tmp, op->map, op, 0); 492 tmp->insert_at (op, op);
514 /* remove the firebullet */ 493 /* remove the firebullet */
515 if (!was_destroyed (op, op_tag)) 494 op->destroy ();
516 {
517 remove_ob (op);
518 free_object (op);
519 }
520} 495}
521
522
523 496
524/* checks to see what op should do, given the space it is on 497/* checks to see what op should do, given the space it is on
525 * (eg, explode, damage player, etc) 498 * (eg, explode, damage player, etc)
526 */ 499 */
527
528void 500void
529check_bullet (object *op) 501check_bullet (object *op)
530{ 502{
531 tag_t op_tag = op->count, tmp_tag;
532 object *tmp; 503 object *tmp;
533 int dam, mflags; 504 int dam, mflags;
534 mapstruct *m; 505 maptile *m;
535 sint16 sx, sy; 506 sint16 sx, sy;
536 507
537 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 508 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
538 509
539 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 510 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
548 519
549 /* If nothing alive on this space, no reason to do anything further */ 520 /* If nothing alive on this space, no reason to do anything further */
550 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
551 return; 522 return;
552 523
553 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 524 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
554 { 525 {
555 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (QUERY_FLAG (tmp, FLAG_ALIVE))
556 { 527 {
557 tmp_tag = tmp->count;
558 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
559 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0) 529 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
560 { 530 {
561 if (!QUERY_FLAG (op, FLAG_REMOVED)) 531 if (!QUERY_FLAG (op, FLAG_REMOVED))
562 { 532 {
563 remove_ob (op); 533 op->destroy ();
564 free_object (op);
565 return; 534 return;
566 } 535 }
567 } 536 }
568 } 537 }
569 } 538 }
570} 539}
571
572 540
573/* Basically, we move 'op' one square, and if it hits something, 541/* Basically, we move 'op' one square, and if it hits something,
574 * call check_bullet. 542 * call check_bullet.
575 * This function is only applicable to bullets, but not to all 543 * This function is only applicable to bullets, but not to all
576 * fired arches (eg, bolts). 544 * fired arches (eg, bolts).
577 */ 545 */
578
579void 546void
580move_bullet (object *op) 547move_bullet (object *op)
581{ 548{
582 sint16 new_x, new_y; 549 sint16 new_x, new_y;
583 int mflags; 550 int mflags;
584 mapstruct *m; 551 maptile *m;
585 552
586#if 0 553#if 0
587 /* We need a better general purpose way to do this */ 554 /* We need a better general purpose way to do this */
588 555
589 /* peterm: added to make comet leave a trail of burnouts 556 /* peterm: added to make comet leave a trail of burnouts
590 it's an unadulterated hack, but the effect is cool. */ 557 it's an unadulterated hack, but the effect is cool. */
591 if (op->stats.sp == SP_METEOR) 558 if (op->stats.sp == SP_METEOR)
592 { 559 {
593 replace_insert_ob_in_map ("fire_trail", op); 560 replace_insert_ob_in_map ("fire_trail", op);
594 if (was_destroyed (op, op_tag)) 561 if (op->destroyed ())
595 return; 562 return;
596 } /* end addition. */ 563 } /* end addition. */
597#endif 564#endif
598 565
599 /* Reached the end of its life - remove it */ 566 /* Reached the end of its life - remove it */
600 if (--op->range <= 0) 567 if (--op->range <= 0)
601 { 568 {
602 if (op->other_arch) 569 if (op->other_arch)
603 {
604 explode_bullet (op); 570 explode_bullet (op);
605 }
606 else 571 else
607 { 572 op->destroy ();
608 remove_ob (op); 573
609 free_object (op);
610 }
611 return; 574 return;
612 } 575 }
613 576
614 new_x = op->x + DIRX (op); 577 new_x = op->x + DIRX (op);
615 new_y = op->y + DIRY (op); 578 new_y = op->y + DIRY (op);
616 m = op->map; 579 m = op->map;
617 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 580 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
618 581
619 if (mflags & P_OUT_OF_MAP) 582 if (mflags & P_OUT_OF_MAP)
620 { 583 {
621 remove_ob (op); 584 op->destroy ();
622 free_object (op);
623 return; 585 return;
624 } 586 }
625 587
626 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
627 { 589 {
628 if (op->other_arch) 590 if (op->other_arch)
629 {
630 explode_bullet (op); 591 explode_bullet (op);
631 }
632 else 592 else
633 { 593 op->destroy ();
634 remove_ob (op); 594
635 free_object (op);
636 }
637 return; 595 return;
638 } 596 }
639 597
640 remove_ob (op); 598 if (!(op = m->insert (op, new_x, new_y, op)))
641 op->x = new_x;
642 op->y = new_y;
643 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
644 return; 599 return;
645 600
646 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
647 { 602 {
648 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
649 update_turn_face (op); 604 update_turn_face (op);
650 } 605 }
651 else 606 else
652 {
653 check_bullet (op); 607 check_bullet (op);
654 }
655} 608}
656 609
657 610
658 611
659 612
… …
694 647
695 tmp->direction = dir; 648 tmp->direction = dir;
696 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 649 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
697 SET_ANIMATION (tmp, dir); 650 SET_ANIMATION (tmp, dir);
698 651
699 set_owner (tmp, op); 652 tmp->set_owner (op);
700 set_spell_skill (op, caster, spob, tmp); 653 set_spell_skill (op, caster, spob, tmp);
701 654
702 tmp->x = op->x + freearr_x[dir]; 655 tmp->x = op->x + freearr_x[dir];
703 tmp->y = op->y + freearr_y[dir]; 656 tmp->y = op->y + freearr_y[dir];
704 tmp->map = op->map; 657 tmp->map = op->map;
705 658
659 maptile *newmap;
706 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 660 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
707 if (mflags & P_OUT_OF_MAP) 661 if (mflags & P_OUT_OF_MAP)
708 { 662 {
709 free_object (tmp); 663 tmp->destroy ();
710 return 0; 664 return 0;
711 } 665 }
666
667 tmp->map = newmap;
668
712 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 669 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
713 { 670 {
714 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 671 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
715 { 672 {
716 free_object (tmp); 673 tmp->destroy ();
717 return 0; 674 return 0;
718 } 675 }
676
719 tmp->x = op->x; 677 tmp->x = op->x;
720 tmp->y = op->y; 678 tmp->y = op->y;
721 tmp->direction = absdir (tmp->direction + 4); 679 tmp->direction = absdir (tmp->direction + 4);
722 tmp->map = op->map; 680 tmp->map = op->map;
723 } 681 }
724 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 682
725 { 683 if ((tmp = tmp->insert_at (tmp, op)))
726 check_bullet (tmp); 684 check_bullet (tmp);
727 } 685
728 return 1; 686 return 1;
729} 687}
730 688
731 689
732 690
… …
742void 700void
743cone_drop (object *op) 701cone_drop (object *op)
744{ 702{
745 object *new_ob = arch_to_object (op->other_arch); 703 object *new_ob = arch_to_object (op->other_arch);
746 704
747 new_ob->x = op->x;
748 new_ob->y = op->y;
749 new_ob->level = op->level; 705 new_ob->level = op->level;
750 set_owner (new_ob, op->owner); 706 new_ob->set_owner (op->owner);
751 707
752 /* preserve skill ownership */ 708 /* preserve skill ownership */
753 if (op->skill && op->skill != new_ob->skill) 709 if (op->skill && op->skill != new_ob->skill)
754 {
755 new_ob->skill = op->skill; 710 new_ob->skill = op->skill;
756 }
757 insert_ob_in_map (new_ob, op->map, op, 0);
758 711
712 new_ob->insert_at (op, op);
759} 713}
760 714
761/* move_cone: causes cone object 'op' to move a space/hit creatures */ 715/* move_cone: causes cone object 'op' to move a space/hit creatures */
762 716
763void 717void
764move_cone (object *op) 718move_cone (object *op)
765{ 719{
766 int i; 720 int i;
767 tag_t tag;
768 721
769 /* if no map then hit_map will crash so just ignore object */ 722 /* if no map then hit_map will crash so just ignore object */
770 if (!op->map) 723 if (!op->map)
771 { 724 {
772 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 725 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
773 op->speed = 0; 726 op->set_speed (0);
774 update_ob_speed (op);
775 return; 727 return;
776 } 728 }
777 729
778 /* lava saves it's life, but not yours :) */ 730 /* lava saves it's life, but not yours :) */
779 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 731 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
785#if 0 737#if 0
786 /* Disable this - enabling it makes monsters easier, as 738 /* Disable this - enabling it makes monsters easier, as
787 * when their cone dies when they die. 739 * when their cone dies when they die.
788 */ 740 */
789 /* If no owner left, the spell dies out. */ 741 /* If no owner left, the spell dies out. */
790 if (get_owner (op) == NULL) 742 if (op->owner == NULL)
791 { 743 {
792 remove_ob (op); 744 op->destroy ();
793 free_object (op);
794 return; 745 return;
795 } 746 }
796#endif 747#endif
797 748
798 tag = op->count;
799 hit_map (op, 0, op->attacktype, 0); 749 hit_map (op, 0, op->attacktype, 0);
800 750
801 /* Check to see if we should push anything. 751 /* Check to see if we should push anything.
802 * Spell objects with weight push whatever they encounter to some 752 * Spell objects with weight push whatever they encounter to some
803 * degree. 753 * degree.
804 */ 754 */
805 if (op->weight) 755 if (op->weight)
806 check_spell_knockback (op); 756 check_spell_knockback (op);
807 757
808 if (was_destroyed (op, tag)) 758 if (op->destroyed ())
809 return; 759 return;
810 760
811 if ((op->duration--) < 0) 761 if ((op->duration--) < 0)
812 { 762 {
813 remove_ob (op); 763 op->destroy ();
814 free_object (op);
815 return; 764 return;
816 } 765 }
817 /* Object has hit maximum range, so don't have it move 766 /* Object has hit maximum range, so don't have it move
818 * any further. When the duration above expires, 767 * any further. When the duration above expires,
819 * then the object will get removed. 768 * then the object will get removed.
… …
828 { 777 {
829 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 778 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
830 779
831 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 780 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
832 { 781 {
833 object *tmp = get_object (); 782 object *tmp = op->clone ();
834
835 copy_object (op, tmp);
836 tmp->x = x;
837 tmp->y = y;
838 783
839 tmp->duration = op->duration + 1; 784 tmp->duration = op->duration + 1;
840 785
841 /* Use for spell tracking - see ok_to_put_more() */ 786 /* Use for spell tracking - see ok_to_put_more() */
842 tmp->stats.maxhp = op->stats.maxhp; 787 tmp->stats.maxhp = op->stats.maxhp;
843 insert_ob_in_map (tmp, op->map, op, 0); 788
789 op->map->insert (tmp, x, y, op);
790
844 if (tmp->other_arch) 791 if (tmp->other_arch)
845 cone_drop (tmp); 792 cone_drop (tmp);
846 } 793 }
847 } 794 }
848} 795}
… …
858int 805int
859cast_cone (object *op, object *caster, int dir, object *spell) 806cast_cone (object *op, object *caster, int dir, object *spell)
860{ 807{
861 object *tmp; 808 object *tmp;
862 int i, success = 0, range_min = -1, range_max = 1; 809 int i, success = 0, range_min = -1, range_max = 1;
863 mapstruct *m; 810 maptile *m;
864 sint16 sx, sy; 811 sint16 sx, sy;
865 MoveType movetype; 812 MoveType movetype;
866 813
867 if (!spell->other_arch) 814 if (!spell->other_arch)
868 return 0; 815 return 0;
… …
924 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 871 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
925 continue; 872 continue;
926 873
927 success = 1; 874 success = 1;
928 tmp = arch_to_object (spell->other_arch); 875 tmp = arch_to_object (spell->other_arch);
929 set_owner (tmp, op); 876 tmp->set_owner (op);
930 set_spell_skill (op, caster, spell, tmp); 877 set_spell_skill (op, caster, spell, tmp);
931 tmp->level = caster_level (caster, spell); 878 tmp->level = caster_level (caster, spell);
932 tmp->x = sx;
933 tmp->y = sy;
934 tmp->attacktype = spell->attacktype; 879 tmp->attacktype = spell->attacktype;
935 880
936 /* holy word stuff */ 881 /* holy word stuff */
937 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 882 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
938 if (!tailor_god_spell (tmp, op)) 883 if (!tailor_god_spell (tmp, op))
… …
975 920
976 if (!(tmp->move_type & MOVE_FLY_LOW)) 921 if (!(tmp->move_type & MOVE_FLY_LOW))
977 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 922 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
978 923
979 if (!tmp->move_on && tmp->stats.dam) 924 if (!tmp->move_on && tmp->stats.dam)
980 {
981 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 925 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
982 }
983 926
984 insert_ob_in_map (tmp, m, op, 0); 927 m->insert (tmp, sx, sy, op);
985 928
986 /* This is used for tracking spells so that one effect doesn't hit 929 /* This is used for tracking spells so that one effect doesn't hit
987 * a single space too many times. 930 * a single space too many times.
988 */ 931 */
989 tmp->stats.maxhp = tmp->count; 932 tmp->stats.maxhp = tmp->count;
… …
1008void 951void
1009animate_bomb (object *op) 952animate_bomb (object *op)
1010{ 953{
1011 int i; 954 int i;
1012 object *env, *tmp; 955 object *env, *tmp;
1013 archetype *at;
1014 956
1015 if (op->state != NUM_ANIMATIONS (op) - 1) 957 if (op->state != NUM_ANIMATIONS (op) - 1)
1016 return; 958 return;
1017 959
1018 env = object_get_env_recursive (op); 960 env = object_get_env_recursive (op);
… …
1023 return; 965 return;
1024 966
1025 if (env->type == PLAYER) 967 if (env->type == PLAYER)
1026 esrv_del_item (env->contr, op->count); 968 esrv_del_item (env->contr, op->count);
1027 969
1028 remove_ob (op); 970 if (!(op = op->insert_at (env, op)))
1029 op->x = env->x;
1030 op->y = env->y;
1031 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1032 return; 971 return;
1033 } 972 }
1034 973
1035 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 974 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1036 // on a safe map. I don't like this special casing, but it seems to be neccessary 975 // on a safe map. I don't like this special casing, but it seems to be neccessary
1037 // as bombs can be carried. 976 // as bombs can be carried.
1038 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 977 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1039 { 978 {
1040 remove_ob (op); 979 op->destroy ();
1041 free_object (op);
1042 return; 980 return;
1043 } 981 }
1044 982
1045 /* This copies a lot of the code from the fire bullet, 983 /* This copies a lot of the code from the fire bullet,
1046 * but using the cast_bullet isn't really feasible, 984 * but using the cast_bullet isn't really feasible,
1047 * so just set up the appropriate values. 985 * so just set up the appropriate values.
1048 */ 986 */
1049 at = find_archetype (SPLINT); 987 if (archetype *at = archetype::find (SPLINT))
1050 if (at)
1051 { 988 {
1052 for (i = 1; i < 9; i++) 989 for (i = 1; i < 9; i++)
1053 { 990 {
1054 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 991 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1055 continue; 992 continue;
993
1056 tmp = arch_to_object (at); 994 tmp = arch_to_object (at);
1057 tmp->direction = i; 995 tmp->direction = i;
1058 tmp->range = op->range; 996 tmp->range = op->range;
1059 tmp->stats.dam = op->stats.dam; 997 tmp->stats.dam = op->stats.dam;
1060 tmp->duration = op->duration; 998 tmp->duration = op->duration;
1061 tmp->attacktype = op->attacktype; 999 tmp->attacktype = op->attacktype;
1062 copy_owner (tmp, op); 1000 tmp->set_owner (op);
1063 if (op->skill && op->skill != tmp->skill) 1001 if (op->skill && op->skill != tmp->skill)
1064 {
1065 tmp->skill = op->skill; 1002 tmp->skill = op->skill;
1066 } 1003
1067 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1004 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1068 SET_ANIMATION (tmp, i); 1005 SET_ANIMATION (tmp, i);
1069 tmp->x = op->x + freearr_x[i]; 1006
1070 tmp->y = op->y + freearr_x[i]; 1007 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1071 insert_ob_in_map (tmp, op->map, op, 0);
1072 move_bullet (tmp); 1008 move_bullet (tmp);
1073 } 1009 }
1074 } 1010 }
1075 1011
1076 explode_bullet (op); 1012 explode_bullet (op);
… …
1081{ 1017{
1082 1018
1083 object *tmp; 1019 object *tmp;
1084 int mflags; 1020 int mflags;
1085 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1021 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1086 mapstruct *m; 1022 maptile *m;
1087 1023
1088 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1024 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1089 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1025 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1090 { 1026 {
1091 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1027 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1097 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1033 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1098 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1034 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1099 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1035 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1100 tmp->attacktype = spell->attacktype; 1036 tmp->attacktype = spell->attacktype;
1101 1037
1102 set_owner (tmp, op); 1038 tmp->set_owner (op);
1103 set_spell_skill (op, caster, spell, tmp); 1039 set_spell_skill (op, caster, spell, tmp);
1104 tmp->x = dx; 1040
1105 tmp->y = dy; 1041 m->insert (tmp, dx, dy, op);
1106 insert_ob_in_map (tmp, m, op, 0);
1107 return 1; 1042 return 1;
1108} 1043}
1109 1044
1110/**************************************************************************** 1045/****************************************************************************
1111 * 1046 *
… …
1127get_pointed_target (object *op, int dir, int range, int type) 1062get_pointed_target (object *op, int dir, int range, int type)
1128{ 1063{
1129 object *target; 1064 object *target;
1130 sint16 x, y; 1065 sint16 x, y;
1131 int dist, mflags; 1066 int dist, mflags;
1132 mapstruct *mp; 1067 maptile *mp;
1133 1068
1134 if (dir == 0) 1069 if (dir == 0)
1135 return NULL; 1070 return NULL;
1136 1071
1137 for (dist = 1; dist < range; dist++) 1072 for (dist = 1; dist < range; dist++)
… …
1150 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1085 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1151 return NULL; 1086 return NULL;
1152 1087
1153 if (mflags & P_IS_ALIVE) 1088 if (mflags & P_IS_ALIVE)
1154 { 1089 {
1155 for (target = get_map_ob (mp, x, y); target; target = target->above) 1090 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1156 { 1091 {
1157 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1092 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1158 { 1093 {
1159 return target; 1094 return target;
1160 } 1095 }
… …
1227 if (effect->attacktype & AT_DEATH) 1162 if (effect->attacktype & AT_DEATH)
1228 { 1163 {
1229 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1164 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1230 1165
1231 /* casting death spells at undead isn't a good thing */ 1166 /* casting death spells at undead isn't a good thing */
1232 if QUERY_FLAG
1233 (target, FLAG_UNDEAD) 1167 if (QUERY_FLAG (target, FLAG_UNDEAD))
1234 { 1168 {
1235 if (random_roll (0, 2, op, PREFER_LOW)) 1169 if (random_roll (0, 2, op, PREFER_LOW))
1236 { 1170 {
1237 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1171 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1238 effect->x = op->x; 1172 effect->x = op->x;
… …
1240 } 1174 }
1241 else 1175 else
1242 { 1176 {
1243 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1177 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1244 target->stats.hp = target->stats.maxhp * 2; 1178 target->stats.hp = target->stats.maxhp * 2;
1245 free_object (effect); 1179 effect->destroy ();
1246 return 0; 1180 return 0;
1247 } 1181 }
1248 } 1182 }
1249 } 1183 }
1250 else 1184 else
1251 { 1185 {
1252 /* how much woe to inflict :) */ 1186 /* how much woe to inflict :) */
1253 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1187 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1254 } 1188 }
1255 1189
1256 set_owner (effect, op); 1190 effect->set_owner (op);
1257 set_spell_skill (op, caster, spell, effect); 1191 set_spell_skill (op, caster, spell, effect);
1258 1192
1259 /* ok, tell it where to be, and insert! */ 1193 /* ok, tell it where to be, and insert! */
1260 effect->x = target->x; 1194 effect->insert_at (target, op);
1261 effect->y = target->y;
1262 insert_ob_in_map (effect, target->map, op, 0);
1263 1195
1264 return 1; 1196 return 1;
1265} 1197}
1266 1198
1267 1199
… …
1277move_missile (object *op) 1209move_missile (object *op)
1278{ 1210{
1279 int i, mflags; 1211 int i, mflags;
1280 object *owner; 1212 object *owner;
1281 sint16 new_x, new_y; 1213 sint16 new_x, new_y;
1282 mapstruct *m; 1214 maptile *m;
1283 1215
1284 if (op->range-- <= 0) 1216 if (op->range-- <= 0)
1285 { 1217 {
1286 remove_ob (op); 1218 op->destroy ();
1287 free_object (op);
1288 return; 1219 return;
1289 } 1220 }
1290 1221
1291 owner = get_owner (op); 1222 owner = op->owner;
1292#if 0 1223#if 0
1293 /* It'd make things nastier if this wasn't here - spells cast by 1224 /* It'd make things nastier if this wasn't here - spells cast by
1294 * monster that are then killed would continue to survive 1225 * monster that are then killed would continue to survive
1295 */ 1226 */
1296 if (owner == NULL) 1227 if (owner == NULL)
1297 { 1228 {
1298 remove_ob (op); 1229 op->destroy ();
1299 free_object (op);
1300 return; 1230 return;
1301 } 1231 }
1302#endif 1232#endif
1303 1233
1304 new_x = op->x + DIRX (op); 1234 new_x = op->x + DIRX (op);
… …
1306 1236
1307 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1237 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1308 1238
1309 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1239 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1310 { 1240 {
1311 tag_t tag = op->count;
1312
1313 hit_map (op, op->direction, AT_MAGIC, 1); 1241 hit_map (op, op->direction, AT_MAGIC, 1);
1314 /* Basically, missile only hits one thing then goes away. 1242 /* Basically, missile only hits one thing then goes away.
1315 * we need to remove it if someone hasn't already done so. 1243 * we need to remove it if someone hasn't already done so.
1316 */ 1244 */
1317 if (!was_destroyed (op, tag)) 1245 if (!op->destroyed ())
1318 { 1246 op->destroy ();
1319 remove_ob (op); 1247
1320 free_object (op);
1321 }
1322 return; 1248 return;
1323 } 1249 }
1324 1250
1325 remove_ob (op); 1251 op->remove ();
1252
1326 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1253 if (!op->direction || (mflags & P_OUT_OF_MAP))
1327 { 1254 {
1328 free_object (op); 1255 op->destroy ();
1329 return; 1256 return;
1330 } 1257 }
1331 op->x = new_x; 1258
1332 op->y = new_y; 1259 i = spell_find_dir (m, new_x, new_y, op->owner);
1333 op->map = m;
1334 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1335 if (i > 0 && i != op->direction) 1260 if (i > 0 && i != op->direction)
1336 { 1261 {
1337 op->direction = i; 1262 op->direction = i;
1338 SET_ANIMATION (op, op->direction); 1263 SET_ANIMATION (op, op->direction);
1339 } 1264 }
1340 insert_ob_in_map (op, op->map, op, 0); 1265
1266 m->insert (op, new_x, new_y, op);
1341} 1267}
1342 1268
1343/**************************************************************************** 1269/****************************************************************************
1344 * Destruction 1270 * Destruction
1345 ****************************************************************************/ 1271 ****************************************************************************/
… …
1390int 1316int
1391cast_destruction (object *op, object *caster, object *spell_ob) 1317cast_destruction (object *op, object *caster, object *spell_ob)
1392{ 1318{
1393 int i, j, range, mflags, friendly = 0, dam, dur; 1319 int i, j, range, mflags, friendly = 0, dam, dur;
1394 sint16 sx, sy; 1320 sint16 sx, sy;
1395 mapstruct *m; 1321 maptile *m;
1396 object *tmp; 1322 object *tmp;
1397 const char *skill; 1323 const char *skill;
1398 1324
1399 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1325 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1400 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1326 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1423 for (j = -range; j < range; j++) 1349 for (j = -range; j < range; j++)
1424 { 1350 {
1425 m = op->map; 1351 m = op->map;
1426 sx = op->x + i; 1352 sx = op->x + i;
1427 sy = op->y + j; 1353 sy = op->y + j;
1354
1428 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1355 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1429 if (mflags & P_OUT_OF_MAP) 1356 if (mflags & P_OUT_OF_MAP)
1430 continue; 1357 continue;
1358
1431 if (mflags & P_IS_ALIVE) 1359 if (mflags & P_IS_ALIVE)
1432 { 1360 {
1433 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1361 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1434 {
1435 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1362 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1436 break; 1363 break;
1437 } 1364
1438 if (tmp) 1365 if (tmp)
1439 { 1366 {
1440 if (tmp->head) 1367 if (tmp->head)
1441 tmp = tmp->head; 1368 tmp = tmp->head;
1442 1369
… …
1445 { 1372 {
1446 if (spell_ob->subtype == SP_DESTRUCTION) 1373 if (spell_ob->subtype == SP_DESTRUCTION)
1447 { 1374 {
1448 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1375 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1449 if (spell_ob->other_arch) 1376 if (spell_ob->other_arch)
1450 {
1451 tmp = arch_to_object (spell_ob->other_arch); 1377 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1452 tmp->x = sx;
1453 tmp->y = sy;
1454 insert_ob_in_map (tmp, m, op, 0);
1455 }
1456 } 1378 }
1457 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1379 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1458 { 1380 {
1459 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1381 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1460 {
1461 object *effect = arch_to_object (spell_ob->other_arch); 1382 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1462
1463 effect->x = sx;
1464 effect->y = sy;
1465 insert_ob_in_map (effect, m, op, 0);
1466 }
1467 } 1383 }
1468 } 1384 }
1469 } 1385 }
1470 } 1386 }
1471 } 1387 }
1472 } 1388 }
1389
1473 op->skill = skill; 1390 op->skill = skill;
1474 return 1; 1391 return 1;
1475} 1392}
1476 1393
1477/*************************************************************************** 1394/***************************************************************************
… …
1561 force->stats.ac = spell_ob->stats.ac; 1478 force->stats.ac = spell_ob->stats.ac;
1562 force->stats.wc = spell_ob->stats.wc; 1479 force->stats.wc = spell_ob->stats.wc;
1563 1480
1564 change_abil (tmp, force); /* Mostly to display any messages */ 1481 change_abil (tmp, force); /* Mostly to display any messages */
1565 insert_ob_in_ob (force, tmp); 1482 insert_ob_in_ob (force, tmp);
1566 fix_player (tmp); 1483 tmp->update_stats ();
1567 return 1; 1484 return 1;
1568 1485
1569} 1486}
1570 1487
1571 1488
… …
1582mood_change (object *op, object *caster, object *spell) 1499mood_change (object *op, object *caster, object *spell)
1583{ 1500{
1584 object *tmp, *god, *head; 1501 object *tmp, *god, *head;
1585 int done_one, range, mflags, level, at, best_at; 1502 int done_one, range, mflags, level, at, best_at;
1586 sint16 x, y, nx, ny; 1503 sint16 x, y, nx, ny;
1587 mapstruct *m; 1504 maptile *m;
1588 const char *race; 1505 const char *race;
1589 1506
1590 /* We precompute some values here so that we don't have to keep 1507 /* We precompute some values here so that we don't have to keep
1591 * doing it over and over again. 1508 * doing it over and over again.
1592 */ 1509 */
… …
1622 1539
1623 /* If there is nothing living on this space, no need to go further */ 1540 /* If there is nothing living on this space, no need to go further */
1624 if (!(mflags & P_IS_ALIVE)) 1541 if (!(mflags & P_IS_ALIVE))
1625 continue; 1542 continue;
1626 1543
1627 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1544 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1628 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1545 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1629 break; 1546 break;
1630 1547
1631 /* There can be living objects that are not monsters */ 1548 /* There can be living objects that are not monsters */
1632 if (!tmp || tmp->type == PLAYER) 1549 if (!tmp || tmp->type == PLAYER)
… …
1720 SET_FLAG (head, FLAG_FRIENDLY); 1637 SET_FLAG (head, FLAG_FRIENDLY);
1721 /* Prevent uncontolled outbreaks of self replicating monsters. 1638 /* Prevent uncontolled outbreaks of self replicating monsters.
1722 Typical use case is charm, go somwhere, use aggravation to make hostile. 1639 Typical use case is charm, go somwhere, use aggravation to make hostile.
1723 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1640 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1724 CLEAR_FLAG (head, FLAG_GENERATOR); 1641 CLEAR_FLAG (head, FLAG_GENERATOR);
1725 set_owner (head, op); 1642 head->set_owner (op);
1726 set_spell_skill (op, caster, spell, head); 1643 set_spell_skill (op, caster, spell, head);
1727 add_friendly_object (head); 1644 add_friendly_object (head);
1728 head->attack_movement = PETMOVE; 1645 head->attack_movement = PETMOVE;
1729 done_one = 1; 1646 done_one = 1;
1730 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1647 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1731 head->stats.exp = 0; 1648 head->stats.exp = 0;
1732 } 1649 }
1733 1650
1734 /* If a monster was effected, put an effect in */ 1651 /* If a monster was effected, put an effect in */
1735 if (done_one && spell->other_arch) 1652 if (done_one && spell->other_arch)
1736 {
1737 tmp = arch_to_object (spell->other_arch); 1653 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1738 tmp->x = nx;
1739 tmp->y = ny;
1740 insert_ob_in_map (tmp, m, op, 0);
1741 }
1742 } /* for y */ 1654 } /* for y */
1743 1655
1744 return 1; 1656 return 1;
1745} 1657}
1746 1658
… …
1756move_ball_spell (object *op) 1668move_ball_spell (object *op)
1757{ 1669{
1758 int i, j, dam_save, dir, mflags; 1670 int i, j, dam_save, dir, mflags;
1759 sint16 nx, ny, hx, hy; 1671 sint16 nx, ny, hx, hy;
1760 object *owner; 1672 object *owner;
1761 mapstruct *m; 1673 maptile *m;
1762 1674
1763 owner = get_owner (op); 1675 owner = op->owner;
1764 1676
1765 /* the following logic makes sure that the ball doesn't move into a wall, 1677 /* the following logic makes sure that the ball doesn't move into a wall,
1766 * and makes sure that it will move along a wall to try and get at it's 1678 * and makes sure that it will move along a wall to try and get at it's
1767 * victim. The block immediately below more or less chooses a random 1679 * victim. The block immediately below more or less chooses a random
1768 * offset to move the ball, eg, keep it mostly on course, with some 1680 * offset to move the ball, eg, keep it mostly on course, with some
… …
1797 nx = op->x; 1709 nx = op->x;
1798 ny = op->y; 1710 ny = op->y;
1799 m = op->map; 1711 m = op->map;
1800 } 1712 }
1801 1713
1802 remove_ob (op); 1714 m->insert (op, nx, ny, op);
1803 op->y = ny;
1804 op->x = nx;
1805 insert_ob_in_map (op, m, op, 0);
1806 1715
1807 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1716 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1808 surrounding squares */ 1717 surrounding squares */
1809 1718
1810 /* loop over current square and neighbors to hit. 1719 /* loop over current square and neighbors to hit.
… …
1836 1745
1837 } 1746 }
1838 1747
1839 /* insert the other arch */ 1748 /* insert the other arch */
1840 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1749 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1841 { 1750 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1842 new_ob = arch_to_object (op->other_arch);
1843 new_ob->x = hx;
1844 new_ob->y = hy;
1845 insert_ob_in_map (new_ob, m, op, 0);
1846 }
1847 } 1751 }
1848 1752
1849 /* restore to the center location and damage */ 1753 /* restore to the center location and damage */
1850 op->stats.dam = dam_save; 1754 op->stats.dam = dam_save;
1851 1755
1852 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1756 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1853 1757
1854 if (i >= 0) 1758 if (i >= 0)
1855 { /* we have a preferred direction! */ 1759 { /* we have a preferred direction! */
1856 /* pick another direction if the preferred dir is blocked. */ 1760 /* pick another direction if the preferred dir is blocked. */
1857 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1761 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1858 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1762 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1859 {
1860 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1763 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1861 } 1764
1862 op->direction = i; 1765 op->direction = i;
1863 } 1766 }
1864} 1767}
1865 1768
1866 1769
… …
1878#if 0 1781#if 0
1879 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1782 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1880 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1783 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1881 sint16 target_x, target_y, origin_x, origin_y; 1784 sint16 target_x, target_y, origin_x, origin_y;
1882 int adjustdir; 1785 int adjustdir;
1883 mapstruct *m; 1786 maptile *m;
1884#endif 1787#endif
1885 int basedir; 1788 int basedir;
1886 object *owner; 1789 object *owner;
1887 1790
1888 owner = get_owner (op); 1791 owner = op->owner;
1889 if (op->duration == 0 || owner == NULL) 1792 if (op->duration == 0 || owner == NULL)
1890 { 1793 {
1891 remove_ob (op); 1794 op->destroy ();
1892 free_object (op);
1893 return; 1795 return;
1894 } 1796 }
1797
1895 op->duration--; 1798 op->duration--;
1896 1799
1897 basedir = op->direction; 1800 basedir = op->direction;
1898 if (basedir == 0) 1801 if (basedir == 0)
1899 { 1802 {
… …
1996 1899
1997 if (!spell->other_arch) 1900 if (!spell->other_arch)
1998 return 0; 1901 return 0;
1999 1902
2000 tmp = get_archetype (SWARM_SPELL); 1903 tmp = get_archetype (SWARM_SPELL);
2001 tmp->x = op->x;
2002 tmp->y = op->y;
2003 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1904 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
2004 set_spell_skill (op, caster, spell, tmp); 1905 set_spell_skill (op, caster, spell, tmp);
2005 1906
2006 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1907 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2007 tmp->spell = arch_to_object (spell->other_arch); 1908 tmp->spell = arch_to_object (spell->other_arch);
2008 1909
2009 tmp->attacktype = tmp->spell->attacktype; 1910 tmp->attacktype = tmp->spell->attacktype;
2010 1911
2011 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1912 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2012 {
2013 if (!tailor_god_spell (tmp, op)) 1913 if (!tailor_god_spell (tmp, op))
2014 return 1; 1914 return 1;
2015 } 1915
2016 tmp->duration = SP_level_duration_adjust (caster, spell); 1916 tmp->duration = SP_level_duration_adjust (caster, spell);
2017 for (i = 0; i < spell->duration; i++) 1917 for (i = 0; i < spell->duration; i++)
2018 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1918 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2019 1919
2020 tmp->direction = dir; 1920 tmp->direction = dir;
2021 tmp->invisible = 1; 1921 tmp->invisible = 1;
2022 insert_ob_in_map (tmp, op->map, op, 0); 1922
1923 tmp->insert_at (op, op);
2023 return 1; 1924 return 1;
2024} 1925}
2025 1926
2026 1927
2027/* See the spells documentation file for why this is its own 1928/* See the spells documentation file for why this is its own
… …
2031cast_light (object *op, object *caster, object *spell, int dir) 1932cast_light (object *op, object *caster, object *spell, int dir)
2032{ 1933{
2033 object *target = NULL, *tmp = NULL; 1934 object *target = NULL, *tmp = NULL;
2034 sint16 x, y; 1935 sint16 x, y;
2035 int dam, mflags; 1936 int dam, mflags;
2036 mapstruct *m; 1937 maptile *m;
2037 1938
2038 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1939 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2039 1940
2040 if (!dir) 1941 if (!dir)
2041 { 1942 {
… …
2055 return 0; 1956 return 0;
2056 } 1957 }
2057 1958
2058 if (mflags & P_IS_ALIVE && spell->attacktype) 1959 if (mflags & P_IS_ALIVE && spell->attacktype)
2059 { 1960 {
2060 for (target = get_map_ob (m, x, y); target; target = target->above) 1961 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2061 if (QUERY_FLAG (target, FLAG_MONSTER)) 1962 if (QUERY_FLAG (target, FLAG_MONSTER))
2062 { 1963 {
2063 /* oky doky. got a target monster. Lets make a blinding attack */ 1964 /* oky doky. got a target monster. Lets make a blinding attack */
2064 if (target->head) 1965 if (target->head)
2065 target = target->head; 1966 target = target->head;
… …
2087 { 1988 {
2088 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1989 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2089 if (tmp->glow_radius > MAX_LIGHT_RADII) 1990 if (tmp->glow_radius > MAX_LIGHT_RADII)
2090 tmp->glow_radius = MAX_LIGHT_RADII; 1991 tmp->glow_radius = MAX_LIGHT_RADII;
2091 } 1992 }
2092 tmp->x = x; 1993
2093 tmp->y = y; 1994 m->insert (tmp, x, y, op);
2094 insert_ob_in_map (tmp, m, op, 0);
2095 return 1; 1995 return 1;
2096} 1996}
2097 1997
2098 1998
2099 1999
… …
2109cast_cause_disease (object *op, object *caster, object *spell, int dir) 2009cast_cause_disease (object *op, object *caster, object *spell, int dir)
2110{ 2010{
2111 sint16 x, y; 2011 sint16 x, y;
2112 int i, mflags, range, dam_mod, dur_mod; 2012 int i, mflags, range, dam_mod, dur_mod;
2113 object *walk; 2013 object *walk;
2114 mapstruct *m; 2014 maptile *m;
2115 2015
2116 x = op->x; 2016 x = op->x;
2117 y = op->y; 2017 y = op->y;
2118 2018
2119 /* If casting from a scroll, no direction will be available, so refer to the 2019 /* If casting from a scroll, no direction will be available, so refer to the
… …
2147 2047
2148 /* Only bother looking on this space if there is something living here */ 2048 /* Only bother looking on this space if there is something living here */
2149 if (mflags & P_IS_ALIVE) 2049 if (mflags & P_IS_ALIVE)
2150 { 2050 {
2151 /* search this square for a victim */ 2051 /* search this square for a victim */
2152 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2052 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2153 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2053 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2154 { /* found a victim */ 2054 { /* found a victim */
2155 object *disease = arch_to_object (spell->other_arch); 2055 object *disease = arch_to_object (spell->other_arch);
2156 2056
2157 set_owner (disease, op); 2057 disease->set_owner (op);
2158 set_spell_skill (op, caster, spell, disease); 2058 set_spell_skill (op, caster, spell, disease);
2159 disease->stats.exp = 0; 2059 disease->stats.exp = 0;
2160 disease->level = caster_level (caster, spell); 2060 disease->level = caster_level (caster, spell);
2161 2061
2162 /* do level adjustments */ 2062 /* do level adjustments */
… …
2211 { 2111 {
2212 object *flash; /* visual effect for inflicting disease */ 2112 object *flash; /* visual effect for inflicting disease */
2213 2113
2214 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2114 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2215 2115
2216 free_object (disease); /* don't need this one anymore */ 2116 disease->destroy (); /* don't need this one anymore */
2217 flash = get_archetype (ARCH_DETECT_MAGIC); 2117 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2218 flash->x = x;
2219 flash->y = y;
2220 flash->map = walk->map;
2221 insert_ob_in_map (flash, walk->map, op, 0);
2222 return 1; 2118 return 1;
2223 } 2119 }
2224 free_object (disease); 2120
2121 disease->destroy ();
2225 } 2122 }
2226 } /* if living creature */ 2123 } /* if living creature */
2227 } /* for range of spaces */ 2124 } /* for range of spaces */
2125
2228 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2126 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2229 return 1; 2127 return 1;
2230} 2128}

Diff Legend

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