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.29 by root, Sat Dec 30 22:01:39 2006 UTC

… …
37void 37void
38cast_magic_storm (object *op, object *tmp, int lvl) 38cast_magic_storm (object *op, object *tmp, int lvl)
39{ 39{
40 if (!tmp) 40 if (!tmp)
41 return; /* error */ 41 return; /* error */
42
42 tmp->level = op->level; 43 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 44 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 45 tmp->duration += lvl / 5;
47 46
48 /* Put a cap on duration for this - if the player fails in their 47 /* 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 48 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 49 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 50 * so don't really need to increase the duration as much either.
52 */ 51 */
53 if (tmp->duration >= 40) 52 if (tmp->duration >= 40)
54 tmp->duration = 40; 53 tmp->duration = 40;
54
55 tmp->stats.dam = lvl; /* nasty recoils! */ 55 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 56 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 57
58 tmp->insert_at (op, op);
59} 59}
60
61 60
62int 61int
63recharge (object *op, object *caster, object *spell_ob) 62recharge (object *op, object *caster, object *spell_ob)
64{ 63{
65 object *wand, *tmp; 64 object *wand, *tmp;
… …
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 76 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
78 esrv_del_item (op->contr, wand->count); 77 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 78 wand->destroy ();
80 tmp = get_archetype ("fireball"); 79 tmp = get_archetype ("fireball");
81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 80 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
81
82 if (!tmp->stats.dam) 82 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 83 tmp->stats.dam = 1;
84
84 tmp->stats.hp = tmp->stats.dam / 2; 85 tmp->stats.hp = tmp->stats.dam / 2;
86
85 if (tmp->stats.hp < 2) 87 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 88 tmp->stats.hp = 2;
87 tmp->x = op->x; 89
88 tmp->y = op->y; 90 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 91 return 1;
91 } 92 }
92 93
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 94 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
95
94 if (wand->inv && wand->inv->level) 96 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 97 ncharges /= wand->inv->level;
96 else 98 else
97 { 99 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 100 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 101 return 0;
100 } 102 }
103
101 if (!ncharges) 104 if (!ncharges)
102 ncharges = 1; 105 ncharges = 1;
103 106
104 wand->stats.food += ncharges; 107 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 108 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
109
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 110 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
107 { 111 {
108 SET_FLAG (wand, FLAG_ANIMATE); 112 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 113 wand->set_speed (wand->arch->clone.speed);
110 update_ob_speed (wand);
111 } 114 }
115
112 return 1; 116 return 1;
113} 117}
114 118
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 119/* 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 120 * 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."); 306 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
303 return 0; 307 return 0;
304 } 308 }
305 if (mflags & P_IS_ALIVE) 309 if (mflags & P_IS_ALIVE)
306 { 310 {
307 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 311 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))) 312 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
309 { 313 {
310 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 314 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
311 if (tmp->head != NULL) 315 if (tmp->head != NULL)
312 tmp = tmp->head; 316 tmp = tmp->head;
… …
440 444
441 if (mflags & P_OUT_OF_MAP) 445 if (mflags & P_OUT_OF_MAP)
442 continue; 446 continue;
443 447
444 // earth to dust tears down everything that can be teared down 448 // earth to dust tears down everything that can be teared down
445 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 449 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
446 { 450 {
447 next = tmp->above; 451 next = tmp->above;
448 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 452 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
449 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 453 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
450 } 454 }
… …
463 467
464 if (op != NULL && op->map) 468 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))) 469 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."); 470 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you.");
467 else 471 else
468 enter_exit (op, wor); 472 op->enter_exit (wor);
469 473
470 wor->destroy (); 474 wor->destroy ();
471} 475}
472 476
473/* Word of recall causes the player to return 'home'. 477/* Word of recall causes the player to return 'home'.
… …
494 { 498 {
495 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 499 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
496 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 500 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
497 return 0; 501 return 0;
498 } 502 }
503
499 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 504 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
500 if (time < 1) 505 if (time < 1)
501 time = 1; 506 time = 1;
502 507
503 /* value of speed really doesn't make much difference, as long as it is 508 /* 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 509 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 510 * do anything really odd if it say a -1000 or something.
506 */ 511 */
507 dummy->speed = 0.002; 512 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 513 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 514 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 515 dummy->subtype = SP_WORD_OF_RECALL;
512 516
513 /* If we could take advantage of enter_player_savebed() here, it would be 517 /* If we could take advantage of enter_player_savebed() here, it would be
514 * nice, but until the map load fails, we can't. 518 * nice, but until the map load fails, we can't.
515 */ 519 */
516 EXIT_PATH (dummy) = op->contr->savebed_map; 520 EXIT_PATH (dummy) = op->contr->savebed_map;
517 EXIT_X (dummy) = op->contr->bed_x; 521 EXIT_X (dummy) = op->contr->bed_x;
518 EXIT_Y (dummy) = op->contr->bed_y; 522 EXIT_Y (dummy) = op->contr->bed_y;
519 523
520 (void) insert_ob_in_ob (dummy, op); 524 (void) insert_ob_in_ob (dummy, op);
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 525 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
522 return 1; 526 return 1;
523} 527}
… …
555 } 559 }
556 return cast_spell (op, caster, dir, newspell, NULL); 560 return cast_spell (op, caster, dir, newspell, NULL);
557 } 561 }
558 return 1; 562 return 1;
559} 563}
560
561 564
562int 565int
563perceive_self (object *op) 566perceive_self (object *op)
564{ 567{
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 568 char *cp = describe_item (op, op), buf[MAX_BUF];
… …
637cast_create_town_portal (object *op, object *caster, object *spell, int dir) 640cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{ 641{
639 object *dummy, *force, *old_force, *tmp; 642 object *dummy, *force, *old_force, *tmp;
640 archetype *perm_portal; 643 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024]; 644 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap; 645 maptile *exitmap;
644 int op_level; 646 int op_level;
645
646 647
647 /* Check to see if the map the player is currently on is a per player unique 648 /* 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 649 * map. This can be determined in that per player unique maps have the
649 * full pathname listed. 650 * full pathname listed.
650 */ 651 */
… …
718 * If it has the good name, we destruct it. 719 * If it has the good name, we destruct it.
719 * -We destruct the force indicating that portal. 720 * -We destruct the force indicating that portal.
720 */ 721 */
721 while ((old_force = check_inv_recursive (op, dummy))) 722 while ((old_force = check_inv_recursive (op, dummy)))
722 { 723 {
723 exitx = EXIT_X (old_force); 724 exitmap = maptile::find_map (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 725
732 if (exitmap) 726 if (exitmap)
733 { 727 {
728 int exitx = EXIT_X (old_force);
729 int exity = EXIT_Y (old_force);
730
734 tmp = present_arch (perm_portal, exitmap, exitx, exity); 731 tmp = present_arch (perm_portal, exitmap, exitx, exity);
735 while (tmp) 732 while (tmp)
736 { 733 {
737 if (tmp->name == old_force->name) 734 if (tmp->name == old_force->name)
738 { 735 {
… …
743 tmp = tmp->above; 740 tmp = tmp->above;
744 } 741 }
745 } 742 }
746 743
747 old_force->destroy (); 744 old_force->destroy ();
748 LOG (llevDebug, "\n");
749 } 745 }
750 746
751 dummy->destroy (); 747 dummy->destroy ();
752 748
753 /* Creating the portals. 749 /* Creating the portals.
… …
759 * 'force' is the destination of the town portal, which we got 755 * 'force' is the destination of the town portal, which we got
760 * from the players inventory above. 756 * from the players inventory above.
761 */ 757 */
762 758
763 /* Ensure exit map is loaded */ 759 /* Ensure exit map is loaded */
764 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
765 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
766 else
767 exitmap = ready_map_name (force->name, 0); 760 exitmap = maptile::find_map (force->name, 0);
768 761
769 /* If we were unable to load (ex. random map deleted), warn player */ 762 /* If we were unable to load (ex. random map deleted), warn player */
770 if (exitmap == NULL) 763 if (!exitmap)
771 { 764 {
772 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?"); 765 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
773 force->destroy (); 766 force->destroy ();
774 return 1; 767 return 1;
775 } 768 }
… …
790 783
791 /* Create a portal in front of player 784 /* Create a portal in front of player
792 * dummy contain the portal and 785 * dummy contain the portal and
793 * force contain the track to kill it later 786 * force contain the track to kill it later
794 */ 787 */
795
796 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 788 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
797 dummy = get_archetype (spell->slaying); /*The portal */ 789 dummy = get_archetype (spell->slaying); /*The portal */
798 if (dummy == NULL) 790 if (dummy == NULL)
799 { 791 {
800 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 792 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
824 816
825 tmp->race = op->map->path; 817 tmp->race = op->map->path;
826 tmp->name = portal_name; 818 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x; 819 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y; 820 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op); 821 op->insert (tmp);
830 822
831 /* Create a portal in the destination map 823 /* Create a portal in the destination map
832 * dummy contain the portal and 824 * dummy contain the portal and
833 * force the track to kill it later 825 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of 826 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to. 827 * where this portal goes to.
836 */ 828 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 829 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */ 830 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL) 831 if (dummy == NULL)
840 { 832 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 833 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); 834 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; 838 EXIT_PATH (dummy) = op->map->path;
847 EXIT_X (dummy) = op->x; 839 EXIT_X (dummy) = op->x;
848 EXIT_Y (dummy) = op->y; 840 EXIT_Y (dummy) = op->y;
849 dummy->name = dummy->name_pl = portal_name; 841 dummy->name = dummy->name_pl = portal_name;
850 dummy->msg = portal_message; 842 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 */ 843 dummy->race = op->name; /*Save the owner of the portal */
854 insert_ob_in_map (dummy, exitmap, op, 0); 844 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
855 845
856 /* Now we create another town portal marker that 846 /* Now we create another town portal marker that
857 * points back to the one we just made 847 * points back to the one we just made
858 */ 848 */
859 tmp = get_archetype (spell->race); 849 tmp = get_archetype (spell->race);
… …
876 force->destroy (); 866 force->destroy ();
877 867
878 return 1; 868 return 1;
879} 869}
880 870
881
882/* This creates magic walls. Really, it can create most any object, 871/* This creates magic walls. Really, it can create most any object,
883 * within some reason. 872 * within some reason.
884 */ 873 */
885
886int 874int
887magic_wall (object *op, object *caster, int dir, object *spell_ob) 875magic_wall (object *op, object *caster, int dir, object *spell_ob)
888{ 876{
889 object *tmp, *tmp2; 877 object *tmp;
890 int i, posblocked, negblocked, maxrange; 878 int i, posblocked, negblocked, maxrange;
891 sint16 x, y; 879 sint16 x, y;
892 maptile *m; 880 maptile *m;
893 const char *name; 881 const char *name;
894 archetype *at; 882 archetype *at;
… …
902 else 890 else
903 { 891 {
904 x = op->x + freearr_x[dir]; 892 x = op->x + freearr_x[dir];
905 y = op->y + freearr_y[dir]; 893 y = op->y + freearr_y[dir];
906 } 894 }
895
907 m = op->map; 896 m = op->map;
908 897
909 if ((spell_ob->move_block || x != op->x || y != op->y) && 898 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) || 899 (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))) 900 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
912 { 901 {
913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 902 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
914 return 0; 903 return 0;
915 } 904 }
905
916 if (spell_ob->other_arch) 906 if (spell_ob->other_arch)
917 {
918 tmp = arch_to_object (spell_ob->other_arch); 907 tmp = arch_to_object (spell_ob->other_arch);
919 }
920 else if (spell_ob->race) 908 else if (spell_ob->race)
921 { 909 {
922 char buf1[MAX_BUF]; 910 char buf1[MAX_BUF];
923 911
924 sprintf (buf1, spell_ob->race, dir); 912 sprintf (buf1, spell_ob->race, dir);
… …
927 { 915 {
928 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 916 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
929 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 917 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
930 return 0; 918 return 0;
931 } 919 }
920
932 tmp = arch_to_object (at); 921 tmp = arch_to_object (at);
933 } 922 }
934 else 923 else
935 { 924 {
936 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 925 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
946 } 935 }
947 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 936 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
948 { 937 {
949 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 938 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
950 tmp->stats.maxhp = tmp->stats.hp; 939 tmp->stats.maxhp = tmp->stats.hp;
951 tmp->set_owner (op);
952 set_spell_skill (op, caster, spell_ob, tmp);
953 } 940 }
941
954 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 942 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
955 { 943 {
956 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 944 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
957 SET_FLAG (tmp, FLAG_IS_USED_UP); 945 SET_FLAG (tmp, FLAG_IS_USED_UP);
958 } 946 }
947
959 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 948 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
960 { 949 {
961 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 950 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
962 tmp->stats.maxhp = tmp->stats.hp; 951 tmp->stats.maxhp = tmp->stats.hp;
963 SET_FLAG (tmp, FLAG_TEAR_DOWN); 952 SET_FLAG (tmp, FLAG_TEAR_DOWN);
964 SET_FLAG (tmp, FLAG_ALIVE); 953 SET_FLAG (tmp, FLAG_ALIVE);
965 } 954 }
966 955
967 /* This can't really hurt - if the object doesn't kill anything, 956 /* This can't really hurt - if the object doesn't kill anything,
968 * these fields just won't be used. 957 * these fields just won't be used. Do not set the owner for
958 * earthwalls, though, so they survive restarts.
969 */ 959 */
960 if (tmp->type != EARTHWALL) //TODO
970 tmp->set_owner (op); 961 tmp->set_owner (op);
962
971 set_spell_skill (op, caster, spell_ob, tmp); 963 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; 964 tmp->level = caster_level (caster, spell_ob) / 2;
975 965
976 name = tmp->name; 966 name = tmp->name;
977 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 967 if (!(tmp = m->insert (tmp, x, y, op)))
978 { 968 {
979 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 969 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
980 return 0; 970 return 0;
981 } 971 }
972
982 /* If this is a spellcasting wall, need to insert the spell object */ 973 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 974 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 975 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 976
986 /* This code causes the wall to extend some distance in 977 /* This code causes the wall to extend some distance in
… …
1004 m = tmp->map; 995 m = tmp->map;
1005 996
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 997 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) 998 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 999 {
1009 tmp2 = tmp->clone (); 1000 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 1001 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 1002
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 1003 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1004 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1005 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 1006
1017 } 1007 }
1018 else 1008 else
1019 posblocked = 1; 1009 posblocked = 1;
1020 1010
… …
1023 m = tmp->map; 1013 m = tmp->map;
1024 1014
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1015 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) 1016 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 1017 {
1028 tmp2 = tmp->clone (); 1018 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 1019 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 1020
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1021 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1022 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1023 }
1035 else 1024 else
1036 negblocked = 1; 1025 negblocked = 1;
1037 } 1026 }
1038 1027
… …
1087 { 1076 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1077 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1078 op->contr->count = 0;
1090 return 0; 1079 return 0;
1091 } 1080 }
1081
1092 op->contr->count = 0; 1082 op->contr->count = 0;
1093 1083
1094 /* Remove code that puts player on random space on maps. IMO, 1084 /* 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, 1085 * 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 1086 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1135 return 0;
1146 } 1136 }
1147 } 1137 }
1148 1138
1149 /* Actually move the player now */ 1139 /* Actually move the player now */
1150 op->remove (); 1140 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; 1141 return 1;
1155 1142
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1143 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1144 return 1;
1158} 1145}
… …
1302}; 1289};
1303 1290
1304int 1291int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1292cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1293{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1294 object *force = NULL;
1309 int i; 1295 int i;
1310 1296
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1297 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1298 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1299 ? find_target_for_friendly_spell (op, dir)
1315 } 1300 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1301
1321 if (tmp == NULL) 1302 if (!tmp)
1322 return 0; 1303 return 0;
1323 1304
1324 /* If we've already got a force of this type, don't add a new one. */ 1305 /* 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) 1306 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1307 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1308 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1309 {
1329 if (tmp2->name == spell_ob->name) 1310 if (tmp2->name == spell_ob->name)
1330 { 1311 {
… …
1432 force->stats.ac = spell_ob->stats.ac; 1413 force->stats.ac = spell_ob->stats.ac;
1433 force->attacktype = spell_ob->attacktype; 1414 force->attacktype = spell_ob->attacktype;
1434 1415
1435 insert_ob_in_ob (force, tmp); 1416 insert_ob_in_ob (force, tmp);
1436 change_abil (tmp, force); /* Mostly to display any messages */ 1417 change_abil (tmp, force); /* Mostly to display any messages */
1437 fix_player (tmp); 1418 tmp->update_stats ();
1438 return 1; 1419 return 1;
1439} 1420}
1440 1421
1441/* This used to be part of cast_change_ability, but it really didn't make 1422/* 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 1423 * a lot of sense, since most of the values it derives are from the god
… …
1541 force->stats.wc = spell_ob->stats.wc; 1522 force->stats.wc = spell_ob->stats.wc;
1542 force->stats.ac = spell_ob->stats.ac; 1523 force->stats.ac = spell_ob->stats.ac;
1543 1524
1544 change_abil (tmp, force); /* Mostly to display any messages */ 1525 change_abil (tmp, force); /* Mostly to display any messages */
1545 insert_ob_in_ob (force, tmp); 1526 insert_ob_in_ob (force, tmp);
1546 fix_player (tmp); 1527 tmp->update_stats ();
1547 return 1; 1528 return 1;
1548} 1529}
1549 1530
1550 1531
1551 1532
… …
1640 1621
1641 if (small_nuggets) 1622 if (small_nuggets)
1642 { 1623 {
1643 tmp = small->clone (); 1624 tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1625 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1626 m->insert (tmp, x, y, op, flag);
1648 } 1627 }
1649 1628
1650 if (large_nuggets) 1629 if (large_nuggets)
1651 { 1630 {
1652 tmp = large->clone (); 1631 tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1632 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1633 m->insert (tmp, x, y, op, flag);
1657 } 1634 }
1658} 1635}
1659 1636
1660int 1637int
1661alchemy (object *op, object *caster, object *spell_ob) 1638alchemy (object *op, object *caster, object *spell_ob)
… …
1698 continue; 1675 continue;
1699 1676
1700 small_nuggets = 0; 1677 small_nuggets = 0;
1701 large_nuggets = 0; 1678 large_nuggets = 0;
1702 1679
1703 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next) 1680 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
1704 { 1681 {
1705 next = tmp->above; 1682 next = tmp->above;
1706 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1683 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1707 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1684 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1708 { 1685 {
… …
1742 large->destroy (); 1719 large->destroy ();
1743 small->destroy (); 1720 small->destroy ();
1744 /* reset this so that if player standing on a big pile of stuff, 1721 /* reset this so that if player standing on a big pile of stuff,
1745 * it is redrawn properly. 1722 * it is redrawn properly.
1746 */ 1723 */
1747 op->contr->socket->look_position = 0; 1724 op->contr->ns->look_position = 0;
1748 return 1; 1725 return 1;
1749} 1726}
1750 1727
1751 1728
1752/* This function removes the cursed/damned status on equipped 1729/* This function removes the cursed/damned status on equipped
… …
1837 * stuff on the floor. Only identify stuff on the floor if the spell 1814 * stuff on the floor. Only identify stuff on the floor if the spell
1838 * was not fully used. 1815 * was not fully used.
1839 */ 1816 */
1840 if (num_ident) 1817 if (num_ident)
1841 { 1818 {
1842 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1819 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)) 1820 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1844 { 1821 {
1845 identify (tmp); 1822 identify (tmp);
1846 1823
1847 if (op->type == PLAYER) 1824 if (op->type == PLAYER)
… …
1902 * floor. But this is not true for show invisible. 1879 * floor. But this is not true for show invisible.
1903 * Basically, we just go and find the top object and work 1880 * Basically, we just go and find the top object and work
1904 * down - that is easier than working up. 1881 * down - that is easier than working up.
1905 */ 1882 */
1906 1883
1907 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1884 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1908 last = tmp; 1885 last = tmp;
1909 1886
1910 /* Shouldn't happen, but if there are no objects on a space, this 1887 /* Shouldn't happen, but if there are no objects on a space, this
1911 * would happen. 1888 * would happen.
1912 */ 1889 */
… …
1998 */ 1975 */
1999 if (done_one) 1976 if (done_one)
2000 { 1977 {
2001 object *detect_ob = arch_to_object (spell->other_arch); 1978 object *detect_ob = arch_to_object (spell->other_arch);
2002 1979
2003 detect_ob->x = nx;
2004 detect_ob->y = ny;
2005 /* if this is set, we want to copy the face */ 1980 /* if this is set, we want to copy the face */
2006 if (done_one == 2 && detect) 1981 if (done_one == 2 && detect)
2007 { 1982 {
2008 detect_ob->face = detect->face; 1983 detect_ob->face = detect->face;
2009 detect_ob->animation_id = detect->animation_id; 1984 detect_ob->animation_id = detect->animation_id;
… …
2011 detect_ob->last_anim = 0; 1986 detect_ob->last_anim = 0;
2012 /* by default, the detect_ob is already animated */ 1987 /* by default, the detect_ob is already animated */
2013 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1988 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2014 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1989 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2015 } 1990 }
1991
2016 insert_ob_in_map (detect_ob, m, op, 0); 1992 m->insert (detect_ob, nx, ny, op);
2017 } 1993 }
2018 } /* for processing the surrounding spaces */ 1994 } /* for processing the surrounding spaces */
2019 1995
2020 1996
2021 /* Now process objects in the players inventory if detect curse or magic */ 1997 /* Now process objects in the players inventory if detect curse or magic */
… …
2070 2046
2071 /* Explodes a fireball centered at player */ 2047 /* Explodes a fireball centered at player */
2072 tmp = get_archetype (EXPLODING_FIREBALL); 2048 tmp = get_archetype (EXPLODING_FIREBALL);
2073 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2049 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; 2050 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2075 tmp->x = victim->x; 2051
2076 tmp->y = victim->y; 2052 tmp->insert_at (victim);
2077 insert_ob_in_map (tmp, victim->map, NULL, 0);
2078 victim->stats.sp = 2 * victim->stats.maxsp; 2053 victim->stats.sp = 2 * victim->stats.maxsp;
2079 } 2054 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2055 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."); 2056 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) 2057 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2085 {
2086 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2058 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2087 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2059 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2089 { 2060 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2061 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2091 confuse_player (victim, victim, 99); 2062 confuse_player (victim, victim, 99);
2092 } 2063 }
2093 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2064 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2094 {
2095 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2065 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2096 }
2097} 2066}
2098 2067
2099/* cast_transfer 2068/* cast_transfer
2100 * This spell transfers sp from the player to another person. 2069 * This spell transfers sp from the player to another person.
2101 * We let the target go above their normal maximum SP. 2070 * We let the target go above their normal maximum SP.
… …
2115 2084
2116 mflags = get_map_flags (m, &m, x, y, &x, &y); 2085 mflags = get_map_flags (m, &m, x, y, &x, &y);
2117 2086
2118 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 2087 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2119 { 2088 {
2120 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 2089 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2121 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2090 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2122 break; 2091 break;
2123 } 2092 }
2124 2093
2125 2094
2126 /* If we did not find a player in the specified direction, transfer 2095 /* 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. 2096 * to anyone on top of us. This is used for the rune of transference mostly.
2128 */ 2097 */
2129 if (plyr == NULL) 2098 if (plyr == NULL)
2130 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 2099 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)) 2100 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2132 break; 2101 break;
2133 2102
2134 if (!plyr) 2103 if (!plyr)
2135 { 2104 {
… …
2190 m = op->map; 2159 m = op->map;
2191 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 2160 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2192 if (mflags & P_OUT_OF_MAP) 2161 if (mflags & P_OUT_OF_MAP)
2193 return; 2162 return;
2194 2163
2195 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 2164 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2196 { 2165 {
2197 next = tmp->above; 2166 next = tmp->above;
2198 2167
2199 /* Need to look at the head object - otherwise, if tmp 2168 /* Need to look at the head object - otherwise, if tmp
2200 * points to a monster, we don't have all the necessary 2169 * points to a monster, we don't have all the necessary
… …
2398 * so instead, just set it as equipped (otherwise, we need to update 2367 * so instead, just set it as equipped (otherwise, we need to update
2399 * body_info, skills, etc) 2368 * body_info, skills, etc)
2400 */ 2369 */
2401 SET_FLAG (tmp, FLAG_USE_WEAPON); 2370 SET_FLAG (tmp, FLAG_USE_WEAPON);
2402 SET_FLAG (weapon, FLAG_APPLIED); 2371 SET_FLAG (weapon, FLAG_APPLIED);
2403 fix_player (tmp); 2372 tmp->update_stats ();
2404 2373
2405 /* There used to be 'odd' code that basically seemed to take the absolute 2374 /* 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 - 2375 * 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. 2376 * if you're using a crappy weapon, it shouldn't be as good.
2408 */ 2377 */
… …
2460 if (a > 14) 2429 if (a > 14)
2461 a = 14; 2430 a = 14;
2462 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2431 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2463 2432
2464 /* Determine golem's speed */ 2433 /* Determine golem's speed */
2465 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2434 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 2435
2470 if (!spell->race) 2436 if (!spell->race)
2471 { 2437 {
2472 sprintf (buf, "animated %s", &weapon->name); 2438 sprintf (buf, "animated %s", &weapon->name);
2473 tmp->name = buf; 2439 tmp->name = buf;
… …
2475 tmp->face = weapon->face; 2441 tmp->face = weapon->face;
2476 tmp->animation_id = weapon->animation_id; 2442 tmp->animation_id = weapon->animation_id;
2477 tmp->anim_speed = weapon->anim_speed; 2443 tmp->anim_speed = weapon->anim_speed;
2478 tmp->last_anim = weapon->last_anim; 2444 tmp->last_anim = weapon->last_anim;
2479 tmp->state = weapon->state; 2445 tmp->state = weapon->state;
2480 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2446 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 } 2447 }
2490 2448
2491 /* make experience increase in proportion to the strength of the summoned creature. */ 2449 /* 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)); 2450 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2493 2451
2494 tmp->speed_left = -1; 2452 tmp->speed_left = -1;
2495 tmp->x = x;
2496 tmp->y = y;
2497 tmp->direction = dir; 2453 tmp->direction = dir;
2498 insert_ob_in_map (tmp, m, op, 0); 2454
2455 m->insert (tmp, x, y, op);
2499 return 1; 2456 return 1;
2500} 2457}
2501 2458
2502/* cast_daylight() - changes the map darkness level *lower* */ 2459/* cast_daylight() - changes the map darkness level *lower* */
2503 2460
… …
2511 int success; 2468 int success;
2512 2469
2513 if (!op->map) 2470 if (!op->map)
2514 return 0; /* shouldnt happen */ 2471 return 0; /* shouldnt happen */
2515 2472
2516 success = change_map_light (op->map, spell->stats.dam); 2473 success = op->map->change_map_light (spell->stats.dam);
2474
2517 if (!success) 2475 if (!success)
2518 { 2476 {
2519 if (spell->stats.dam < 0) 2477 if (spell->stats.dam < 0)
2520 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2478 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2521 else 2479 else
… …
2598 { 2556 {
2599 aura->destroy (); 2557 aura->destroy ();
2600 return; 2558 return;
2601 } 2559 }
2602 2560
2603 aura->x = env->x;
2604 aura->y = env->y;
2605
2606 /* we need to jump out of the inventory for a bit 2561 /* we need to jump out of the inventory for a bit
2607 * in order to hit the map conveniently. 2562 * in order to hit the map conveniently.
2608 */ 2563 */
2609 insert_ob_in_map (aura, env->map, aura, 0); 2564 aura->insert_at (env, aura);
2610 2565
2611 for (i = 1; i < 9; i++) 2566 for (i = 1; i < 9; i++)
2612 { 2567 {
2613 sint16 nx, ny; 2568 sint16 nx, ny;
2614 2569
… …
2623 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2578 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2624 { 2579 {
2625 hit_map (aura, i, aura->attacktype, 0); 2580 hit_map (aura, i, aura->attacktype, 0);
2626 2581
2627 if (aura->other_arch) 2582 if (aura->other_arch)
2628 { 2583 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 } 2584 }
2636 }
2637 } 2585 }
2586
2638 /* put the aura back in the player's inventory */ 2587 /* put the aura back in the player's inventory */
2639 aura->remove (); 2588 aura->remove ();
2640 insert_ob_in_ob (aura, env); 2589 insert_ob_in_ob (aura, env);
2641} 2590}
2642 2591
… …
2647void 2596void
2648move_peacemaker (object *op) 2597move_peacemaker (object *op)
2649{ 2598{
2650 object *tmp; 2599 object *tmp;
2651 2600
2652 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2601 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2653 { 2602 {
2654 int atk_lev, def_lev; 2603 int atk_lev, def_lev;
2655 object *victim = tmp; 2604 object *victim = tmp;
2656 2605
2657 if (tmp->head) 2606 if (tmp->head)
… …
2723 2672
2724 snprintf (rune, sizeof (rune), "%s\n", msg); 2673 snprintf (rune, sizeof (rune), "%s\n", msg);
2725 2674
2726 tmp->race = op->name; /*Save the owner of the rune */ 2675 tmp->race = op->name; /*Save the owner of the rune */
2727 tmp->msg = rune; 2676 tmp->msg = rune;
2728 tmp->x = op->x; 2677
2729 tmp->y = op->y; 2678 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2731 return 1; 2679 return 1;
2732} 2680}

Diff Legend

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