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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.11 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.18 by root, Wed Dec 13 00:42:04 2006 UTC

1
2/*
3 * static char *rcsid_spell_attack_c =
4 * "$Id: spell_attack.C,v 1.11 2006/09/11 20:26:41 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
11 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
23 16
24 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
25 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27 20
28 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
29*/ 22*/
30 23
31/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
32 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
33 * of code 26 * of code
… …
124void 117void
125forklightning (object *op, object *tmp) 118forklightning (object *op, object *tmp)
126{ 119{
127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 120 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 */ 121 int t_dir; /* stores temporary dir calculation */
129 mapstruct *m; 122 maptile *m;
130 sint16 sx, sy; 123 sint16 sx, sy;
131 object *new_bolt; 124 object *new_bolt;
132 125
133 /* pick a fork direction. tmp->stats.Con is the left bias 126 /* pick a fork direction. tmp->stats.Con is the left bias
134 * i.e., the chance in 100 of forking LEFT 127 * i.e., the chance in 100 of forking LEFT
… …
147 140
148 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
149 return; 142 return;
150 143
151 /* OK, we made a fork */ 144 /* OK, we made a fork */
152 new_bolt = get_object (); 145 new_bolt = tmp->clone ();
153 copy_object (tmp, new_bolt);
154 146
155 /* reduce chances of subsequent forking */ 147 /* reduce chances of subsequent forking */
156 new_bolt->stats.Dex -= 10; 148 new_bolt->stats.Dex -= 10;
157 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 149 tmp->stats.Dex -= 10; /* less forks from main bolt too */
158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
… …
177move_bolt (object *op) 169move_bolt (object *op)
178{ 170{
179 object *tmp; 171 object *tmp;
180 int mflags; 172 int mflags;
181 sint16 x, y; 173 sint16 x, y;
182 mapstruct *m; 174 maptile *m;
183 175
184 if (--(op->duration) < 0) 176 if (--(op->duration) < 0)
185 { 177 {
186 remove_ob (op); 178 op->destroy ();
187 free_object (op);
188 return; 179 return;
189 } 180 }
190 181
191 hit_map (op, 0, op->attacktype, 1); 182 hit_map (op, 0, op->attacktype, 1);
192 183
… …
257 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
258 return; 249 return;
259 } 250 }
260 else 251 else
261 { /* Create a copy of this object and put it ahead */ 252 { /* Create a copy of this object and put it ahead */
262 tmp = get_object (); 253 tmp = op->clone ();
263 copy_object (op, tmp); 254
264 tmp->speed_left = -0.1; 255 tmp->speed_left = -0.1;
265 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp); 256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
266 tmp = insert_ob_in_map (tmp, op->map, op, 0); 257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
267 /* To make up for the decrease at the top of the function */ 258 /* To make up for the decrease at the top of the function */
268 tmp->duration++; 259 tmp->duration++;
… …
327 tmp->map = op->map; 318 tmp->map = op->map;
328 319
329 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 320 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
330 if (mflags & P_OUT_OF_MAP) 321 if (mflags & P_OUT_OF_MAP)
331 { 322 {
332 free_object (tmp); 323 tmp->destroy ();
333 return 0; 324 return 0;
334 } 325 }
326
335 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 327 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
336 { 328 {
337 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 329 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
338 { 330 {
339 free_object (tmp); 331 tmp->destroy ();
340 return 0; 332 return 0;
341 } 333 }
334
342 tmp->x = op->x; 335 tmp->x = op->x;
343 tmp->y = op->y; 336 tmp->y = op->y;
344 tmp->direction = absdir (tmp->direction + 4); 337 tmp->direction = absdir (tmp->direction + 4);
345 tmp->map = op->map; 338 tmp->map = op->map;
346 } 339 }
340
347 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 341 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
348 move_bolt (tmp); 342 move_bolt (tmp);
343
349 return 1; 344 return 1;
350} 345}
351 346
352 347
353 348
… …
363 */ 358 */
364void 359void
365explosion (object *op) 360explosion (object *op)
366{ 361{
367 object *tmp; 362 object *tmp;
368 mapstruct *m = op->map; 363 maptile *m = op->map;
369 int i; 364 int i;
370 365
371 if (--(op->duration) < 0) 366 if (--(op->duration) < 0)
372 { 367 {
373 remove_ob (op); 368 op->destroy ();
374 free_object (op);
375 return; 369 return;
376 } 370 }
371
377 hit_map (op, 0, op->attacktype, 0); 372 hit_map (op, 0, op->attacktype, 0);
378 373
379 if (op->range > 0) 374 if (op->range > 0)
380 { 375 {
381 for (i = 1; i < 9; i++) 376 for (i = 1; i < 9; i++)
… …
387 /* ok_to_put_more already does things like checks for walls, 382 /* ok_to_put_more already does things like checks for walls,
388 * out of map, etc. 383 * out of map, etc.
389 */ 384 */
390 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 385 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
391 { 386 {
392 tmp = get_object (); 387 tmp = op->clone ();
393 copy_object (op, tmp);
394 tmp->state = 0; 388 tmp->state = 0;
395 tmp->speed_left = -0.21; 389 tmp->speed_left = -0.21;
396 tmp->range--; 390 tmp->range--;
397 tmp->value = 0; 391 tmp->value = 0;
398 tmp->x = dx; 392 tmp->x = dx;
… …
409 * explode. 403 * explode.
410 */ 404 */
411void 405void
412explode_bullet (object *op) 406explode_bullet (object *op)
413{ 407{
414 tag_t op_tag = op->count;
415 object *tmp, *owner; 408 object *tmp, *owner;
416 409
417 if (op->other_arch == NULL) 410 if (op->other_arch == NULL)
418 { 411 {
419 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 412 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
420 remove_ob (op); 413 op->destroy ();
421 free_object (op);
422 return; 414 return;
423 } 415 }
424 416
425 if (op->env) 417 if (op->env)
426 { 418 {
… …
428 420
429 env = object_get_env_recursive (op); 421 env = object_get_env_recursive (op);
430 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 422 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
431 { 423 {
432 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 424 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
433 remove_ob (op); 425 op->destroy ();
434 free_object (op);
435 return; 426 return;
436 } 427 }
428
437 remove_ob (op); 429 op->remove ();
438 op->x = env->x; 430 op->x = env->x;
439 op->y = env->y; 431 op->y = env->y;
440 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 432 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
441 } 433 }
442 else if (out_of_map (op->map, op->x, op->y)) 434 else if (out_of_map (op->map, op->x, op->y))
443 { 435 {
444 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 436 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
445 remove_ob (op); 437 op->destroy ();
446 free_object (op);
447 return; 438 return;
448 } 439 }
449 440
450 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 441 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
451 // NOTE: If this breaks something important: remove this. I can't think of anything 442 // NOTE: If this breaks something important: remove this. I can't think of anything
452 // bad at the moment that might happen from this. 443 // bad at the moment that might happen from this.
453 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 444 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
454 { 445 {
455 remove_ob (op); 446 op->destroy ();
456 free_object (op);
457 return; 447 return;
458 } 448 }
459 449
460 if (op->attacktype) 450 if (op->attacktype)
461 { 451 {
462 hit_map (op, 0, op->attacktype, 1); 452 hit_map (op, 0, op->attacktype, 1);
463 if (was_destroyed (op, op_tag)) 453 if (op->destroyed ())
464 return; 454 return;
465 } 455 }
466 456
467 /* other_arch contains what this explodes into */ 457 /* other_arch contains what this explodes into */
468 tmp = arch_to_object (op->other_arch); 458 tmp = arch_to_object (op->other_arch);
… …
472 462
473 owner = get_owner (op); 463 owner = get_owner (op);
474 464
475 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 465 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
476 { 466 {
477 remove_ob (op); 467 op->destroy ();
478 free_object (op);
479 return; 468 return;
480 } 469 }
481 470
482 tmp->x = op->x; 471 tmp->x = op->x;
483 tmp->y = op->y; 472 tmp->y = op->y;
… …
511 /* Prevent recursion */ 500 /* Prevent recursion */
512 op->move_on = 0; 501 op->move_on = 0;
513 502
514 insert_ob_in_map (tmp, op->map, op, 0); 503 insert_ob_in_map (tmp, op->map, op, 0);
515 /* remove the firebullet */ 504 /* remove the firebullet */
516 if (!was_destroyed (op, op_tag)) 505 if (!op->destroyed ())
517 { 506 {
518 remove_ob (op); 507 op->destroy ();
519 free_object (op);
520 } 508 }
521} 509}
522 510
523 511
524 512
… …
527 */ 515 */
528 516
529void 517void
530check_bullet (object *op) 518check_bullet (object *op)
531{ 519{
532 tag_t op_tag = op->count, tmp_tag;
533 object *tmp; 520 object *tmp;
534 int dam, mflags; 521 int dam, mflags;
535 mapstruct *m; 522 maptile *m;
536 sint16 sx, sy; 523 sint16 sx, sy;
537 524
538 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 525 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
539 526
540 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 527 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
553 540
554 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 541 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
555 { 542 {
556 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 543 if (QUERY_FLAG (tmp, FLAG_ALIVE))
557 { 544 {
558 tmp_tag = tmp->count;
559 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 545 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
560 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0) 546 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
561 { 547 {
562 if (!QUERY_FLAG (op, FLAG_REMOVED)) 548 if (!QUERY_FLAG (op, FLAG_REMOVED))
563 { 549 {
564 remove_ob (op); 550 op->destroy ();
565 free_object (op);
566 return; 551 return;
567 } 552 }
568 } 553 }
569 } 554 }
570 } 555 }
… …
580void 565void
581move_bullet (object *op) 566move_bullet (object *op)
582{ 567{
583 sint16 new_x, new_y; 568 sint16 new_x, new_y;
584 int mflags; 569 int mflags;
585 mapstruct *m; 570 maptile *m;
586 571
587#if 0 572#if 0
588 /* We need a better general purpose way to do this */ 573 /* We need a better general purpose way to do this */
589 574
590 /* peterm: added to make comet leave a trail of burnouts 575 /* peterm: added to make comet leave a trail of burnouts
591 it's an unadulterated hack, but the effect is cool. */ 576 it's an unadulterated hack, but the effect is cool. */
592 if (op->stats.sp == SP_METEOR) 577 if (op->stats.sp == SP_METEOR)
593 { 578 {
594 replace_insert_ob_in_map ("fire_trail", op); 579 replace_insert_ob_in_map ("fire_trail", op);
595 if (was_destroyed (op, op_tag)) 580 if (op->destroyed ())
596 return; 581 return;
597 } /* end addition. */ 582 } /* end addition. */
598#endif 583#endif
599 584
600 /* Reached the end of its life - remove it */ 585 /* Reached the end of its life - remove it */
601 if (--op->range <= 0) 586 if (--op->range <= 0)
602 { 587 {
603 if (op->other_arch) 588 if (op->other_arch)
604 {
605 explode_bullet (op); 589 explode_bullet (op);
606 }
607 else 590 else
608 { 591 op->destroy ();
609 remove_ob (op); 592
610 free_object (op);
611 }
612 return; 593 return;
613 } 594 }
614 595
615 new_x = op->x + DIRX (op); 596 new_x = op->x + DIRX (op);
616 new_y = op->y + DIRY (op); 597 new_y = op->y + DIRY (op);
617 m = op->map; 598 m = op->map;
618 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 599 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
619 600
620 if (mflags & P_OUT_OF_MAP) 601 if (mflags & P_OUT_OF_MAP)
621 { 602 {
622 remove_ob (op); 603 op->destroy ();
623 free_object (op);
624 return; 604 return;
625 } 605 }
626 606
627 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 607 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
628 { 608 {
629 if (op->other_arch) 609 if (op->other_arch)
630 {
631 explode_bullet (op); 610 explode_bullet (op);
632 }
633 else 611 else
634 { 612 op->destroy ();
635 remove_ob (op); 613
636 free_object (op);
637 }
638 return; 614 return;
639 } 615 }
640 616
641 remove_ob (op); 617 op->remove ();
642 op->x = new_x; 618 op->x = new_x;
643 op->y = new_y; 619 op->y = new_y;
644 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL) 620 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
645 return; 621 return;
646 622
… …
705 tmp->map = op->map; 681 tmp->map = op->map;
706 682
707 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 683 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
708 if (mflags & P_OUT_OF_MAP) 684 if (mflags & P_OUT_OF_MAP)
709 { 685 {
710 free_object (tmp); 686 tmp->destroy ();
711 return 0; 687 return 0;
712 } 688 }
689
713 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 690 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
714 { 691 {
715 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 692 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
716 { 693 {
717 free_object (tmp); 694 tmp->destroy ();
718 return 0; 695 return 0;
719 } 696 }
697
720 tmp->x = op->x; 698 tmp->x = op->x;
721 tmp->y = op->y; 699 tmp->y = op->y;
722 tmp->direction = absdir (tmp->direction + 4); 700 tmp->direction = absdir (tmp->direction + 4);
723 tmp->map = op->map; 701 tmp->map = op->map;
724 } 702 }
703
725 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 704 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
726 {
727 check_bullet (tmp); 705 check_bullet (tmp);
728 } 706
729 return 1; 707 return 1;
730} 708}
731 709
732 710
733 711
… …
763 741
764void 742void
765move_cone (object *op) 743move_cone (object *op)
766{ 744{
767 int i; 745 int i;
768 tag_t tag;
769 746
770 /* if no map then hit_map will crash so just ignore object */ 747 /* if no map then hit_map will crash so just ignore object */
771 if (!op->map) 748 if (!op->map)
772 { 749 {
773 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 750 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
… …
788 * when their cone dies when they die. 765 * when their cone dies when they die.
789 */ 766 */
790 /* If no owner left, the spell dies out. */ 767 /* If no owner left, the spell dies out. */
791 if (get_owner (op) == NULL) 768 if (get_owner (op) == NULL)
792 { 769 {
793 remove_ob (op); 770 op->destroy ();
794 free_object (op);
795 return; 771 return;
796 } 772 }
797#endif 773#endif
798 774
799 tag = op->count;
800 hit_map (op, 0, op->attacktype, 0); 775 hit_map (op, 0, op->attacktype, 0);
801 776
802 /* Check to see if we should push anything. 777 /* Check to see if we should push anything.
803 * Spell objects with weight push whatever they encounter to some 778 * Spell objects with weight push whatever they encounter to some
804 * degree. 779 * degree.
805 */ 780 */
806 if (op->weight) 781 if (op->weight)
807 check_spell_knockback (op); 782 check_spell_knockback (op);
808 783
809 if (was_destroyed (op, tag)) 784 if (op->destroyed ())
810 return; 785 return;
811 786
812 if ((op->duration--) < 0) 787 if ((op->duration--) < 0)
813 { 788 {
814 remove_ob (op); 789 op->destroy ();
815 free_object (op);
816 return; 790 return;
817 } 791 }
818 /* Object has hit maximum range, so don't have it move 792 /* Object has hit maximum range, so don't have it move
819 * any further. When the duration above expires, 793 * any further. When the duration above expires,
820 * then the object will get removed. 794 * then the object will get removed.
… …
829 { 803 {
830 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 804 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
831 805
832 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 806 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
833 { 807 {
834 object *tmp = get_object (); 808 object *tmp = op->clone ();
835 809
836 copy_object (op, tmp);
837 tmp->x = x; 810 tmp->x = x;
838 tmp->y = y; 811 tmp->y = y;
839 812
840 tmp->duration = op->duration + 1; 813 tmp->duration = op->duration + 1;
841 814
… …
859int 832int
860cast_cone (object *op, object *caster, int dir, object *spell) 833cast_cone (object *op, object *caster, int dir, object *spell)
861{ 834{
862 object *tmp; 835 object *tmp;
863 int i, success = 0, range_min = -1, range_max = 1; 836 int i, success = 0, range_min = -1, range_max = 1;
864 mapstruct *m; 837 maptile *m;
865 sint16 sx, sy; 838 sint16 sx, sy;
866 MoveType movetype; 839 MoveType movetype;
867 840
868 if (!spell->other_arch) 841 if (!spell->other_arch)
869 return 0; 842 return 0;
… …
1024 return; 997 return;
1025 998
1026 if (env->type == PLAYER) 999 if (env->type == PLAYER)
1027 esrv_del_item (env->contr, op->count); 1000 esrv_del_item (env->contr, op->count);
1028 1001
1029 remove_ob (op); 1002 op->remove ();
1030 op->x = env->x; 1003 op->x = env->x;
1031 op->y = env->y; 1004 op->y = env->y;
1032 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL) 1005 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1033 return; 1006 return;
1034 } 1007 }
… …
1036 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 1009 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1037 // on a safe map. I don't like this special casing, but it seems to be neccessary 1010 // on a safe map. I don't like this special casing, but it seems to be neccessary
1038 // as bombs can be carried. 1011 // as bombs can be carried.
1039 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 1012 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1040 { 1013 {
1041 remove_ob (op); 1014 op->destroy ();
1042 free_object (op);
1043 return; 1015 return;
1044 } 1016 }
1045 1017
1046 /* This copies a lot of the code from the fire bullet, 1018 /* This copies a lot of the code from the fire bullet,
1047 * but using the cast_bullet isn't really feasible, 1019 * but using the cast_bullet isn't really feasible,
1048 * so just set up the appropriate values. 1020 * so just set up the appropriate values.
1049 */ 1021 */
1050 at = find_archetype (SPLINT); 1022 at = archetype::find (SPLINT);
1051 if (at) 1023 if (at)
1052 { 1024 {
1053 for (i = 1; i < 9; i++) 1025 for (i = 1; i < 9; i++)
1054 { 1026 {
1055 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 1027 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
… …
1082{ 1054{
1083 1055
1084 object *tmp; 1056 object *tmp;
1085 int mflags; 1057 int mflags;
1086 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1058 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1087 mapstruct *m; 1059 maptile *m;
1088 1060
1089 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1061 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1090 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1062 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1091 { 1063 {
1092 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1064 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1128get_pointed_target (object *op, int dir, int range, int type) 1100get_pointed_target (object *op, int dir, int range, int type)
1129{ 1101{
1130 object *target; 1102 object *target;
1131 sint16 x, y; 1103 sint16 x, y;
1132 int dist, mflags; 1104 int dist, mflags;
1133 mapstruct *mp; 1105 maptile *mp;
1134 1106
1135 if (dir == 0) 1107 if (dir == 0)
1136 return NULL; 1108 return NULL;
1137 1109
1138 for (dist = 1; dist < range; dist++) 1110 for (dist = 1; dist < range; dist++)
… …
1241 } 1213 }
1242 else 1214 else
1243 { 1215 {
1244 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1216 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1245 target->stats.hp = target->stats.maxhp * 2; 1217 target->stats.hp = target->stats.maxhp * 2;
1246 free_object (effect); 1218 effect->destroy ();
1247 return 0; 1219 return 0;
1248 } 1220 }
1249 } 1221 }
1250 } 1222 }
1251 else 1223 else
… …
1278move_missile (object *op) 1250move_missile (object *op)
1279{ 1251{
1280 int i, mflags; 1252 int i, mflags;
1281 object *owner; 1253 object *owner;
1282 sint16 new_x, new_y; 1254 sint16 new_x, new_y;
1283 mapstruct *m; 1255 maptile *m;
1284 1256
1285 if (op->range-- <= 0) 1257 if (op->range-- <= 0)
1286 { 1258 {
1287 remove_ob (op); 1259 op->destroy ();
1288 free_object (op);
1289 return; 1260 return;
1290 } 1261 }
1291 1262
1292 owner = get_owner (op); 1263 owner = get_owner (op);
1293#if 0 1264#if 0
1294 /* It'd make things nastier if this wasn't here - spells cast by 1265 /* It'd make things nastier if this wasn't here - spells cast by
1295 * monster that are then killed would continue to survive 1266 * monster that are then killed would continue to survive
1296 */ 1267 */
1297 if (owner == NULL) 1268 if (owner == NULL)
1298 { 1269 {
1299 remove_ob (op); 1270 op->destroy ();
1300 free_object (op);
1301 return; 1271 return;
1302 } 1272 }
1303#endif 1273#endif
1304 1274
1305 new_x = op->x + DIRX (op); 1275 new_x = op->x + DIRX (op);
… …
1307 1277
1308 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1278 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1309 1279
1310 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1280 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1311 { 1281 {
1312 tag_t tag = op->count;
1313
1314 hit_map (op, op->direction, AT_MAGIC, 1); 1282 hit_map (op, op->direction, AT_MAGIC, 1);
1315 /* Basically, missile only hits one thing then goes away. 1283 /* Basically, missile only hits one thing then goes away.
1316 * we need to remove it if someone hasn't already done so. 1284 * we need to remove it if someone hasn't already done so.
1317 */ 1285 */
1318 if (!was_destroyed (op, tag)) 1286 if (!op->destroyed ())
1319 { 1287 op->destroy ();
1320 remove_ob (op); 1288
1321 free_object (op);
1322 }
1323 return; 1289 return;
1324 } 1290 }
1325 1291
1326 remove_ob (op); 1292 op->remove ();
1293
1327 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1294 if (!op->direction || (mflags & P_OUT_OF_MAP))
1328 { 1295 {
1329 free_object (op); 1296 op->destroy ();
1330 return; 1297 return;
1331 } 1298 }
1299
1332 op->x = new_x; 1300 op->x = new_x;
1333 op->y = new_y; 1301 op->y = new_y;
1334 op->map = m; 1302 op->map = m;
1335 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1303 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1336 if (i > 0 && i != op->direction) 1304 if (i > 0 && i != op->direction)
1337 { 1305 {
1338 op->direction = i; 1306 op->direction = i;
1339 SET_ANIMATION (op, op->direction); 1307 SET_ANIMATION (op, op->direction);
1340 } 1308 }
1309
1341 insert_ob_in_map (op, op->map, op, 0); 1310 insert_ob_in_map (op, op->map, op, 0);
1342} 1311}
1343 1312
1344/**************************************************************************** 1313/****************************************************************************
1345 * Destruction 1314 * Destruction
… …
1391int 1360int
1392cast_destruction (object *op, object *caster, object *spell_ob) 1361cast_destruction (object *op, object *caster, object *spell_ob)
1393{ 1362{
1394 int i, j, range, mflags, friendly = 0, dam, dur; 1363 int i, j, range, mflags, friendly = 0, dam, dur;
1395 sint16 sx, sy; 1364 sint16 sx, sy;
1396 mapstruct *m; 1365 maptile *m;
1397 object *tmp; 1366 object *tmp;
1398 const char *skill; 1367 const char *skill;
1399 1368
1400 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1369 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1401 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1370 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1583mood_change (object *op, object *caster, object *spell) 1552mood_change (object *op, object *caster, object *spell)
1584{ 1553{
1585 object *tmp, *god, *head; 1554 object *tmp, *god, *head;
1586 int done_one, range, mflags, level, at, best_at; 1555 int done_one, range, mflags, level, at, best_at;
1587 sint16 x, y, nx, ny; 1556 sint16 x, y, nx, ny;
1588 mapstruct *m; 1557 maptile *m;
1589 const char *race; 1558 const char *race;
1590 1559
1591 /* We precompute some values here so that we don't have to keep 1560 /* We precompute some values here so that we don't have to keep
1592 * doing it over and over again. 1561 * doing it over and over again.
1593 */ 1562 */
… …
1757move_ball_spell (object *op) 1726move_ball_spell (object *op)
1758{ 1727{
1759 int i, j, dam_save, dir, mflags; 1728 int i, j, dam_save, dir, mflags;
1760 sint16 nx, ny, hx, hy; 1729 sint16 nx, ny, hx, hy;
1761 object *owner; 1730 object *owner;
1762 mapstruct *m; 1731 maptile *m;
1763 1732
1764 owner = get_owner (op); 1733 owner = get_owner (op);
1765 1734
1766 /* the following logic makes sure that the ball doesn't move into a wall, 1735 /* the following logic makes sure that the ball doesn't move into a wall,
1767 * and makes sure that it will move along a wall to try and get at it's 1736 * and makes sure that it will move along a wall to try and get at it's
… …
1798 nx = op->x; 1767 nx = op->x;
1799 ny = op->y; 1768 ny = op->y;
1800 m = op->map; 1769 m = op->map;
1801 } 1770 }
1802 1771
1803 remove_ob (op); 1772 op->remove ();
1804 op->y = ny; 1773 op->y = ny;
1805 op->x = nx; 1774 op->x = nx;
1806 insert_ob_in_map (op, m, op, 0); 1775 insert_ob_in_map (op, m, op, 0);
1807 1776
1808 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1777 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
… …
1879#if 0 1848#if 0
1880 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1849 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1881 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1850 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1882 sint16 target_x, target_y, origin_x, origin_y; 1851 sint16 target_x, target_y, origin_x, origin_y;
1883 int adjustdir; 1852 int adjustdir;
1884 mapstruct *m; 1853 maptile *m;
1885#endif 1854#endif
1886 int basedir; 1855 int basedir;
1887 object *owner; 1856 object *owner;
1888 1857
1889 owner = get_owner (op); 1858 owner = get_owner (op);
1890 if (op->duration == 0 || owner == NULL) 1859 if (op->duration == 0 || owner == NULL)
1891 { 1860 {
1892 remove_ob (op); 1861 op->destroy ();
1893 free_object (op);
1894 return; 1862 return;
1895 } 1863 }
1864
1896 op->duration--; 1865 op->duration--;
1897 1866
1898 basedir = op->direction; 1867 basedir = op->direction;
1899 if (basedir == 0) 1868 if (basedir == 0)
1900 { 1869 {
… …
2032cast_light (object *op, object *caster, object *spell, int dir) 2001cast_light (object *op, object *caster, object *spell, int dir)
2033{ 2002{
2034 object *target = NULL, *tmp = NULL; 2003 object *target = NULL, *tmp = NULL;
2035 sint16 x, y; 2004 sint16 x, y;
2036 int dam, mflags; 2005 int dam, mflags;
2037 mapstruct *m; 2006 maptile *m;
2038 2007
2039 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2008 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2040 2009
2041 if (!dir) 2010 if (!dir)
2042 { 2011 {
… …
2110cast_cause_disease (object *op, object *caster, object *spell, int dir) 2079cast_cause_disease (object *op, object *caster, object *spell, int dir)
2111{ 2080{
2112 sint16 x, y; 2081 sint16 x, y;
2113 int i, mflags, range, dam_mod, dur_mod; 2082 int i, mflags, range, dam_mod, dur_mod;
2114 object *walk; 2083 object *walk;
2115 mapstruct *m; 2084 maptile *m;
2116 2085
2117 x = op->x; 2086 x = op->x;
2118 y = op->y; 2087 y = op->y;
2119 2088
2120 /* If casting from a scroll, no direction will be available, so refer to the 2089 /* If casting from a scroll, no direction will be available, so refer to the
… …
2212 { 2181 {
2213 object *flash; /* visual effect for inflicting disease */ 2182 object *flash; /* visual effect for inflicting disease */
2214 2183
2215 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2184 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2216 2185
2217 free_object (disease); /* don't need this one anymore */ 2186 disease->destroy (); /* don't need this one anymore */
2218 flash = get_archetype (ARCH_DETECT_MAGIC); 2187 flash = get_archetype (ARCH_DETECT_MAGIC);
2219 flash->x = x; 2188 flash->x = x;
2220 flash->y = y; 2189 flash->y = y;
2221 flash->map = walk->map; 2190 flash->map = walk->map;
2222 insert_ob_in_map (flash, walk->map, op, 0); 2191 insert_ob_in_map (flash, walk->map, op, 0);
2223 return 1; 2192 return 1;
2224 } 2193 }
2225 free_object (disease); 2194
2195 disease->destroy ();
2226 } 2196 }
2227 } /* if living creature */ 2197 } /* if living creature */
2228 } /* for range of spaces */ 2198 } /* for range of spaces */
2229 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2199 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2230 return 1; 2200 return 1;

Diff Legend

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