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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.21 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.32 by pippijn, Sat Jan 6 14:42:31 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 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
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
37void 38void
38cast_magic_storm (object *op, object *tmp, int lvl) 39cast_magic_storm (object *op, object *tmp, int lvl)
39{ 40{
40 if (!tmp) 41 if (!tmp)
41 return; /* error */ 42 return; /* error */
43
42 tmp->level = op->level; 44 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 45 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 46 tmp->duration += lvl / 5;
47 47
48 /* Put a cap on duration for this - if the player fails in their 48 /* Put a cap on duration for this - if the player fails in their
49 * apartment, don't want it to go on so long that it kills them 49 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 50 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 51 * so don't really need to increase the duration as much either.
52 */ 52 */
53 if (tmp->duration >= 40) 53 if (tmp->duration >= 40)
54 tmp->duration = 40; 54 tmp->duration = 40;
55
55 tmp->stats.dam = lvl; /* nasty recoils! */ 56 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 57 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 58
59 tmp->insert_at (op, op);
59} 60}
60
61 61
62int 62int
63recharge (object *op, object *caster, object *spell_ob) 63recharge (object *op, object *caster, object *spell_ob)
64{ 64{
65 object *wand, *tmp; 65 object *wand, *tmp;
… …
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
78 esrv_del_item (op->contr, wand->count); 78 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 79 wand->destroy ();
80 tmp = get_archetype ("fireball"); 80 tmp = get_archetype ("fireball");
81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
82
82 if (!tmp->stats.dam) 83 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 84 tmp->stats.dam = 1;
85
84 tmp->stats.hp = tmp->stats.dam / 2; 86 tmp->stats.hp = tmp->stats.dam / 2;
87
85 if (tmp->stats.hp < 2) 88 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 89 tmp->stats.hp = 2;
87 tmp->x = op->x; 90
88 tmp->y = op->y; 91 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 92 return 1;
91 } 93 }
92 94
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 95 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
96
94 if (wand->inv && wand->inv->level) 97 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 98 ncharges /= wand->inv->level;
96 else 99 else
97 { 100 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 101 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 102 return 0;
100 } 103 }
104
101 if (!ncharges) 105 if (!ncharges)
102 ncharges = 1; 106 ncharges = 1;
103 107
104 wand->stats.food += ncharges; 108 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 109 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
110
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 111 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
107 { 112 {
108 SET_FLAG (wand, FLAG_ANIMATE); 113 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 114 wand->set_speed (wand->arch->clone.speed);
110 update_ob_speed (wand);
111 } 115 }
116
112 return 1; 117 return 1;
113} 118}
114 119
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 120/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows
116 * based on whether a crossbow or bow is equiped. If neither, it defaults to 121 * based on whether a crossbow or bow is equiped. If neither, it defaults to
… …
302 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 307 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
303 return 0; 308 return 0;
304 } 309 }
305 if (mflags & P_IS_ALIVE) 310 if (mflags & P_IS_ALIVE)
306 { 311 {
307 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 312 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
308 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 313 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
309 { 314 {
310 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 315 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
311 if (tmp->head != NULL) 316 if (tmp->head != NULL)
312 tmp = tmp->head; 317 tmp = tmp->head;
… …
440 445
441 if (mflags & P_OUT_OF_MAP) 446 if (mflags & P_OUT_OF_MAP)
442 continue; 447 continue;
443 448
444 // earth to dust tears down everything that can be teared down 449 // earth to dust tears down everything that can be teared down
445 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 450 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
446 { 451 {
447 next = tmp->above; 452 next = tmp->above;
448 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 453 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
449 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 454 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
450 } 455 }
451 } 456 }
457
452 return 1; 458 return 1;
453} 459}
454
455 460
456void 461void
457execute_word_of_recall (object *op) 462execute_word_of_recall (object *op)
458{ 463{
459 object *wor = op; 464 if (object *pl = op->in_player ())
460 465 {
461 while (op != NULL && op->type != PLAYER) 466 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
462 op = op->env;
463
464 if (op != NULL && op->map)
465 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
466 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you."); 467 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 468 else
469 {
470 // remove first so we do not call update_stats
471 op->remove ();
468 enter_exit (op, wor); 472 pl->enter_exit (op);
473 }
474 }
469 475
470 wor->destroy (); 476 op->destroy ();
471} 477}
472 478
473/* Word of recall causes the player to return 'home'. 479/* Word of recall causes the player to return 'home'.
474 * we put a force into the player object, so that there is a 480 * we put a force into the player object, so that there is a
475 * time delay effect. 481 * time delay effect.
… …
494 { 500 {
495 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 501 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
496 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 502 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
497 return 0; 503 return 0;
498 } 504 }
505
499 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 506 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
500 if (time < 1) 507 if (time < 1)
501 time = 1; 508 time = 1;
502 509
503 /* value of speed really doesn't make much difference, as long as it is 510 /* value of speed really doesn't make much difference, as long as it is
504 * positive. Lower value may be useful so that the problem doesn't 511 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 512 * do anything really odd if it say a -1000 or something.
506 */ 513 */
507 dummy->speed = 0.002; 514 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 515 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 516 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 517 dummy->subtype = SP_WORD_OF_RECALL;
512 518
513 /* If we could take advantage of enter_player_savebed() here, it would be 519 /* If we could take advantage of enter_player_savebed() here, it would be
514 * nice, but until the map load fails, we can't. 520 * nice, but until the map load fails, we can't.
515 */ 521 */
516 EXIT_PATH (dummy) = op->contr->savebed_map; 522 EXIT_PATH (dummy) = op->contr->savebed_map;
517 EXIT_X (dummy) = op->contr->bed_x; 523 EXIT_X (dummy) = op->contr->bed_x;
518 EXIT_Y (dummy) = op->contr->bed_y; 524 EXIT_Y (dummy) = op->contr->bed_y;
519 525
520 (void) insert_ob_in_ob (dummy, op); 526 op->insert (dummy);
527
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 528 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
529
522 return 1; 530 return 1;
523} 531}
524 532
525/* cast_wonder 533/* cast_wonder
526 * wonder is really just a spell that will likely cast another 534 * wonder is really just a spell that will likely cast another
… …
555 } 563 }
556 return cast_spell (op, caster, dir, newspell, NULL); 564 return cast_spell (op, caster, dir, newspell, NULL);
557 } 565 }
558 return 1; 566 return 1;
559} 567}
560
561 568
562int 569int
563perceive_self (object *op) 570perceive_self (object *op)
564{ 571{
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 572 char *cp = describe_item (op, op), buf[MAX_BUF];
… …
634 * Code by Tchize (david.delbecq@usa.net) 641 * Code by Tchize (david.delbecq@usa.net)
635 */ 642 */
636int 643int
637cast_create_town_portal (object *op, object *caster, object *spell, int dir) 644cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{ 645{
639 object *dummy, *force, *old_force, *tmp; 646 object *dummy, *force, *old_force;
640 archetype *perm_portal; 647 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024]; 648 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap; 649 maptile *exitmap;
644 int op_level; 650 int op_level;
645
646 651
647 /* Check to see if the map the player is currently on is a per player unique 652 /* Check to see if the map the player is currently on is a per player unique
648 * map. This can be determined in that per player unique maps have the 653 * map. This can be determined in that per player unique maps have the
649 * full pathname listed. 654 * full pathname listed.
650 */ 655 */
… …
718 * If it has the good name, we destruct it. 723 * If it has the good name, we destruct it.
719 * -We destruct the force indicating that portal. 724 * -We destruct the force indicating that portal.
720 */ 725 */
721 while ((old_force = check_inv_recursive (op, dummy))) 726 while ((old_force = check_inv_recursive (op, dummy)))
722 { 727 {
723 exitx = EXIT_X (old_force); 728 exitmap = maptile::find_sync (old_force->race, op->map);
724 exity = EXIT_Y (old_force);
725 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
726
727 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
728 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
729 else
730 exitmap = ready_map_name (old_force->race, 0);
731 729
732 if (exitmap) 730 if (exitmap)
733 { 731 {
732 exitmap->load_sync ();
733
734 int exitx = EXIT_X (old_force);
735 int exity = EXIT_Y (old_force);
736
734 tmp = present_arch (perm_portal, exitmap, exitx, exity); 737 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
735 while (tmp)
736 { 738 {
737 if (tmp->name == old_force->name) 739 if (tmp->name == old_force->name)
738 { 740 {
739 tmp->destroy (); 741 tmp->destroy ();
740 break; 742 break;
741 } 743 }
742
743 tmp = tmp->above;
744 } 744 }
745 } 745 }
746 746
747 old_force->destroy (); 747 old_force->destroy ();
748 LOG (llevDebug, "\n");
749 } 748 }
750 749
751 dummy->destroy (); 750 dummy->destroy ();
752 751
753 /* Creating the portals. 752 /* Creating the portals.
… …
759 * 'force' is the destination of the town portal, which we got 758 * 'force' is the destination of the town portal, which we got
760 * from the players inventory above. 759 * from the players inventory above.
761 */ 760 */
762 761
763 /* Ensure exit map is loaded */ 762 /* Ensure exit map is loaded */
764 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir))) 763 exitmap = maptile::find_sync (force->name);
765 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
766 else
767 exitmap = ready_map_name (force->name, 0);
768 764
769 /* If we were unable to load (ex. random map deleted), warn player */ 765 /* If we were unable to load (ex. random map deleted), warn player */
770 if (exitmap == NULL) 766 if (!exitmap)
771 { 767 {
772 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?"); 768 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
773 force->destroy (); 769 force->destroy ();
774 return 1; 770 return 1;
775 } 771 }
772
773 exitmap->load_sync ();
776 774
777 op_level = caster_level (caster, spell); 775 op_level = caster_level (caster, spell);
778 if (op_level < 15) 776 if (op_level < 15)
779 snprintf (portal_message, 1024, 777 snprintf (portal_message, 1024,
780 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n", 778 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
… …
790 788
791 /* Create a portal in front of player 789 /* Create a portal in front of player
792 * dummy contain the portal and 790 * dummy contain the portal and
793 * force contain the track to kill it later 791 * force contain the track to kill it later
794 */ 792 */
795
796 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 793 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
797 dummy = get_archetype (spell->slaying); /*The portal */ 794 dummy = get_archetype (spell->slaying); /*The portal */
798 if (dummy == NULL) 795 if (dummy == NULL)
799 { 796 {
800 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 797 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
812 809
813 /* Now we need to to create a town portal marker inside the player 810 /* Now we need to to create a town portal marker inside the player
814 * object, so on future castings, we can know that he has an active 811 * object, so on future castings, we can know that he has an active
815 * town portal. 812 * town portal.
816 */ 813 */
817 tmp = get_archetype (spell->race); 814 object *tmp = get_archetype (spell->race);
818 if (tmp == NULL) 815
816 if (!tmp)
819 { 817 {
820 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 818 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
821 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name); 819 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
822 return 0; 820 return 0;
823 } 821 }
824 822
825 tmp->race = op->map->path; 823 tmp->race = op->map->path;
826 tmp->name = portal_name; 824 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x; 825 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y; 826 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op); 827 op->insert (tmp);
830 828
831 /* Create a portal in the destination map 829 /* Create a portal in the destination map
832 * dummy contain the portal and 830 * dummy contain the portal and
833 * force the track to kill it later 831 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of 832 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to. 833 * where this portal goes to.
836 */ 834 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 835 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */ 836 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL) 837 if (dummy == NULL)
840 { 838 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 839 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
842 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 840 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
… …
846 EXIT_PATH (dummy) = op->map->path; 844 EXIT_PATH (dummy) = op->map->path;
847 EXIT_X (dummy) = op->x; 845 EXIT_X (dummy) = op->x;
848 EXIT_Y (dummy) = op->y; 846 EXIT_Y (dummy) = op->y;
849 dummy->name = dummy->name_pl = portal_name; 847 dummy->name = dummy->name_pl = portal_name;
850 dummy->msg = portal_message; 848 dummy->msg = portal_message;
851 dummy->x = EXIT_X (force);
852 dummy->y = EXIT_Y (force);
853 dummy->race = op->name; /*Save the owner of the portal */ 849 dummy->race = op->name; /*Save the owner of the portal */
854 insert_ob_in_map (dummy, exitmap, op, 0); 850 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
855 851
856 /* Now we create another town portal marker that 852 /* Now we create another town portal marker that
857 * points back to the one we just made 853 * points back to the one we just made
858 */ 854 */
859 tmp = get_archetype (spell->race); 855 tmp = get_archetype (spell->race);
… …
876 force->destroy (); 872 force->destroy ();
877 873
878 return 1; 874 return 1;
879} 875}
880 876
881
882/* This creates magic walls. Really, it can create most any object, 877/* This creates magic walls. Really, it can create most any object,
883 * within some reason. 878 * within some reason.
884 */ 879 */
885
886int 880int
887magic_wall (object *op, object *caster, int dir, object *spell_ob) 881magic_wall (object *op, object *caster, int dir, object *spell_ob)
888{ 882{
889 object *tmp, *tmp2; 883 object *tmp;
890 int i, posblocked, negblocked, maxrange; 884 int i, posblocked, negblocked, maxrange;
891 sint16 x, y; 885 sint16 x, y;
892 maptile *m; 886 maptile *m;
893 const char *name; 887 const char *name;
894 archetype *at; 888 archetype *at;
… …
902 else 896 else
903 { 897 {
904 x = op->x + freearr_x[dir]; 898 x = op->x + freearr_x[dir];
905 y = op->y + freearr_y[dir]; 899 y = op->y + freearr_y[dir];
906 } 900 }
901
907 m = op->map; 902 m = op->map;
908 903
909 if ((spell_ob->move_block || x != op->x || y != op->y) && 904 if ((spell_ob->move_block || x != op->x || y != op->y) &&
910 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 905 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
911 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 906 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
912 { 907 {
913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 908 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
914 return 0; 909 return 0;
915 } 910 }
911
916 if (spell_ob->other_arch) 912 if (spell_ob->other_arch)
917 {
918 tmp = arch_to_object (spell_ob->other_arch); 913 tmp = arch_to_object (spell_ob->other_arch);
919 }
920 else if (spell_ob->race) 914 else if (spell_ob->race)
921 { 915 {
922 char buf1[MAX_BUF]; 916 char buf1[MAX_BUF];
923 917
924 sprintf (buf1, spell_ob->race, dir); 918 sprintf (buf1, spell_ob->race, dir);
… …
927 { 921 {
928 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 922 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
929 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 923 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
930 return 0; 924 return 0;
931 } 925 }
926
932 tmp = arch_to_object (at); 927 tmp = arch_to_object (at);
933 } 928 }
934 else 929 else
935 { 930 {
936 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 931 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
946 } 941 }
947 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 942 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
948 { 943 {
949 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 944 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
950 tmp->stats.maxhp = tmp->stats.hp; 945 tmp->stats.maxhp = tmp->stats.hp;
951 tmp->set_owner (op);
952 set_spell_skill (op, caster, spell_ob, tmp);
953 } 946 }
947
954 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 948 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
955 { 949 {
956 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 950 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
957 SET_FLAG (tmp, FLAG_IS_USED_UP); 951 SET_FLAG (tmp, FLAG_IS_USED_UP);
958 } 952 }
953
959 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 954 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
960 { 955 {
961 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 956 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
962 tmp->stats.maxhp = tmp->stats.hp; 957 tmp->stats.maxhp = tmp->stats.hp;
963 SET_FLAG (tmp, FLAG_TEAR_DOWN); 958 SET_FLAG (tmp, FLAG_TEAR_DOWN);
964 SET_FLAG (tmp, FLAG_ALIVE); 959 SET_FLAG (tmp, FLAG_ALIVE);
965 } 960 }
966 961
967 /* This can't really hurt - if the object doesn't kill anything, 962 /* This can't really hurt - if the object doesn't kill anything,
968 * these fields just won't be used. 963 * these fields just won't be used. Do not set the owner for
964 * earthwalls, though, so they survive restarts.
969 */ 965 */
966 if (tmp->type != EARTHWALL) //TODO
970 tmp->set_owner (op); 967 tmp->set_owner (op);
968
971 set_spell_skill (op, caster, spell_ob, tmp); 969 set_spell_skill (op, caster, spell_ob, tmp);
972 tmp->x = x;
973 tmp->y = y;
974 tmp->level = caster_level (caster, spell_ob) / 2; 970 tmp->level = caster_level (caster, spell_ob) / 2;
975 971
976 name = tmp->name; 972 name = tmp->name;
977 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 973 if (!(tmp = m->insert (tmp, x, y, op)))
978 { 974 {
979 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 975 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
980 return 0; 976 return 0;
981 } 977 }
978
982 /* If this is a spellcasting wall, need to insert the spell object */ 979 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 980 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 981 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 982
986 /* This code causes the wall to extend some distance in 983 /* This code causes the wall to extend some distance in
… …
1004 m = tmp->map; 1001 m = tmp->map;
1005 1002
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1003 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1007 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked) 1004 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 1005 {
1009 tmp2 = tmp->clone (); 1006 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 1007 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 1008
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 1009 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1010 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1011 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 1012
1017 } 1013 }
1018 else 1014 else
1019 posblocked = 1; 1015 posblocked = 1;
1020 1016
… …
1023 m = tmp->map; 1019 m = tmp->map;
1024 1020
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1021 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1026 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 1022 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 1023 {
1028 tmp2 = tmp->clone (); 1024 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 1025 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 1026
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1027 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1028 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1029 }
1035 else 1030 else
1036 negblocked = 1; 1031 negblocked = 1;
1037 } 1032 }
1038 1033
… …
1087 { 1082 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1083 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1084 op->contr->count = 0;
1090 return 0; 1085 return 0;
1091 } 1086 }
1087
1092 op->contr->count = 0; 1088 op->contr->count = 0;
1093 1089
1094 /* Remove code that puts player on random space on maps. IMO, 1090 /* Remove code that puts player on random space on maps. IMO,
1095 * a lot of maps probably have areas the player should not get to, 1091 * a lot of maps probably have areas the player should not get to,
1096 * but may not be marked as NO_MAGIC (as they may be bounded 1092 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1141 return 0;
1146 } 1142 }
1147 } 1143 }
1148 1144
1149 /* Actually move the player now */ 1145 /* Actually move the player now */
1150 op->remove (); 1146 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1151 op->x += freearr_x[dir] * dist;
1152 op->y += freearr_y[dir] * dist;
1153 if ((op = insert_ob_in_map (op, op->map, op, 0)) == NULL)
1154 return 1; 1147 return 1;
1155 1148
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1149 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1150 return 1;
1158} 1151}
… …
1302}; 1295};
1303 1296
1304int 1297int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1298cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1299{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1300 object *force = NULL;
1309 int i; 1301 int i;
1310 1302
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1303 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1304 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1305 ? find_target_for_friendly_spell (op, dir)
1315 } 1306 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1307
1321 if (tmp == NULL) 1308 if (!tmp)
1322 return 0; 1309 return 0;
1323 1310
1324 /* If we've already got a force of this type, don't add a new one. */ 1311 /* If we've already got a force of this type, don't add a new one. */
1325 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1312 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1313 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1314 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1315 {
1329 if (tmp2->name == spell_ob->name) 1316 if (tmp2->name == spell_ob->name)
1330 { 1317 {
… …
1432 force->stats.ac = spell_ob->stats.ac; 1419 force->stats.ac = spell_ob->stats.ac;
1433 force->attacktype = spell_ob->attacktype; 1420 force->attacktype = spell_ob->attacktype;
1434 1421
1435 insert_ob_in_ob (force, tmp); 1422 insert_ob_in_ob (force, tmp);
1436 change_abil (tmp, force); /* Mostly to display any messages */ 1423 change_abil (tmp, force); /* Mostly to display any messages */
1437 fix_player (tmp); 1424 tmp->update_stats ();
1438 return 1; 1425 return 1;
1439} 1426}
1440 1427
1441/* This used to be part of cast_change_ability, but it really didn't make 1428/* This used to be part of cast_change_ability, but it really didn't make
1442 * a lot of sense, since most of the values it derives are from the god 1429 * a lot of sense, since most of the values it derives are from the god
… …
1541 force->stats.wc = spell_ob->stats.wc; 1528 force->stats.wc = spell_ob->stats.wc;
1542 force->stats.ac = spell_ob->stats.ac; 1529 force->stats.ac = spell_ob->stats.ac;
1543 1530
1544 change_abil (tmp, force); /* Mostly to display any messages */ 1531 change_abil (tmp, force); /* Mostly to display any messages */
1545 insert_ob_in_ob (force, tmp); 1532 insert_ob_in_ob (force, tmp);
1546 fix_player (tmp); 1533 tmp->update_stats ();
1547 return 1; 1534 return 1;
1548} 1535}
1549 1536
1550 1537
1551 1538
… …
1640 1627
1641 if (small_nuggets) 1628 if (small_nuggets)
1642 { 1629 {
1643 tmp = small->clone (); 1630 tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1631 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1632 m->insert (tmp, x, y, op, flag);
1648 } 1633 }
1649 1634
1650 if (large_nuggets) 1635 if (large_nuggets)
1651 { 1636 {
1652 tmp = large->clone (); 1637 tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1638 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1639 m->insert (tmp, x, y, op, flag);
1657 } 1640 }
1658} 1641}
1659 1642
1660int 1643int
1661alchemy (object *op, object *caster, object *spell_ob) 1644alchemy (object *op, object *caster, object *spell_ob)
… …
1698 continue; 1681 continue;
1699 1682
1700 small_nuggets = 0; 1683 small_nuggets = 0;
1701 large_nuggets = 0; 1684 large_nuggets = 0;
1702 1685
1703 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next) 1686 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
1704 { 1687 {
1705 next = tmp->above; 1688 next = tmp->above;
1706 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1689 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1707 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1690 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1708 { 1691 {
… …
1742 large->destroy (); 1725 large->destroy ();
1743 small->destroy (); 1726 small->destroy ();
1744 /* reset this so that if player standing on a big pile of stuff, 1727 /* reset this so that if player standing on a big pile of stuff,
1745 * it is redrawn properly. 1728 * it is redrawn properly.
1746 */ 1729 */
1747 op->contr->socket->look_position = 0; 1730 op->contr->ns->look_position = 0;
1748 return 1; 1731 return 1;
1749} 1732}
1750 1733
1751 1734
1752/* This function removes the cursed/damned status on equipped 1735/* This function removes the cursed/damned status on equipped
… …
1837 * stuff on the floor. Only identify stuff on the floor if the spell 1820 * stuff on the floor. Only identify stuff on the floor if the spell
1838 * was not fully used. 1821 * was not fully used.
1839 */ 1822 */
1840 if (num_ident) 1823 if (num_ident)
1841 { 1824 {
1842 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1825 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1843 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1826 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1844 { 1827 {
1845 identify (tmp); 1828 identify (tmp);
1846 1829
1847 if (op->type == PLAYER) 1830 if (op->type == PLAYER)
… …
1902 * floor. But this is not true for show invisible. 1885 * floor. But this is not true for show invisible.
1903 * Basically, we just go and find the top object and work 1886 * Basically, we just go and find the top object and work
1904 * down - that is easier than working up. 1887 * down - that is easier than working up.
1905 */ 1888 */
1906 1889
1907 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1890 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1908 last = tmp; 1891 last = tmp;
1909 1892
1910 /* Shouldn't happen, but if there are no objects on a space, this 1893 /* Shouldn't happen, but if there are no objects on a space, this
1911 * would happen. 1894 * would happen.
1912 */ 1895 */
… …
1998 */ 1981 */
1999 if (done_one) 1982 if (done_one)
2000 { 1983 {
2001 object *detect_ob = arch_to_object (spell->other_arch); 1984 object *detect_ob = arch_to_object (spell->other_arch);
2002 1985
2003 detect_ob->x = nx;
2004 detect_ob->y = ny;
2005 /* if this is set, we want to copy the face */ 1986 /* if this is set, we want to copy the face */
2006 if (done_one == 2 && detect) 1987 if (done_one == 2 && detect)
2007 { 1988 {
2008 detect_ob->face = detect->face; 1989 detect_ob->face = detect->face;
2009 detect_ob->animation_id = detect->animation_id; 1990 detect_ob->animation_id = detect->animation_id;
… …
2011 detect_ob->last_anim = 0; 1992 detect_ob->last_anim = 0;
2012 /* by default, the detect_ob is already animated */ 1993 /* by default, the detect_ob is already animated */
2013 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1994 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2014 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1995 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2015 } 1996 }
1997
2016 insert_ob_in_map (detect_ob, m, op, 0); 1998 m->insert (detect_ob, nx, ny, op);
2017 } 1999 }
2018 } /* for processing the surrounding spaces */ 2000 } /* for processing the surrounding spaces */
2019 2001
2020 2002
2021 /* Now process objects in the players inventory if detect curse or magic */ 2003 /* Now process objects in the players inventory if detect curse or magic */
… …
2070 2052
2071 /* Explodes a fireball centered at player */ 2053 /* Explodes a fireball centered at player */
2072 tmp = get_archetype (EXPLODING_FIREBALL); 2054 tmp = get_archetype (EXPLODING_FIREBALL);
2073 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2055 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2074 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2; 2056 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2075 tmp->x = victim->x; 2057
2076 tmp->y = victim->y; 2058 tmp->insert_at (victim);
2077 insert_ob_in_map (tmp, victim->map, NULL, 0);
2078 victim->stats.sp = 2 * victim->stats.maxsp; 2059 victim->stats.sp = 2 * victim->stats.maxsp;
2079 } 2060 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2061 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2081 {
2082 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 2062 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");
2083 }
2084 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 2063 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2085 {
2086 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2064 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2087 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2065 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2089 { 2066 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2067 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2091 confuse_player (victim, victim, 99); 2068 confuse_player (victim, victim, 99);
2092 } 2069 }
2093 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2070 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2094 {
2095 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2071 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2096 }
2097} 2072}
2098 2073
2099/* cast_transfer 2074/* cast_transfer
2100 * This spell transfers sp from the player to another person. 2075 * This spell transfers sp from the player to another person.
2101 * We let the target go above their normal maximum SP. 2076 * We let the target go above their normal maximum SP.
… …
2115 2090
2116 mflags = get_map_flags (m, &m, x, y, &x, &y); 2091 mflags = get_map_flags (m, &m, x, y, &x, &y);
2117 2092
2118 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 2093 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2119 { 2094 {
2120 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 2095 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2121 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2096 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2122 break; 2097 break;
2123 } 2098 }
2124 2099
2125 2100
2126 /* If we did not find a player in the specified direction, transfer 2101 /* If we did not find a player in the specified direction, transfer
2127 * to anyone on top of us. This is used for the rune of transference mostly. 2102 * to anyone on top of us. This is used for the rune of transference mostly.
2128 */ 2103 */
2129 if (plyr == NULL) 2104 if (plyr == NULL)
2130 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 2105 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2131 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2106 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2132 break; 2107 break;
2133 2108
2134 if (!plyr) 2109 if (!plyr)
2135 { 2110 {
… …
2190 m = op->map; 2165 m = op->map;
2191 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 2166 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2192 if (mflags & P_OUT_OF_MAP) 2167 if (mflags & P_OUT_OF_MAP)
2193 return; 2168 return;
2194 2169
2195 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 2170 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2196 { 2171 {
2197 next = tmp->above; 2172 next = tmp->above;
2198 2173
2199 /* Need to look at the head object - otherwise, if tmp 2174 /* Need to look at the head object - otherwise, if tmp
2200 * points to a monster, we don't have all the necessary 2175 * points to a monster, we don't have all the necessary
… …
2398 * so instead, just set it as equipped (otherwise, we need to update 2373 * so instead, just set it as equipped (otherwise, we need to update
2399 * body_info, skills, etc) 2374 * body_info, skills, etc)
2400 */ 2375 */
2401 SET_FLAG (tmp, FLAG_USE_WEAPON); 2376 SET_FLAG (tmp, FLAG_USE_WEAPON);
2402 SET_FLAG (weapon, FLAG_APPLIED); 2377 SET_FLAG (weapon, FLAG_APPLIED);
2403 fix_player (tmp); 2378 tmp->update_stats ();
2404 2379
2405 /* There used to be 'odd' code that basically seemed to take the absolute 2380 /* There used to be 'odd' code that basically seemed to take the absolute
2406 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2381 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2407 * if you're using a crappy weapon, it shouldn't be as good. 2382 * if you're using a crappy weapon, it shouldn't be as good.
2408 */ 2383 */
… …
2460 if (a > 14) 2435 if (a > 14)
2461 a = 14; 2436 a = 14;
2462 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2437 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2463 2438
2464 /* Determine golem's speed */ 2439 /* Determine golem's speed */
2465 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2440 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2466
2467 if (tmp->speed > 3.33)
2468 tmp->speed = 3.33;
2469 2441
2470 if (!spell->race) 2442 if (!spell->race)
2471 { 2443 {
2472 sprintf (buf, "animated %s", &weapon->name); 2444 sprintf (buf, "animated %s", &weapon->name);
2473 tmp->name = buf; 2445 tmp->name = buf;
… …
2475 tmp->face = weapon->face; 2447 tmp->face = weapon->face;
2476 tmp->animation_id = weapon->animation_id; 2448 tmp->animation_id = weapon->animation_id;
2477 tmp->anim_speed = weapon->anim_speed; 2449 tmp->anim_speed = weapon->anim_speed;
2478 tmp->last_anim = weapon->last_anim; 2450 tmp->last_anim = weapon->last_anim;
2479 tmp->state = weapon->state; 2451 tmp->state = weapon->state;
2480 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2452 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2481 {
2482 SET_FLAG (tmp, FLAG_ANIMATE);
2483 }
2484 else
2485 {
2486 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2487 }
2488 update_ob_speed (tmp);
2489 } 2453 }
2490 2454
2491 /* make experience increase in proportion to the strength of the summoned creature. */ 2455 /* make experience increase in proportion to the strength of the summoned creature. */
2492 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2456 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2493 2457
2494 tmp->speed_left = -1; 2458 tmp->speed_left = -1;
2495 tmp->x = x;
2496 tmp->y = y;
2497 tmp->direction = dir; 2459 tmp->direction = dir;
2498 insert_ob_in_map (tmp, m, op, 0); 2460
2461 m->insert (tmp, x, y, op);
2499 return 1; 2462 return 1;
2500} 2463}
2501 2464
2502/* cast_daylight() - changes the map darkness level *lower* */ 2465/* cast_daylight() - changes the map darkness level *lower* */
2503 2466
… …
2511 int success; 2474 int success;
2512 2475
2513 if (!op->map) 2476 if (!op->map)
2514 return 0; /* shouldnt happen */ 2477 return 0; /* shouldnt happen */
2515 2478
2516 success = change_map_light (op->map, spell->stats.dam); 2479 success = op->map->change_map_light (spell->stats.dam);
2480
2517 if (!success) 2481 if (!success)
2518 { 2482 {
2519 if (spell->stats.dam < 0) 2483 if (spell->stats.dam < 0)
2520 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2484 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2521 else 2485 else
… …
2598 { 2562 {
2599 aura->destroy (); 2563 aura->destroy ();
2600 return; 2564 return;
2601 } 2565 }
2602 2566
2603 aura->x = env->x;
2604 aura->y = env->y;
2605
2606 /* we need to jump out of the inventory for a bit 2567 /* we need to jump out of the inventory for a bit
2607 * in order to hit the map conveniently. 2568 * in order to hit the map conveniently.
2608 */ 2569 */
2609 insert_ob_in_map (aura, env->map, aura, 0); 2570 aura->insert_at (env, aura);
2610 2571
2611 for (i = 1; i < 9; i++) 2572 for (i = 1; i < 9; i++)
2612 { 2573 {
2613 sint16 nx, ny; 2574 sint16 nx, ny;
2614 2575
… …
2623 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2584 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2624 { 2585 {
2625 hit_map (aura, i, aura->attacktype, 0); 2586 hit_map (aura, i, aura->attacktype, 0);
2626 2587
2627 if (aura->other_arch) 2588 if (aura->other_arch)
2628 { 2589 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2629 object *new_ob;
2630
2631 new_ob = arch_to_object (aura->other_arch);
2632 new_ob->x = nx;
2633 new_ob->y = ny;
2634 insert_ob_in_map (new_ob, m, aura, 0);
2635 } 2590 }
2636 }
2637 } 2591 }
2592
2638 /* put the aura back in the player's inventory */ 2593 /* put the aura back in the player's inventory */
2639 aura->remove (); 2594 aura->remove ();
2640 insert_ob_in_ob (aura, env); 2595 insert_ob_in_ob (aura, env);
2641} 2596}
2642 2597
… …
2647void 2602void
2648move_peacemaker (object *op) 2603move_peacemaker (object *op)
2649{ 2604{
2650 object *tmp; 2605 object *tmp;
2651 2606
2652 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2607 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2653 { 2608 {
2654 int atk_lev, def_lev; 2609 int atk_lev, def_lev;
2655 object *victim = tmp; 2610 object *victim = tmp;
2656 2611
2657 if (tmp->head) 2612 if (tmp->head)
… …
2723 2678
2724 snprintf (rune, sizeof (rune), "%s\n", msg); 2679 snprintf (rune, sizeof (rune), "%s\n", msg);
2725 2680
2726 tmp->race = op->name; /*Save the owner of the rune */ 2681 tmp->race = op->name; /*Save the owner of the rune */
2727 tmp->msg = rune; 2682 tmp->msg = rune;
2728 tmp->x = op->x; 2683
2729 tmp->y = op->y; 2684 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2731 return 1; 2685 return 1;
2732} 2686}

Diff Legend

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