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.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.25 by root, Tue Dec 26 20:04:09 2006 UTC

… …
27 */ 27 */
28 28
29#include <global.h> 29#include <global.h>
30#include <object.h> 30#include <object.h>
31#include <living.h> 31#include <living.h>
32#ifndef __CEXTRACT__
33# include <sproto.h> 32#include <sproto.h>
34#endif
35#include <spells.h> 33#include <spells.h>
36#include <sounds.h> 34#include <sounds.h>
37 35
38/* 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
39 * 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)
… …
57 { 55 {
58 weight_move = op->weight + (op->weight * op->level) / 3; 56 weight_move = op->weight + (op->weight * op->level) / 3;
59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 57 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60 } 58 }
61 59
62 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 60 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
63 { 61 {
64 int num_sections = 1; 62 int num_sections = 1;
65 63
66 /* don't move DM */ 64 /* don't move DM */
67 if (QUERY_FLAG (tmp, FLAG_WIZ)) 65 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
140 138
141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 139 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142 return; 140 return;
143 141
144 /* OK, we made a fork */ 142 /* OK, we made a fork */
145 new_bolt = object::create (); 143 new_bolt = tmp->clone ();
146 tmp->copy_to (new_bolt);
147 144
148 /* reduce chances of subsequent forking */ 145 /* reduce chances of subsequent forking */
149 new_bolt->stats.Dex -= 10; 146 new_bolt->stats.Dex -= 10;
150 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 147 tmp->stats.Dex -= 10; /* less forks from main bolt too */
151 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 148 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
152 new_bolt->speed_left = -0.1; 149 new_bolt->speed_left = -0.1;
153 new_bolt->direction = t_dir; 150 new_bolt->direction = t_dir;
154 new_bolt->duration++; 151 new_bolt->duration++;
155 new_bolt->x = sx;
156 new_bolt->y = sy;
157 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
158 new_bolt->stats.dam++; 153 new_bolt->stats.dam++;
159 tmp->stats.dam /= 2; /* reduce father bolt damage */ 154 tmp->stats.dam /= 2; /* reduce father bolt damage */
160 tmp->stats.dam++; 155 tmp->stats.dam++;
161 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 156 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
162 update_turn_face (new_bolt); 157 update_turn_face (new_bolt);
163} 158}
164 159
165/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 160/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
166 * and checks for various things that may stop it. 161 * and checks for various things that may stop it.
167 */ 162 */
… …
172 object *tmp; 167 object *tmp;
173 int mflags; 168 int mflags;
174 sint16 x, y; 169 sint16 x, y;
175 maptile *m; 170 maptile *m;
176 171
177 if (--(op->duration) < 0) 172 if (--op->duration < 0)
178 { 173 {
179 op->destroy (); 174 op->destroy ();
180 return; 175 return;
181 } 176 }
182 177
… …
184 179
185 if (!op->direction) 180 if (!op->direction)
186 return; 181 return;
187 182
188 if (--op->range < 0) 183 if (--op->range < 0)
189 {
190 op->range = 0; 184 op->range = 0;
191 }
192 else 185 else
193 { 186 {
194 x = op->x + DIRX (op); 187 x = op->x + DIRX (op);
195 y = op->y + DIRY (op); 188 y = op->y + DIRY (op);
196 m = op->map; 189 m = op->map;
… …
204 * on the space. So only call reflwall if we think the data it returns 197 * on the space. So only call reflwall if we think the data it returns
205 * will be useful. 198 * will be useful.
206 */ 199 */
207 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 200 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
208 { 201 {
209
210 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 202 if (!QUERY_FLAG (op, FLAG_REFLECTING))
211 return; 203 return;
212 204
213 /* Since walls don't run diagonal, if the bolt is in 205 /* Since walls don't run diagonal, if the bolt is in
214 * one of 4 main directions, it just reflects back in the 206 * one of 4 main directions, it just reflects back in the
… …
244 else if (left) 236 else if (left)
245 op->direction = absdir (op->direction + 2); 237 op->direction = absdir (op->direction + 2);
246 else if (right) 238 else if (right)
247 op->direction = absdir (op->direction - 2); 239 op->direction = absdir (op->direction - 2);
248 } 240 }
241
249 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 242 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
250 return; 243 return;
251 } 244 }
252 else 245 else
253 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
254 tmp = object::create (); 247 object *tmp = op->clone ();
255 op->copy_to (tmp); 248
249 m->insert (tmp, x, y, op);
256 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1;
257 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
258 tmp = insert_ob_in_map (tmp, op->map, op, 0);
259 /* To make up for the decrease at the top of the function */ 251 /* To make up for the decrease at the top of the function */
260 tmp->duration++; 252 tmp->duration++;
261 253
262 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
263 * going off in other directions. 255 * going off in other directions.
264 */ 256 */
265
266 if (rndm (0, 99) < tmp->stats.Dex) 257 if (rndm (0, 99) < tmp->stats.Dex)
267 { /* stats.Dex % of forking */ 258 { /* stats.Dex % of forking */
268 forklightning (op, tmp); 259 forklightning (op, tmp);
269 } 260 }
261
270 /* In this way, the object left behind sticks on the space, but 262 /* In this way, the object left behind sticks on the space, but
271 * doesn't create any bolts that continue to move onward. 263 * doesn't create any bolts that continue to move onward.
272 */ 264 */
273 op->range = 0; 265 op->range = 0;
274 } /* copy object and move it along */ 266 } /* copy object and move it along */
… …
281 * we remove the magic flag - that can be derived from 273 * we remove the magic flag - that can be derived from
282 * spob->attacktype. 274 * spob->attacktype.
283 * This function sets up the appropriate owner and skill 275 * This function sets up the appropriate owner and skill
284 * pointers. 276 * pointers.
285 */ 277 */
286
287int 278int
288fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 279fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
289{ 280{
290 object *tmp = NULL; 281 object *tmp = NULL;
291 int mflags; 282 int mflags;
… …
309 300
310 tmp->direction = dir; 301 tmp->direction = dir;
311 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 302 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
312 SET_ANIMATION (tmp, dir); 303 SET_ANIMATION (tmp, dir);
313 304
314 set_owner (tmp, op); 305 tmp->set_owner (op);
315 set_spell_skill (op, caster, spob, tmp); 306 set_spell_skill (op, caster, spob, tmp);
316 307
317 tmp->x = op->x + DIRX (tmp); 308 tmp->x = op->x + DIRX (tmp);
318 tmp->y = op->y + DIRY (tmp); 309 tmp->y = op->y + DIRY (tmp);
319 tmp->map = op->map; 310 tmp->map = op->map;
320 311
312 maptile *newmap;
321 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 313 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
322 if (mflags & P_OUT_OF_MAP) 314 if (mflags & P_OUT_OF_MAP)
323 { 315 {
324 tmp->destroy (); 316 tmp->destroy ();
325 return 0; 317 return 0;
326 } 318 }
319
320 tmp->map = newmap;
327 321
328 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 322 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
329 { 323 {
330 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 324 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331 { 325 {
… …
337 tmp->y = op->y; 331 tmp->y = op->y;
338 tmp->direction = absdir (tmp->direction + 4); 332 tmp->direction = absdir (tmp->direction + 4);
339 tmp->map = op->map; 333 tmp->map = op->map;
340 } 334 }
341 335
342 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 336 if ((tmp = tmp->insert_at (tmp, op)))
343 move_bolt (tmp); 337 move_bolt (tmp);
344 338
345 return 1; 339 return 1;
346} 340}
347 341
… …
358 * At least that is what I think this does. 352 * At least that is what I think this does.
359 */ 353 */
360void 354void
361explosion (object *op) 355explosion (object *op)
362{ 356{
363 object *tmp;
364 maptile *m = op->map; 357 maptile *m = op->map;
365 int i; 358 int i;
366 359
367 if (--(op->duration) < 0) 360 if (--op->duration < 0)
368 { 361 {
369 op->destroy (); 362 op->destroy ();
370 return; 363 return;
371 } 364 }
372 365
… …
378 { 371 {
379 sint16 dx, dy; 372 sint16 dx, dy;
380 373
381 dx = op->x + freearr_x[i]; 374 dx = op->x + freearr_x[i];
382 dy = op->y + freearr_y[i]; 375 dy = op->y + freearr_y[i];
376
383 /* ok_to_put_more already does things like checks for walls, 377 /* ok_to_put_more already does things like checks for walls,
384 * out of map, etc. 378 * out of map, etc.
385 */ 379 */
386 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
387 { 381 {
388 tmp = object::create (); 382 object *tmp = op->clone ();
389 op->copy_to (tmp); 383
390 tmp->state = 0; 384 tmp->state = 0;
391 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21;
392 tmp->range--; 386 tmp->range--;
393 tmp->value = 0; 387 tmp->value = 0;
394 tmp->x = dx; 388
395 tmp->y = dy; 389 m->insert (tmp, dx, dy, op);
396 insert_ob_in_map (tmp, m, op, 0);
397 } 390 }
398 } 391 }
399 } 392 }
400} 393}
401 394
… …
416 return; 409 return;
417 } 410 }
418 411
419 if (op->env) 412 if (op->env)
420 { 413 {
421 object *env;
422
423 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
424 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 415 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
425 { 416 {
426 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
427 op->destroy (); 418 op->destroy ();
428 return; 419 return;
429 } 420 }
430 421
431 op->remove (); 422 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
432 op->x = env->x;
433 op->y = env->y;
434 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
435 } 423 }
436 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
437 { 425 {
438 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
439 op->destroy (); 427 op->destroy ();
… …
457 } 445 }
458 446
459 /* other_arch contains what this explodes into */ 447 /* other_arch contains what this explodes into */
460 tmp = arch_to_object (op->other_arch); 448 tmp = arch_to_object (op->other_arch);
461 449
462 copy_owner (tmp, op); 450 tmp->set_owner (op);
463 tmp->skill = op->skill; 451 tmp->skill = op->skill;
464 452
465 owner = get_owner (op); 453 owner = op->owner;
466 454
467 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 455 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
468 { 456 {
469 op->destroy (); 457 op->destroy ();
470 return; 458 return;
471 } 459 }
472
473 tmp->x = op->x;
474 tmp->y = op->y;
475 460
476 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
477 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
478 { 463 {
479 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
… …
483 } 468 }
484 else 469 else
485 { 470 {
486 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
487 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
488 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
489 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
490 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
491 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
492 /* Used for spell tracking - just need a unique val for this spell - 478 /* Used for spell tracking - just need a unique val for this spell -
… …
500 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
501 487
502 /* Prevent recursion */ 488 /* Prevent recursion */
503 op->move_on = 0; 489 op->move_on = 0;
504 490
505 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
506 /* remove the firebullet */ 492 /* remove the firebullet */
507 if (!op->destroyed ())
508 {
509 op->destroy (); 493 op->destroy ();
510 }
511} 494}
512
513
514 495
515/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
516 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
517 */ 498 */
518
519void 499void
520check_bullet (object *op) 500check_bullet (object *op)
521{ 501{
522 object *tmp; 502 object *tmp;
523 int dam, mflags; 503 int dam, mflags;
… …
538 518
539 /* If nothing alive on this space, no reason to do anything further */ 519 /* If nothing alive on this space, no reason to do anything further */
540 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
541 return; 521 return;
542 522
543 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 523 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
544 { 524 {
545 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
546 { 526 {
547 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
548 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
… …
555 } 535 }
556 } 536 }
557 } 537 }
558} 538}
559 539
560
561/* Basically, we move 'op' one square, and if it hits something, 540/* Basically, we move 'op' one square, and if it hits something,
562 * call check_bullet. 541 * call check_bullet.
563 * This function is only applicable to bullets, but not to all 542 * This function is only applicable to bullets, but not to all
564 * fired arches (eg, bolts). 543 * fired arches (eg, bolts).
565 */ 544 */
566
567void 545void
568move_bullet (object *op) 546move_bullet (object *op)
569{ 547{
570 sint16 new_x, new_y; 548 sint16 new_x, new_y;
571 int mflags; 549 int mflags;
… …
614 op->destroy (); 592 op->destroy ();
615 593
616 return; 594 return;
617 } 595 }
618 596
619 op->remove (); 597 if (!(op = m->insert (op, new_x, new_y, op)))
620 op->x = new_x;
621 op->y = new_y;
622 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
623 return; 598 return;
624 599
625 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
626 { 601 {
627 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
628 update_turn_face (op); 603 update_turn_face (op);
629 } 604 }
630 else 605 else
631 {
632 check_bullet (op); 606 check_bullet (op);
633 }
634} 607}
635 608
636 609
637 610
638 611
… …
673 646
674 tmp->direction = dir; 647 tmp->direction = dir;
675 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 648 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
676 SET_ANIMATION (tmp, dir); 649 SET_ANIMATION (tmp, dir);
677 650
678 set_owner (tmp, op); 651 tmp->set_owner (op);
679 set_spell_skill (op, caster, spob, tmp); 652 set_spell_skill (op, caster, spob, tmp);
680 653
681 tmp->x = op->x + freearr_x[dir]; 654 tmp->x = op->x + freearr_x[dir];
682 tmp->y = op->y + freearr_y[dir]; 655 tmp->y = op->y + freearr_y[dir];
683 tmp->map = op->map; 656 tmp->map = op->map;
684 657
658 maptile *newmap;
685 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 659 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
686 if (mflags & P_OUT_OF_MAP) 660 if (mflags & P_OUT_OF_MAP)
687 { 661 {
688 tmp->destroy (); 662 tmp->destroy ();
689 return 0; 663 return 0;
690 } 664 }
665
666 tmp->map = newmap;
691 667
692 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 668 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
693 { 669 {
694 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 670 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
695 { 671 {
… …
701 tmp->y = op->y; 677 tmp->y = op->y;
702 tmp->direction = absdir (tmp->direction + 4); 678 tmp->direction = absdir (tmp->direction + 4);
703 tmp->map = op->map; 679 tmp->map = op->map;
704 } 680 }
705 681
706 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 682 if ((tmp = tmp->insert_at (tmp, op)))
707 check_bullet (tmp); 683 check_bullet (tmp);
708 684
709 return 1; 685 return 1;
710} 686}
711 687
… …
723void 699void
724cone_drop (object *op) 700cone_drop (object *op)
725{ 701{
726 object *new_ob = arch_to_object (op->other_arch); 702 object *new_ob = arch_to_object (op->other_arch);
727 703
728 new_ob->x = op->x;
729 new_ob->y = op->y;
730 new_ob->level = op->level; 704 new_ob->level = op->level;
731 set_owner (new_ob, op->owner); 705 new_ob->set_owner (op->owner);
732 706
733 /* preserve skill ownership */ 707 /* preserve skill ownership */
734 if (op->skill && op->skill != new_ob->skill) 708 if (op->skill && op->skill != new_ob->skill)
735 {
736 new_ob->skill = op->skill; 709 new_ob->skill = op->skill;
737 }
738 insert_ob_in_map (new_ob, op->map, op, 0);
739 710
711 new_ob->insert_at (op, op);
740} 712}
741 713
742/* move_cone: causes cone object 'op' to move a space/hit creatures */ 714/* move_cone: causes cone object 'op' to move a space/hit creatures */
743 715
744void 716void
… …
748 720
749 /* if no map then hit_map will crash so just ignore object */ 721 /* if no map then hit_map will crash so just ignore object */
750 if (!op->map) 722 if (!op->map)
751 { 723 {
752 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 724 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
753 op->speed = 0; 725 op->set_speed (0);
754 update_ob_speed (op);
755 return; 726 return;
756 } 727 }
757 728
758 /* lava saves it's life, but not yours :) */ 729 /* lava saves it's life, but not yours :) */
759 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 730 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
765#if 0 736#if 0
766 /* Disable this - enabling it makes monsters easier, as 737 /* Disable this - enabling it makes monsters easier, as
767 * when their cone dies when they die. 738 * when their cone dies when they die.
768 */ 739 */
769 /* If no owner left, the spell dies out. */ 740 /* If no owner left, the spell dies out. */
770 if (get_owner (op) == NULL) 741 if (op->owner == NULL)
771 { 742 {
772 op->destroy (); 743 op->destroy ();
773 return; 744 return;
774 } 745 }
775#endif 746#endif
… …
805 { 776 {
806 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 777 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
807 778
808 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 779 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
809 { 780 {
810 object *tmp = object::create (); 781 object *tmp = op->clone ();
811
812 op->copy_to (tmp);
813 tmp->x = x;
814 tmp->y = y;
815 782
816 tmp->duration = op->duration + 1; 783 tmp->duration = op->duration + 1;
817 784
818 /* Use for spell tracking - see ok_to_put_more() */ 785 /* Use for spell tracking - see ok_to_put_more() */
819 tmp->stats.maxhp = op->stats.maxhp; 786 tmp->stats.maxhp = op->stats.maxhp;
820 insert_ob_in_map (tmp, op->map, op, 0); 787
788 op->map->insert (tmp, x, y, op);
789
821 if (tmp->other_arch) 790 if (tmp->other_arch)
822 cone_drop (tmp); 791 cone_drop (tmp);
823 } 792 }
824 } 793 }
825} 794}
… …
901 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 870 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
902 continue; 871 continue;
903 872
904 success = 1; 873 success = 1;
905 tmp = arch_to_object (spell->other_arch); 874 tmp = arch_to_object (spell->other_arch);
906 set_owner (tmp, op); 875 tmp->set_owner (op);
907 set_spell_skill (op, caster, spell, tmp); 876 set_spell_skill (op, caster, spell, tmp);
908 tmp->level = caster_level (caster, spell); 877 tmp->level = caster_level (caster, spell);
909 tmp->x = sx;
910 tmp->y = sy;
911 tmp->attacktype = spell->attacktype; 878 tmp->attacktype = spell->attacktype;
912 879
913 /* holy word stuff */ 880 /* holy word stuff */
914 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 881 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
915 if (!tailor_god_spell (tmp, op)) 882 if (!tailor_god_spell (tmp, op))
… …
952 919
953 if (!(tmp->move_type & MOVE_FLY_LOW)) 920 if (!(tmp->move_type & MOVE_FLY_LOW))
954 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 921 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
955 922
956 if (!tmp->move_on && tmp->stats.dam) 923 if (!tmp->move_on && tmp->stats.dam)
957 {
958 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 924 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
959 }
960 925
961 insert_ob_in_map (tmp, m, op, 0); 926 m->insert (tmp, sx, sy, op);
962 927
963 /* This is used for tracking spells so that one effect doesn't hit 928 /* This is used for tracking spells so that one effect doesn't hit
964 * a single space too many times. 929 * a single space too many times.
965 */ 930 */
966 tmp->stats.maxhp = tmp->count; 931 tmp->stats.maxhp = tmp->count;
… …
985void 950void
986animate_bomb (object *op) 951animate_bomb (object *op)
987{ 952{
988 int i; 953 int i;
989 object *env, *tmp; 954 object *env, *tmp;
990 archetype *at;
991 955
992 if (op->state != NUM_ANIMATIONS (op) - 1) 956 if (op->state != NUM_ANIMATIONS (op) - 1)
993 return; 957 return;
994 958
995 env = object_get_env_recursive (op); 959 env = object_get_env_recursive (op);
… …
1000 return; 964 return;
1001 965
1002 if (env->type == PLAYER) 966 if (env->type == PLAYER)
1003 esrv_del_item (env->contr, op->count); 967 esrv_del_item (env->contr, op->count);
1004 968
1005 op->remove (); 969 if (!(op = op->insert_at (env, op)))
1006 op->x = env->x;
1007 op->y = env->y;
1008 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1009 return; 970 return;
1010 } 971 }
1011 972
1012 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 973 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1013 // on a safe map. I don't like this special casing, but it seems to be neccessary 974 // on a safe map. I don't like this special casing, but it seems to be neccessary
… …
1020 981
1021 /* This copies a lot of the code from the fire bullet, 982 /* This copies a lot of the code from the fire bullet,
1022 * but using the cast_bullet isn't really feasible, 983 * but using the cast_bullet isn't really feasible,
1023 * so just set up the appropriate values. 984 * so just set up the appropriate values.
1024 */ 985 */
1025 at = archetype::find (SPLINT); 986 if (archetype *at = archetype::find (SPLINT))
1026 if (at)
1027 { 987 {
1028 for (i = 1; i < 9; i++) 988 for (i = 1; i < 9; i++)
1029 { 989 {
1030 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 990 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1031 continue; 991 continue;
992
1032 tmp = arch_to_object (at); 993 tmp = arch_to_object (at);
1033 tmp->direction = i; 994 tmp->direction = i;
1034 tmp->range = op->range; 995 tmp->range = op->range;
1035 tmp->stats.dam = op->stats.dam; 996 tmp->stats.dam = op->stats.dam;
1036 tmp->duration = op->duration; 997 tmp->duration = op->duration;
1037 tmp->attacktype = op->attacktype; 998 tmp->attacktype = op->attacktype;
1038 copy_owner (tmp, op); 999 tmp->set_owner (op);
1039 if (op->skill && op->skill != tmp->skill) 1000 if (op->skill && op->skill != tmp->skill)
1040 {
1041 tmp->skill = op->skill; 1001 tmp->skill = op->skill;
1042 } 1002
1043 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1003 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1044 SET_ANIMATION (tmp, i); 1004 SET_ANIMATION (tmp, i);
1045 tmp->x = op->x + freearr_x[i]; 1005
1046 tmp->y = op->y + freearr_x[i]; 1006 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1047 insert_ob_in_map (tmp, op->map, op, 0);
1048 move_bullet (tmp); 1007 move_bullet (tmp);
1049 } 1008 }
1050 } 1009 }
1051 1010
1052 explode_bullet (op); 1011 explode_bullet (op);
… …
1073 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1032 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1074 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1033 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1075 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1034 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1076 tmp->attacktype = spell->attacktype; 1035 tmp->attacktype = spell->attacktype;
1077 1036
1078 set_owner (tmp, op); 1037 tmp->set_owner (op);
1079 set_spell_skill (op, caster, spell, tmp); 1038 set_spell_skill (op, caster, spell, tmp);
1080 tmp->x = dx; 1039
1081 tmp->y = dy; 1040 m->insert (tmp, dx, dy, op);
1082 insert_ob_in_map (tmp, m, op, 0);
1083 return 1; 1041 return 1;
1084} 1042}
1085 1043
1086/**************************************************************************** 1044/****************************************************************************
1087 * 1045 *
… …
1126 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1084 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1127 return NULL; 1085 return NULL;
1128 1086
1129 if (mflags & P_IS_ALIVE) 1087 if (mflags & P_IS_ALIVE)
1130 { 1088 {
1131 for (target = get_map_ob (mp, x, y); target; target = target->above) 1089 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1132 { 1090 {
1133 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1091 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1134 { 1092 {
1135 return target; 1093 return target;
1136 } 1094 }
… …
1203 if (effect->attacktype & AT_DEATH) 1161 if (effect->attacktype & AT_DEATH)
1204 { 1162 {
1205 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1206 1164
1207 /* casting death spells at undead isn't a good thing */ 1165 /* casting death spells at undead isn't a good thing */
1208 if QUERY_FLAG
1209 (target, FLAG_UNDEAD) 1166 if (QUERY_FLAG (target, FLAG_UNDEAD))
1210 { 1167 {
1211 if (random_roll (0, 2, op, PREFER_LOW)) 1168 if (random_roll (0, 2, op, PREFER_LOW))
1212 { 1169 {
1213 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1214 effect->x = op->x; 1171 effect->x = op->x;
… …
1227 { 1184 {
1228 /* how much woe to inflict :) */ 1185 /* how much woe to inflict :) */
1229 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1186 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1230 } 1187 }
1231 1188
1232 set_owner (effect, op); 1189 effect->set_owner (op);
1233 set_spell_skill (op, caster, spell, effect); 1190 set_spell_skill (op, caster, spell, effect);
1234 1191
1235 /* ok, tell it where to be, and insert! */ 1192 /* ok, tell it where to be, and insert! */
1236 effect->x = target->x; 1193 effect->insert_at (target, op);
1237 effect->y = target->y;
1238 insert_ob_in_map (effect, target->map, op, 0);
1239 1194
1240 return 1; 1195 return 1;
1241} 1196}
1242 1197
1243 1198
… …
1261 { 1216 {
1262 op->destroy (); 1217 op->destroy ();
1263 return; 1218 return;
1264 } 1219 }
1265 1220
1266 owner = get_owner (op); 1221 owner = op->owner;
1267#if 0 1222#if 0
1268 /* It'd make things nastier if this wasn't here - spells cast by 1223 /* It'd make things nastier if this wasn't here - spells cast by
1269 * monster that are then killed would continue to survive 1224 * monster that are then killed would continue to survive
1270 */ 1225 */
1271 if (owner == NULL) 1226 if (owner == NULL)
… …
1298 { 1253 {
1299 op->destroy (); 1254 op->destroy ();
1300 return; 1255 return;
1301 } 1256 }
1302 1257
1303 op->x = new_x; 1258 i = spell_find_dir (m, new_x, new_y, op->owner);
1304 op->y = new_y;
1305 op->map = m;
1306 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1307 if (i > 0 && i != op->direction) 1259 if (i > 0 && i != op->direction)
1308 { 1260 {
1309 op->direction = i; 1261 op->direction = i;
1310 SET_ANIMATION (op, op->direction); 1262 SET_ANIMATION (op, op->direction);
1311 } 1263 }
1312 1264
1313 insert_ob_in_map (op, op->map, op, 0); 1265 m->insert (op, new_x, new_y, op);
1314} 1266}
1315 1267
1316/**************************************************************************** 1268/****************************************************************************
1317 * Destruction 1269 * Destruction
1318 ****************************************************************************/ 1270 ****************************************************************************/
… …
1396 for (j = -range; j < range; j++) 1348 for (j = -range; j < range; j++)
1397 { 1349 {
1398 m = op->map; 1350 m = op->map;
1399 sx = op->x + i; 1351 sx = op->x + i;
1400 sy = op->y + j; 1352 sy = op->y + j;
1353
1401 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1354 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1402 if (mflags & P_OUT_OF_MAP) 1355 if (mflags & P_OUT_OF_MAP)
1403 continue; 1356 continue;
1357
1404 if (mflags & P_IS_ALIVE) 1358 if (mflags & P_IS_ALIVE)
1405 { 1359 {
1406 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1360 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1407 {
1408 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1361 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1409 break; 1362 break;
1410 } 1363
1411 if (tmp) 1364 if (tmp)
1412 { 1365 {
1413 if (tmp->head) 1366 if (tmp->head)
1414 tmp = tmp->head; 1367 tmp = tmp->head;
1415 1368
… …
1418 { 1371 {
1419 if (spell_ob->subtype == SP_DESTRUCTION) 1372 if (spell_ob->subtype == SP_DESTRUCTION)
1420 { 1373 {
1421 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1374 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1422 if (spell_ob->other_arch) 1375 if (spell_ob->other_arch)
1423 {
1424 tmp = arch_to_object (spell_ob->other_arch); 1376 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1425 tmp->x = sx;
1426 tmp->y = sy;
1427 insert_ob_in_map (tmp, m, op, 0);
1428 }
1429 } 1377 }
1430 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1378 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1431 { 1379 {
1432 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1380 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1433 {
1434 object *effect = arch_to_object (spell_ob->other_arch); 1381 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1435
1436 effect->x = sx;
1437 effect->y = sy;
1438 insert_ob_in_map (effect, m, op, 0);
1439 }
1440 } 1382 }
1441 } 1383 }
1442 } 1384 }
1443 } 1385 }
1444 } 1386 }
1445 } 1387 }
1388
1446 op->skill = skill; 1389 op->skill = skill;
1447 return 1; 1390 return 1;
1448} 1391}
1449 1392
1450/*************************************************************************** 1393/***************************************************************************
… …
1534 force->stats.ac = spell_ob->stats.ac; 1477 force->stats.ac = spell_ob->stats.ac;
1535 force->stats.wc = spell_ob->stats.wc; 1478 force->stats.wc = spell_ob->stats.wc;
1536 1479
1537 change_abil (tmp, force); /* Mostly to display any messages */ 1480 change_abil (tmp, force); /* Mostly to display any messages */
1538 insert_ob_in_ob (force, tmp); 1481 insert_ob_in_ob (force, tmp);
1539 fix_player (tmp); 1482 tmp->update_stats ();
1540 return 1; 1483 return 1;
1541 1484
1542} 1485}
1543 1486
1544 1487
… …
1595 1538
1596 /* If there is nothing living on this space, no need to go further */ 1539 /* If there is nothing living on this space, no need to go further */
1597 if (!(mflags & P_IS_ALIVE)) 1540 if (!(mflags & P_IS_ALIVE))
1598 continue; 1541 continue;
1599 1542
1600 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1543 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1601 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1544 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1602 break; 1545 break;
1603 1546
1604 /* There can be living objects that are not monsters */ 1547 /* There can be living objects that are not monsters */
1605 if (!tmp || tmp->type == PLAYER) 1548 if (!tmp || tmp->type == PLAYER)
… …
1693 SET_FLAG (head, FLAG_FRIENDLY); 1636 SET_FLAG (head, FLAG_FRIENDLY);
1694 /* Prevent uncontolled outbreaks of self replicating monsters. 1637 /* Prevent uncontolled outbreaks of self replicating monsters.
1695 Typical use case is charm, go somwhere, use aggravation to make hostile. 1638 Typical use case is charm, go somwhere, use aggravation to make hostile.
1696 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1639 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1697 CLEAR_FLAG (head, FLAG_GENERATOR); 1640 CLEAR_FLAG (head, FLAG_GENERATOR);
1698 set_owner (head, op); 1641 head->set_owner (op);
1699 set_spell_skill (op, caster, spell, head); 1642 set_spell_skill (op, caster, spell, head);
1700 add_friendly_object (head); 1643 add_friendly_object (head);
1701 head->attack_movement = PETMOVE; 1644 head->attack_movement = PETMOVE;
1702 done_one = 1; 1645 done_one = 1;
1703 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1646 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1704 head->stats.exp = 0; 1647 head->stats.exp = 0;
1705 } 1648 }
1706 1649
1707 /* If a monster was effected, put an effect in */ 1650 /* If a monster was effected, put an effect in */
1708 if (done_one && spell->other_arch) 1651 if (done_one && spell->other_arch)
1709 {
1710 tmp = arch_to_object (spell->other_arch); 1652 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1711 tmp->x = nx;
1712 tmp->y = ny;
1713 insert_ob_in_map (tmp, m, op, 0);
1714 }
1715 } /* for y */ 1653 } /* for y */
1716 1654
1717 return 1; 1655 return 1;
1718} 1656}
1719 1657
… …
1731 int i, j, dam_save, dir, mflags; 1669 int i, j, dam_save, dir, mflags;
1732 sint16 nx, ny, hx, hy; 1670 sint16 nx, ny, hx, hy;
1733 object *owner; 1671 object *owner;
1734 maptile *m; 1672 maptile *m;
1735 1673
1736 owner = get_owner (op); 1674 owner = op->owner;
1737 1675
1738 /* the following logic makes sure that the ball doesn't move into a wall, 1676 /* the following logic makes sure that the ball doesn't move into a wall,
1739 * and makes sure that it will move along a wall to try and get at it's 1677 * and makes sure that it will move along a wall to try and get at it's
1740 * victim. The block immediately below more or less chooses a random 1678 * victim. The block immediately below more or less chooses a random
1741 * offset to move the ball, eg, keep it mostly on course, with some 1679 * offset to move the ball, eg, keep it mostly on course, with some
… …
1770 nx = op->x; 1708 nx = op->x;
1771 ny = op->y; 1709 ny = op->y;
1772 m = op->map; 1710 m = op->map;
1773 } 1711 }
1774 1712
1775 op->remove (); 1713 m->insert (op, nx, ny, op);
1776 op->y = ny;
1777 op->x = nx;
1778 insert_ob_in_map (op, m, op, 0);
1779 1714
1780 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1715 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1781 surrounding squares */ 1716 surrounding squares */
1782 1717
1783 /* loop over current square and neighbors to hit. 1718 /* loop over current square and neighbors to hit.
… …
1809 1744
1810 } 1745 }
1811 1746
1812 /* insert the other arch */ 1747 /* insert the other arch */
1813 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1748 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1814 { 1749 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1815 new_ob = arch_to_object (op->other_arch);
1816 new_ob->x = hx;
1817 new_ob->y = hy;
1818 insert_ob_in_map (new_ob, m, op, 0);
1819 }
1820 } 1750 }
1821 1751
1822 /* restore to the center location and damage */ 1752 /* restore to the center location and damage */
1823 op->stats.dam = dam_save; 1753 op->stats.dam = dam_save;
1824 1754
1825 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1755 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1826 1756
1827 if (i >= 0) 1757 if (i >= 0)
1828 { /* we have a preferred direction! */ 1758 { /* we have a preferred direction! */
1829 /* pick another direction if the preferred dir is blocked. */ 1759 /* pick another direction if the preferred dir is blocked. */
1830 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1760 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1831 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1761 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1832 {
1833 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1762 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1834 } 1763
1835 op->direction = i; 1764 op->direction = i;
1836 } 1765 }
1837} 1766}
1838 1767
1839 1768
… …
1856 maptile *m; 1785 maptile *m;
1857#endif 1786#endif
1858 int basedir; 1787 int basedir;
1859 object *owner; 1788 object *owner;
1860 1789
1861 owner = get_owner (op); 1790 owner = op->owner;
1862 if (op->duration == 0 || owner == NULL) 1791 if (op->duration == 0 || owner == NULL)
1863 { 1792 {
1864 op->destroy (); 1793 op->destroy ();
1865 return; 1794 return;
1866 } 1795 }
… …
1969 1898
1970 if (!spell->other_arch) 1899 if (!spell->other_arch)
1971 return 0; 1900 return 0;
1972 1901
1973 tmp = get_archetype (SWARM_SPELL); 1902 tmp = get_archetype (SWARM_SPELL);
1974 tmp->x = op->x;
1975 tmp->y = op->y;
1976 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1903 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1977 set_spell_skill (op, caster, spell, tmp); 1904 set_spell_skill (op, caster, spell, tmp);
1978 1905
1979 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1906 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1980 tmp->spell = arch_to_object (spell->other_arch); 1907 tmp->spell = arch_to_object (spell->other_arch);
1981 1908
1982 tmp->attacktype = tmp->spell->attacktype; 1909 tmp->attacktype = tmp->spell->attacktype;
1983 1910
1984 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1911 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1985 {
1986 if (!tailor_god_spell (tmp, op)) 1912 if (!tailor_god_spell (tmp, op))
1987 return 1; 1913 return 1;
1988 } 1914
1989 tmp->duration = SP_level_duration_adjust (caster, spell); 1915 tmp->duration = SP_level_duration_adjust (caster, spell);
1990 for (i = 0; i < spell->duration; i++) 1916 for (i = 0; i < spell->duration; i++)
1991 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1917 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1992 1918
1993 tmp->direction = dir; 1919 tmp->direction = dir;
1994 tmp->invisible = 1; 1920 tmp->invisible = 1;
1995 insert_ob_in_map (tmp, op->map, op, 0); 1921
1922 tmp->insert_at (op, op);
1996 return 1; 1923 return 1;
1997} 1924}
1998 1925
1999 1926
2000/* See the spells documentation file for why this is its own 1927/* See the spells documentation file for why this is its own
… …
2028 return 0; 1955 return 0;
2029 } 1956 }
2030 1957
2031 if (mflags & P_IS_ALIVE && spell->attacktype) 1958 if (mflags & P_IS_ALIVE && spell->attacktype)
2032 { 1959 {
2033 for (target = get_map_ob (m, x, y); target; target = target->above) 1960 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2034 if (QUERY_FLAG (target, FLAG_MONSTER)) 1961 if (QUERY_FLAG (target, FLAG_MONSTER))
2035 { 1962 {
2036 /* oky doky. got a target monster. Lets make a blinding attack */ 1963 /* oky doky. got a target monster. Lets make a blinding attack */
2037 if (target->head) 1964 if (target->head)
2038 target = target->head; 1965 target = target->head;
… …
2060 { 1987 {
2061 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1988 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2062 if (tmp->glow_radius > MAX_LIGHT_RADII) 1989 if (tmp->glow_radius > MAX_LIGHT_RADII)
2063 tmp->glow_radius = MAX_LIGHT_RADII; 1990 tmp->glow_radius = MAX_LIGHT_RADII;
2064 } 1991 }
2065 tmp->x = x; 1992
2066 tmp->y = y; 1993 m->insert (tmp, x, y, op);
2067 insert_ob_in_map (tmp, m, op, 0);
2068 return 1; 1994 return 1;
2069} 1995}
2070 1996
2071 1997
2072 1998
… …
2120 2046
2121 /* Only bother looking on this space if there is something living here */ 2047 /* Only bother looking on this space if there is something living here */
2122 if (mflags & P_IS_ALIVE) 2048 if (mflags & P_IS_ALIVE)
2123 { 2049 {
2124 /* search this square for a victim */ 2050 /* search this square for a victim */
2125 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2051 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2126 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2052 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2127 { /* found a victim */ 2053 { /* found a victim */
2128 object *disease = arch_to_object (spell->other_arch); 2054 object *disease = arch_to_object (spell->other_arch);
2129 2055
2130 set_owner (disease, op); 2056 disease->set_owner (op);
2131 set_spell_skill (op, caster, spell, disease); 2057 set_spell_skill (op, caster, spell, disease);
2132 disease->stats.exp = 0; 2058 disease->stats.exp = 0;
2133 disease->level = caster_level (caster, spell); 2059 disease->level = caster_level (caster, spell);
2134 2060
2135 /* do level adjustments */ 2061 /* do level adjustments */
… …
2185 object *flash; /* visual effect for inflicting disease */ 2111 object *flash; /* visual effect for inflicting disease */
2186 2112
2187 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2113 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2188 2114
2189 disease->destroy (); /* don't need this one anymore */ 2115 disease->destroy (); /* don't need this one anymore */
2190 flash = get_archetype (ARCH_DETECT_MAGIC); 2116 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2191 flash->x = x;
2192 flash->y = y;
2193 flash->map = walk->map;
2194 insert_ob_in_map (flash, walk->map, op, 0);
2195 return 1; 2117 return 1;
2196 } 2118 }
2197 2119
2198 disease->destroy (); 2120 disease->destroy ();
2199 } 2121 }
2200 } /* if living creature */ 2122 } /* if living creature */
2201 } /* for range of spaces */ 2123 } /* for range of spaces */
2124
2202 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2125 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2203 return 1; 2126 return 1;
2204} 2127}

Diff Legend

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