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.37 by root, Tue Feb 6 03:21:20 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <living.h> 27#include <living.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 28#include <sproto.h>
29#endif
30#include <spells.h> 29#include <spells.h>
31#include <sounds.h> 30#include <sounds.h>
32 31
33/* cast_magic_storm: This is really used mostly for spell 32/* cast_magic_storm: This is really used mostly for spell
34 * fumbles at the like. tmp is the object to propogate. 33 * fumbles at the like. tmp is the object to propogate.
… …
37void 36void
38cast_magic_storm (object *op, object *tmp, int lvl) 37cast_magic_storm (object *op, object *tmp, int lvl)
39{ 38{
40 if (!tmp) 39 if (!tmp)
41 return; /* error */ 40 return; /* error */
41
42 tmp->level = op->level; 42 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 43 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 44 tmp->duration += lvl / 5;
47 45
48 /* Put a cap on duration for this - if the player fails in their 46 /* 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 47 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 48 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 49 * so don't really need to increase the duration as much either.
52 */ 50 */
53 if (tmp->duration >= 40) 51 if (tmp->duration >= 40)
54 tmp->duration = 40; 52 tmp->duration = 40;
53
55 tmp->stats.dam = lvl; /* nasty recoils! */ 54 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 55 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 56
57 tmp->insert_at (op, op);
59} 58}
60
61 59
62int 60int
63recharge (object *op, object *caster, object *spell_ob) 61recharge (object *op, object *caster, object *spell_ob)
64{ 62{
65 object *wand, *tmp; 63 object *wand, *tmp;
… …
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 75 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
78 esrv_del_item (op->contr, wand->count); 76 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 77 wand->destroy ();
80 tmp = get_archetype ("fireball"); 78 tmp = get_archetype ("fireball");
81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 79 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
80
82 if (!tmp->stats.dam) 81 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 82 tmp->stats.dam = 1;
83
84 tmp->stats.hp = tmp->stats.dam / 2; 84 tmp->stats.hp = tmp->stats.dam / 2;
85
85 if (tmp->stats.hp < 2) 86 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 87 tmp->stats.hp = 2;
87 tmp->x = op->x; 88
88 tmp->y = op->y; 89 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 90 return 1;
91 } 91 }
92 92
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
94
94 if (wand->inv && wand->inv->level) 95 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 96 ncharges /= wand->inv->level;
96 else 97 else
97 { 98 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 99 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 100 return 0;
100 } 101 }
102
101 if (!ncharges) 103 if (!ncharges)
102 ncharges = 1; 104 ncharges = 1;
103 105
104 wand->stats.food += ncharges; 106 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
108
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 109 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
107 { 110 {
108 SET_FLAG (wand, FLAG_ANIMATE); 111 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 112 wand->set_speed (wand->arch->clone.speed);
110 update_ob_speed (wand);
111 } 113 }
114
112 return 1; 115 return 1;
113} 116}
114 117
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 118/* 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 119 * 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."); 305 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
303 return 0; 306 return 0;
304 } 307 }
305 if (mflags & P_IS_ALIVE) 308 if (mflags & P_IS_ALIVE)
306 { 309 {
307 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 310 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))) 311 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
309 { 312 {
310 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 313 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
311 if (tmp->head != NULL) 314 if (tmp->head != NULL)
312 tmp = tmp->head; 315 tmp = tmp->head;
… …
407 update_object (op, UP_OBJ_FACE); 410 update_object (op, UP_OBJ_FACE);
408 411
409 /* Only search the active objects - only these should actually do 412 /* Only search the active objects - only these should actually do
410 * harm to the player. 413 * harm to the player.
411 */ 414 */
412 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 415 for_all_actives (tmp)
413 if (tmp->enemy == op) 416 if (tmp->enemy == op)
414 tmp->enemy = NULL; 417 tmp->enemy = 0;
418
415 return 1; 419 return 1;
416} 420}
417 421
418/* earth to dust spell. Basically destroys earthwalls in the area. 422/* earth to dust spell. Basically destroys earthwalls in the area.
419 */ 423 */
… …
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 }
451 } 455 }
456
452 return 1; 457 return 1;
453} 458}
454
455 459
456void 460void
457execute_word_of_recall (object *op) 461execute_word_of_recall (object *op)
458{ 462{
459 object *wor = op; 463 if (object *pl = op->in_player ())
460 464 {
461 while (op != NULL && op->type != PLAYER) 465 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."); 466 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 467 else
468 {
469 // remove first so we do not call update_stats
470 op->remove ();
468 enter_exit (op, wor); 471 pl->enter_exit (op);
472 }
473 }
469 474
470 wor->destroy (); 475 op->destroy ();
471} 476}
472 477
473/* Word of recall causes the player to return 'home'. 478/* Word of recall causes the player to return 'home'.
474 * we put a force into the player object, so that there is a 479 * we put a force into the player object, so that there is a
475 * time delay effect. 480 * time delay effect.
… …
494 { 499 {
495 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
496 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
497 return 0; 502 return 0;
498 } 503 }
504
499 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 505 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
500 if (time < 1) 506 if (time < 1)
501 time = 1; 507 time = 1;
502 508
503 /* value of speed really doesn't make much difference, as long as it is 509 /* 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 510 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 511 * do anything really odd if it say a -1000 or something.
506 */ 512 */
507 dummy->speed = 0.002; 513 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 514 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 515 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 516 dummy->subtype = SP_WORD_OF_RECALL;
512 517
513 /* If we could take advantage of enter_player_savebed() here, it would be 518 /* If we could take advantage of enter_player_savebed() here, it would be
514 * nice, but until the map load fails, we can't. 519 * nice, but until the map load fails, we can't.
515 */ 520 */
516 EXIT_PATH (dummy) = op->contr->savebed_map; 521 EXIT_PATH (dummy) = op->contr->savebed_map;
517 EXIT_X (dummy) = op->contr->bed_x; 522 EXIT_X (dummy) = op->contr->bed_x;
518 EXIT_Y (dummy) = op->contr->bed_y; 523 EXIT_Y (dummy) = op->contr->bed_y;
519 524
520 (void) insert_ob_in_ob (dummy, op); 525 op->insert (dummy);
526
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 527 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
528
522 return 1; 529 return 1;
523} 530}
524 531
525/* cast_wonder 532/* cast_wonder
526 * wonder is really just a spell that will likely cast another 533 * wonder is really just a spell that will likely cast another
… …
555 } 562 }
556 return cast_spell (op, caster, dir, newspell, NULL); 563 return cast_spell (op, caster, dir, newspell, NULL);
557 } 564 }
558 return 1; 565 return 1;
559} 566}
560
561 567
562int 568int
563perceive_self (object *op) 569perceive_self (object *op)
564{ 570{
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 571 char *cp = describe_item (op, op), buf[MAX_BUF];
… …
599 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 605 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
600 { 606 {
601 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 607 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force"))
602 { 608 {
603 if (tmp->stats.exp == 0) 609 if (tmp->stats.exp == 0)
604 {
605 sprintf (buf, "Your metabolism isn't focused on anything."); 610 sprintf (buf, "Your metabolism isn't focused on anything.");
606 }
607 else 611 else
608 {
609 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 612 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]);
610 } 613
611 new_draw_info (NDI_UNIQUE, 0, op, buf); 614 new_draw_info (NDI_UNIQUE, 0, op, buf);
612 break; 615 break;
613 } 616 }
614 } 617 }
615 } 618 }
619
616 return 1; 620 return 1;
617} 621}
618 622
619/* int cast_create_town_portal (object *op, object *caster, int dir) 623/* int cast_create_town_portal (object *op, object *caster, int dir)
620 * 624 *
… …
634 * Code by Tchize (david.delbecq@usa.net) 638 * Code by Tchize (david.delbecq@usa.net)
635 */ 639 */
636int 640int
637cast_create_town_portal (object *op, object *caster, object *spell, int dir) 641cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{ 642{
639 object *dummy, *force, *old_force, *tmp; 643 object *dummy, *force, *old_force;
640 archetype *perm_portal; 644 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024]; 645 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap; 646 maptile *exitmap;
644 int op_level; 647 int op_level;
645
646 648
647 /* Check to see if the map the player is currently on is a per player unique 649 /* 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 650 * map. This can be determined in that per player unique maps have the
649 * full pathname listed. 651 * full pathname listed.
650 */ 652 */
… …
718 * If it has the good name, we destruct it. 720 * If it has the good name, we destruct it.
719 * -We destruct the force indicating that portal. 721 * -We destruct the force indicating that portal.
720 */ 722 */
721 while ((old_force = check_inv_recursive (op, dummy))) 723 while ((old_force = check_inv_recursive (op, dummy)))
722 { 724 {
723 exitx = EXIT_X (old_force); 725 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 726
732 if (exitmap) 727 if (exitmap)
733 { 728 {
729 exitmap->load_sync ();
730
731 int exitx = EXIT_X (old_force);
732 int exity = EXIT_Y (old_force);
733
734 tmp = present_arch (perm_portal, exitmap, exitx, exity); 734 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
735 while (tmp)
736 { 735 {
737 if (tmp->name == old_force->name) 736 if (tmp->name == old_force->name)
738 { 737 {
739 tmp->destroy (); 738 tmp->destroy ();
740 break; 739 break;
741 } 740 }
742
743 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))) 760 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 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 }
769
770 exitmap->load_sync ();
776 771
777 op_level = caster_level (caster, spell); 772 op_level = caster_level (caster, spell);
778 if (op_level < 15) 773 if (op_level < 15)
779 snprintf (portal_message, 1024, 774 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", 775 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
… …
790 785
791 /* Create a portal in front of player 786 /* Create a portal in front of player
792 * dummy contain the portal and 787 * dummy contain the portal and
793 * force contain the track to kill it later 788 * force contain the track to kill it later
794 */ 789 */
795
796 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 790 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
797 dummy = get_archetype (spell->slaying); /*The portal */ 791 dummy = get_archetype (spell->slaying); /*The portal */
798 if (dummy == NULL) 792 if (dummy == NULL)
799 { 793 {
800 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 794 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
812 806
813 /* Now we need to to create a town portal marker inside the player 807 /* 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 808 * object, so on future castings, we can know that he has an active
815 * town portal. 809 * town portal.
816 */ 810 */
817 tmp = get_archetype (spell->race); 811 object *tmp = get_archetype (spell->race);
818 if (tmp == NULL) 812
813 if (!tmp)
819 { 814 {
820 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 815 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); 816 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
822 return 0; 817 return 0;
823 } 818 }
824 819
825 tmp->race = op->map->path; 820 tmp->race = op->map->path;
826 tmp->name = portal_name; 821 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x; 822 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y; 823 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op); 824 op->insert (tmp);
830 825
831 /* Create a portal in the destination map 826 /* Create a portal in the destination map
832 * dummy contain the portal and 827 * dummy contain the portal and
833 * force the track to kill it later 828 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of 829 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to. 830 * where this portal goes to.
836 */ 831 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 832 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */ 833 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL) 834 if (dummy == NULL)
840 { 835 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 836 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); 837 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; 841 EXIT_PATH (dummy) = op->map->path;
847 EXIT_X (dummy) = op->x; 842 EXIT_X (dummy) = op->x;
848 EXIT_Y (dummy) = op->y; 843 EXIT_Y (dummy) = op->y;
849 dummy->name = dummy->name_pl = portal_name; 844 dummy->name = dummy->name_pl = portal_name;
850 dummy->msg = portal_message; 845 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 */ 846 dummy->race = op->name; /*Save the owner of the portal */
854 insert_ob_in_map (dummy, exitmap, op, 0); 847 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
855 848
856 /* Now we create another town portal marker that 849 /* Now we create another town portal marker that
857 * points back to the one we just made 850 * points back to the one we just made
858 */ 851 */
859 tmp = get_archetype (spell->race); 852 tmp = get_archetype (spell->race);
… …
876 force->destroy (); 869 force->destroy ();
877 870
878 return 1; 871 return 1;
879} 872}
880 873
881
882/* This creates magic walls. Really, it can create most any object, 874/* This creates magic walls. Really, it can create most any object,
883 * within some reason. 875 * within some reason.
884 */ 876 */
885
886int 877int
887magic_wall (object *op, object *caster, int dir, object *spell_ob) 878magic_wall (object *op, object *caster, int dir, object *spell_ob)
888{ 879{
889 object *tmp, *tmp2; 880 object *tmp;
890 int i, posblocked, negblocked, maxrange; 881 int i, posblocked, negblocked, maxrange;
891 sint16 x, y; 882 sint16 x, y;
892 maptile *m; 883 maptile *m;
893 const char *name; 884 const char *name;
894 archetype *at; 885 archetype *at;
… …
902 else 893 else
903 { 894 {
904 x = op->x + freearr_x[dir]; 895 x = op->x + freearr_x[dir];
905 y = op->y + freearr_y[dir]; 896 y = op->y + freearr_y[dir];
906 } 897 }
898
907 m = op->map; 899 m = op->map;
908 900
909 if ((spell_ob->move_block || x != op->x || y != op->y) && 901 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) || 902 (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))) 903 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
912 { 904 {
913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 905 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
914 return 0; 906 return 0;
915 } 907 }
908
916 if (spell_ob->other_arch) 909 if (spell_ob->other_arch)
917 {
918 tmp = arch_to_object (spell_ob->other_arch); 910 tmp = arch_to_object (spell_ob->other_arch);
919 }
920 else if (spell_ob->race) 911 else if (spell_ob->race)
921 { 912 {
922 char buf1[MAX_BUF]; 913 char buf1[MAX_BUF];
923 914
924 sprintf (buf1, spell_ob->race, dir); 915 sprintf (buf1, spell_ob->race, dir);
… …
927 { 918 {
928 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 919 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
929 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 920 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
930 return 0; 921 return 0;
931 } 922 }
923
932 tmp = arch_to_object (at); 924 tmp = arch_to_object (at);
933 } 925 }
934 else 926 else
935 { 927 {
936 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 928 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
946 } 938 }
947 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 939 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
948 { 940 {
949 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 941 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
950 tmp->stats.maxhp = tmp->stats.hp; 942 tmp->stats.maxhp = tmp->stats.hp;
951 tmp->set_owner (op);
952 set_spell_skill (op, caster, spell_ob, tmp);
953 } 943 }
944
954 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 945 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
955 { 946 {
956 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 947 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
957 SET_FLAG (tmp, FLAG_IS_USED_UP); 948 SET_FLAG (tmp, FLAG_IS_USED_UP);
958 } 949 }
950
959 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 951 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
960 { 952 {
961 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 953 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
962 tmp->stats.maxhp = tmp->stats.hp; 954 tmp->stats.maxhp = tmp->stats.hp;
963 SET_FLAG (tmp, FLAG_TEAR_DOWN); 955 SET_FLAG (tmp, FLAG_TEAR_DOWN);
964 SET_FLAG (tmp, FLAG_ALIVE); 956 SET_FLAG (tmp, FLAG_ALIVE);
965 } 957 }
966 958
967 /* This can't really hurt - if the object doesn't kill anything, 959 /* This can't really hurt - if the object doesn't kill anything,
968 * these fields just won't be used. 960 * these fields just won't be used. Do not set the owner for
961 * earthwalls, though, so they survive restarts.
969 */ 962 */
963 if (tmp->type != EARTHWALL) //TODO
970 tmp->set_owner (op); 964 tmp->set_owner (op);
965
971 set_spell_skill (op, caster, spell_ob, tmp); 966 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; 967 tmp->level = caster_level (caster, spell_ob) / 2;
975 968
976 name = tmp->name; 969 name = tmp->name;
977 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 970 if (!(tmp = m->insert (tmp, x, y, op)))
978 { 971 {
979 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 972 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
980 return 0; 973 return 0;
981 } 974 }
975
982 /* If this is a spellcasting wall, need to insert the spell object */ 976 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 977 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 978 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 979
986 /* This code causes the wall to extend some distance in 980 /* This code causes the wall to extend some distance in
… …
1004 m = tmp->map; 998 m = tmp->map;
1005 999
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1000 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) 1001 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 1002 {
1009 tmp2 = tmp->clone (); 1003 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 1004 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 1005
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 1006 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1007 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1008 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 1009
1017 } 1010 }
1018 else 1011 else
1019 posblocked = 1; 1012 posblocked = 1;
1020 1013
… …
1023 m = tmp->map; 1016 m = tmp->map;
1024 1017
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1018 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) 1019 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 1020 {
1028 tmp2 = tmp->clone (); 1021 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 1022 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 1023
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1024 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1025 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1026 }
1035 else 1027 else
1036 negblocked = 1; 1028 negblocked = 1;
1037 } 1029 }
1038 1030
… …
1087 { 1079 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1080 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1081 op->contr->count = 0;
1090 return 0; 1082 return 0;
1091 } 1083 }
1084
1092 op->contr->count = 0; 1085 op->contr->count = 0;
1093 1086
1094 /* Remove code that puts player on random space on maps. IMO, 1087 /* 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, 1088 * 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 1089 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1138 return 0;
1146 } 1139 }
1147 } 1140 }
1148 1141
1149 /* Actually move the player now */ 1142 /* Actually move the player now */
1150 op->remove (); 1143 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; 1144 return 1;
1155 1145
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1146 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1147 return 1;
1158} 1148}
… …
1302}; 1292};
1303 1293
1304int 1294int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1295cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1296{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1297 object *force = NULL;
1309 int i; 1298 int i;
1310 1299
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1300 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1301 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1302 ? find_target_for_friendly_spell (op, dir)
1315 } 1303 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1304
1321 if (tmp == NULL) 1305 if (!tmp)
1322 return 0; 1306 return 0;
1323 1307
1324 /* If we've already got a force of this type, don't add a new one. */ 1308 /* 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) 1309 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1310 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1311 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1312 {
1329 if (tmp2->name == spell_ob->name) 1313 if (tmp2->name == spell_ob->name)
1330 { 1314 {
… …
1432 force->stats.ac = spell_ob->stats.ac; 1416 force->stats.ac = spell_ob->stats.ac;
1433 force->attacktype = spell_ob->attacktype; 1417 force->attacktype = spell_ob->attacktype;
1434 1418
1435 insert_ob_in_ob (force, tmp); 1419 insert_ob_in_ob (force, tmp);
1436 change_abil (tmp, force); /* Mostly to display any messages */ 1420 change_abil (tmp, force); /* Mostly to display any messages */
1437 fix_player (tmp); 1421 tmp->update_stats ();
1438 return 1; 1422 return 1;
1439} 1423}
1440 1424
1441/* This used to be part of cast_change_ability, but it really didn't make 1425/* 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 1426 * a lot of sense, since most of the values it derives are from the god
… …
1541 force->stats.wc = spell_ob->stats.wc; 1525 force->stats.wc = spell_ob->stats.wc;
1542 force->stats.ac = spell_ob->stats.ac; 1526 force->stats.ac = spell_ob->stats.ac;
1543 1527
1544 change_abil (tmp, force); /* Mostly to display any messages */ 1528 change_abil (tmp, force); /* Mostly to display any messages */
1545 insert_ob_in_ob (force, tmp); 1529 insert_ob_in_ob (force, tmp);
1546 fix_player (tmp); 1530 tmp->update_stats ();
1547 return 1; 1531 return 1;
1548} 1532}
1549 1533
1550 1534
1551 1535
… …
1565 * For example, if an item is worth 110 gold, you will get 1549 * For example, if an item is worth 110 gold, you will get
1566 * 4 large nuggets, and from 0-10 small nuggets. 1550 * 4 large nuggets, and from 0-10 small nuggets.
1567 * 1551 *
1568 * There is also a chance (1:30) that you will get nothing at all 1552 * There is also a chance (1:30) that you will get nothing at all
1569 * for the object. There is also a maximum weight that will be 1553 * for the object. There is also a maximum weight that will be
1570 * alchemied. 1554 * alchemised.
1571 */ 1555 */
1572 1556
1573/* I didn't feel like passing these as arguements to the 1557/* I didn't feel like passing these as argumeents to the
1574 * two functions that need them. Real values are put in them 1558 * two functions that need them. Real values are put in them
1575 * when the spell is cast, and these are freed when the spell 1559 * when the spell is cast, and these are freed when the spell
1576 * is finished. 1560 * is finished.
1577 */ 1561 */
1578static object *small, *large; 1562static object *small, *large;
… …
1597 else 1581 else
1598 value = (value * 9) / 10; 1582 value = (value * 9) / 10;
1599 1583
1600 value /= 4; // fix by GHJ, don't understand, pcg 1584 value /= 4; // fix by GHJ, don't understand, pcg
1601 1585
1602 if ((obj->value > 0) && rndm (0, 29)) 1586 if (obj->value > 0 && rndm (0, 29))
1603 { 1587 {
1604 int count; 1588 int count;
1605 1589
1606 count = value / large->value; 1590 count = value / large->value;
1607 *large_nuggets += count; 1591 *large_nuggets += count;
… …
1620 (*large_nuggets)++; 1604 (*large_nuggets)++;
1621 *small_nuggets -= large->value / small->value; 1605 *small_nuggets -= large->value / small->value;
1622 if (*small_nuggets && large->value % small->value) 1606 if (*small_nuggets && large->value % small->value)
1623 (*small_nuggets)--; 1607 (*small_nuggets)--;
1624 } 1608 }
1609
1625 weight += obj->weight; 1610 weight += obj->weight;
1626 obj->destroy (); 1611 obj->destroy ();
1627} 1612}
1628 1613
1629static void 1614static void
… …
1640 1625
1641 if (small_nuggets) 1626 if (small_nuggets)
1642 { 1627 {
1643 tmp = small->clone (); 1628 tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1629 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1630 m->insert (tmp, x, y, op, flag);
1648 } 1631 }
1649 1632
1650 if (large_nuggets) 1633 if (large_nuggets)
1651 { 1634 {
1652 tmp = large->clone (); 1635 tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1636 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1637 m->insert (tmp, x, y, op, flag);
1657 } 1638 }
1658} 1639}
1659 1640
1660int 1641int
1661alchemy (object *op, object *caster, object *spell_ob) 1642alchemy (object *op, object *caster, object *spell_ob)
… …
1698 continue; 1679 continue;
1699 1680
1700 small_nuggets = 0; 1681 small_nuggets = 0;
1701 large_nuggets = 0; 1682 large_nuggets = 0;
1702 1683
1703 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next) 1684 for (tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1704 { 1685 {
1705 next = tmp->above; 1686 next = tmp->above;
1687
1706 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1688 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1707 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1689 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1708 { 1690 {
1709
1710 if (tmp->inv) 1691 if (tmp->inv)
1711 { 1692 {
1712 object *next1, *tmp1; 1693 object *next1, *tmp1;
1713 1694
1714 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1695 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1715 { 1696 {
1716 next1 = tmp1->below; 1697 next1 = tmp1->below;
1717 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1698 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1718 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1699 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1719 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1700 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight);
1720 } 1701 }
1721 } 1702 }
1703
1722 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1704 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight);
1723 1705
1724 if (weight > weight_max) 1706 if (weight > weight_max)
1725 { 1707 {
1726 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1708 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
… …
1742 large->destroy (); 1724 large->destroy ();
1743 small->destroy (); 1725 small->destroy ();
1744 /* reset this so that if player standing on a big pile of stuff, 1726 /* reset this so that if player standing on a big pile of stuff,
1745 * it is redrawn properly. 1727 * it is redrawn properly.
1746 */ 1728 */
1747 op->contr->socket->look_position = 0; 1729 op->contr->ns->look_position = 0;
1748 return 1; 1730 return 1;
1749} 1731}
1750 1732
1751 1733
1752/* This function removes the cursed/damned status on equipped 1734/* This function removes the cursed/damned status on equipped
… …
1837 * stuff on the floor. Only identify stuff on the floor if the spell 1819 * stuff on the floor. Only identify stuff on the floor if the spell
1838 * was not fully used. 1820 * was not fully used.
1839 */ 1821 */
1840 if (num_ident) 1822 if (num_ident)
1841 { 1823 {
1842 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1824 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)) 1825 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1844 { 1826 {
1845 identify (tmp); 1827 identify (tmp);
1846 1828
1847 if (op->type == PLAYER) 1829 if (op->type == PLAYER)
… …
1902 * floor. But this is not true for show invisible. 1884 * floor. But this is not true for show invisible.
1903 * Basically, we just go and find the top object and work 1885 * Basically, we just go and find the top object and work
1904 * down - that is easier than working up. 1886 * down - that is easier than working up.
1905 */ 1887 */
1906 1888
1907 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1889 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1908 last = tmp; 1890 last = tmp;
1909 1891
1910 /* Shouldn't happen, but if there are no objects on a space, this 1892 /* Shouldn't happen, but if there are no objects on a space, this
1911 * would happen. 1893 * would happen.
1912 */ 1894 */
… …
1998 */ 1980 */
1999 if (done_one) 1981 if (done_one)
2000 { 1982 {
2001 object *detect_ob = arch_to_object (spell->other_arch); 1983 object *detect_ob = arch_to_object (spell->other_arch);
2002 1984
2003 detect_ob->x = nx;
2004 detect_ob->y = ny;
2005 /* if this is set, we want to copy the face */ 1985 /* if this is set, we want to copy the face */
2006 if (done_one == 2 && detect) 1986 if (done_one == 2 && detect)
2007 { 1987 {
2008 detect_ob->face = detect->face; 1988 detect_ob->face = detect->face;
2009 detect_ob->animation_id = detect->animation_id; 1989 detect_ob->animation_id = detect->animation_id;
… …
2011 detect_ob->last_anim = 0; 1991 detect_ob->last_anim = 0;
2012 /* by default, the detect_ob is already animated */ 1992 /* by default, the detect_ob is already animated */
2013 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1993 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2014 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1994 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2015 } 1995 }
1996
2016 insert_ob_in_map (detect_ob, m, op, 0); 1997 m->insert (detect_ob, nx, ny, op);
2017 } 1998 }
2018 } /* for processing the surrounding spaces */ 1999 } /* for processing the surrounding spaces */
2019 2000
2020 2001
2021 /* Now process objects in the players inventory if detect curse or magic */ 2002 /* Now process objects in the players inventory if detect curse or magic */
… …
2070 2051
2071 /* Explodes a fireball centered at player */ 2052 /* Explodes a fireball centered at player */
2072 tmp = get_archetype (EXPLODING_FIREBALL); 2053 tmp = get_archetype (EXPLODING_FIREBALL);
2073 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2054 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; 2055 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2075 tmp->x = victim->x; 2056
2076 tmp->y = victim->y; 2057 tmp->insert_at (victim);
2077 insert_ob_in_map (tmp, victim->map, NULL, 0);
2078 victim->stats.sp = 2 * victim->stats.maxsp; 2058 victim->stats.sp = 2 * victim->stats.maxsp;
2079 } 2059 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2060 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."); 2061 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) 2062 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2085 {
2086 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2063 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2087 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2064 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2089 { 2065 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2066 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2091 confuse_player (victim, victim, 99); 2067 confuse_player (victim, victim, 99);
2092 } 2068 }
2093 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2069 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2094 {
2095 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2070 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2096 }
2097} 2071}
2098 2072
2099/* cast_transfer 2073/* cast_transfer
2100 * This spell transfers sp from the player to another person. 2074 * This spell transfers sp from the player to another person.
2101 * We let the target go above their normal maximum SP. 2075 * We let the target go above their normal maximum SP.
… …
2115 2089
2116 mflags = get_map_flags (m, &m, x, y, &x, &y); 2090 mflags = get_map_flags (m, &m, x, y, &x, &y);
2117 2091
2118 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 2092 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2119 { 2093 {
2120 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 2094 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2121 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2095 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2122 break; 2096 break;
2123 } 2097 }
2124 2098
2125 2099
2126 /* If we did not find a player in the specified direction, transfer 2100 /* 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. 2101 * to anyone on top of us. This is used for the rune of transference mostly.
2128 */ 2102 */
2129 if (plyr == NULL) 2103 if (plyr == NULL)
2130 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 2104 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)) 2105 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2132 break; 2106 break;
2133 2107
2134 if (!plyr) 2108 if (!plyr)
2135 { 2109 {
… …
2190 m = op->map; 2164 m = op->map;
2191 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 2165 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2192 if (mflags & P_OUT_OF_MAP) 2166 if (mflags & P_OUT_OF_MAP)
2193 return; 2167 return;
2194 2168
2195 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 2169 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2196 { 2170 {
2197 next = tmp->above; 2171 next = tmp->above;
2198 2172
2199 /* Need to look at the head object - otherwise, if tmp 2173 /* Need to look at the head object - otherwise, if tmp
2200 * points to a monster, we don't have all the necessary 2174 * points to a monster, we don't have all the necessary
… …
2375 /* create the golem object */ 2349 /* create the golem object */
2376 tmp = arch_to_object (spell->other_arch); 2350 tmp = arch_to_object (spell->other_arch);
2377 2351
2378 /* if animated by a player, give the player control of the golem */ 2352 /* if animated by a player, give the player control of the golem */
2379 CLEAR_FLAG (tmp, FLAG_MONSTER); 2353 CLEAR_FLAG (tmp, FLAG_MONSTER);
2380 SET_FLAG (tmp, FLAG_FRIENDLY);
2381 tmp->stats.exp = 0; 2354 tmp->stats.exp = 0;
2382 add_friendly_object (tmp); 2355 add_friendly_object (tmp);
2383 tmp->type = GOLEM; 2356 tmp->type = GOLEM;
2384 tmp->set_owner (op); 2357 tmp->set_owner (op);
2385 set_spell_skill (op, caster, spell, tmp); 2358 set_spell_skill (op, caster, spell, tmp);
… …
2398 * so instead, just set it as equipped (otherwise, we need to update 2371 * so instead, just set it as equipped (otherwise, we need to update
2399 * body_info, skills, etc) 2372 * body_info, skills, etc)
2400 */ 2373 */
2401 SET_FLAG (tmp, FLAG_USE_WEAPON); 2374 SET_FLAG (tmp, FLAG_USE_WEAPON);
2402 SET_FLAG (weapon, FLAG_APPLIED); 2375 SET_FLAG (weapon, FLAG_APPLIED);
2403 fix_player (tmp); 2376 tmp->update_stats ();
2404 2377
2405 /* There used to be 'odd' code that basically seemed to take the absolute 2378 /* 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 - 2379 * 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. 2380 * if you're using a crappy weapon, it shouldn't be as good.
2408 */ 2381 */
… …
2460 if (a > 14) 2433 if (a > 14)
2461 a = 14; 2434 a = 14;
2462 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2435 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2463 2436
2464 /* Determine golem's speed */ 2437 /* Determine golem's speed */
2465 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2438 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 2439
2470 if (!spell->race) 2440 if (!spell->race)
2471 { 2441 {
2472 sprintf (buf, "animated %s", &weapon->name); 2442 sprintf (buf, "animated %s", &weapon->name);
2473 tmp->name = buf; 2443 tmp->name = buf;
… …
2475 tmp->face = weapon->face; 2445 tmp->face = weapon->face;
2476 tmp->animation_id = weapon->animation_id; 2446 tmp->animation_id = weapon->animation_id;
2477 tmp->anim_speed = weapon->anim_speed; 2447 tmp->anim_speed = weapon->anim_speed;
2478 tmp->last_anim = weapon->last_anim; 2448 tmp->last_anim = weapon->last_anim;
2479 tmp->state = weapon->state; 2449 tmp->state = weapon->state;
2480 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2450 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 } 2451 }
2490 2452
2491 /* make experience increase in proportion to the strength of the summoned creature. */ 2453 /* 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)); 2454 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2493 2455
2494 tmp->speed_left = -1; 2456 tmp->speed_left = -1;
2495 tmp->x = x;
2496 tmp->y = y;
2497 tmp->direction = dir; 2457 tmp->direction = dir;
2498 insert_ob_in_map (tmp, m, op, 0); 2458
2459 m->insert (tmp, x, y, op);
2499 return 1; 2460 return 1;
2500} 2461}
2501 2462
2502/* cast_daylight() - changes the map darkness level *lower* */ 2463/* cast_daylight() - changes the map darkness level *lower* */
2503 2464
… …
2511 int success; 2472 int success;
2512 2473
2513 if (!op->map) 2474 if (!op->map)
2514 return 0; /* shouldnt happen */ 2475 return 0; /* shouldnt happen */
2515 2476
2516 success = change_map_light (op->map, spell->stats.dam); 2477 success = op->map->change_map_light (spell->stats.dam);
2478
2517 if (!success) 2479 if (!success)
2518 { 2480 {
2519 if (spell->stats.dam < 0) 2481 if (spell->stats.dam < 0)
2520 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2482 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2521 else 2483 else
… …
2598 { 2560 {
2599 aura->destroy (); 2561 aura->destroy ();
2600 return; 2562 return;
2601 } 2563 }
2602 2564
2603 aura->x = env->x;
2604 aura->y = env->y;
2605
2606 /* we need to jump out of the inventory for a bit 2565 /* we need to jump out of the inventory for a bit
2607 * in order to hit the map conveniently. 2566 * in order to hit the map conveniently.
2608 */ 2567 */
2609 insert_ob_in_map (aura, env->map, aura, 0); 2568 aura->insert_at (env, aura);
2610 2569
2611 for (i = 1; i < 9; i++) 2570 for (i = 1; i < 9; i++)
2612 { 2571 {
2613 sint16 nx, ny; 2572 sint16 nx, ny;
2614 2573
… …
2623 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2582 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2624 { 2583 {
2625 hit_map (aura, i, aura->attacktype, 0); 2584 hit_map (aura, i, aura->attacktype, 0);
2626 2585
2627 if (aura->other_arch) 2586 if (aura->other_arch)
2628 { 2587 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 } 2588 }
2636 }
2637 } 2589 }
2590
2638 /* put the aura back in the player's inventory */ 2591 /* put the aura back in the player's inventory */
2639 aura->remove (); 2592 aura->remove ();
2640 insert_ob_in_ob (aura, env); 2593 insert_ob_in_ob (aura, env);
2641} 2594}
2642 2595
… …
2647void 2600void
2648move_peacemaker (object *op) 2601move_peacemaker (object *op)
2649{ 2602{
2650 object *tmp; 2603 object *tmp;
2651 2604
2652 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2605 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2653 { 2606 {
2654 int atk_lev, def_lev; 2607 int atk_lev, def_lev;
2655 object *victim = tmp; 2608 object *victim = tmp;
2656 2609
2657 if (tmp->head) 2610 if (tmp->head)
… …
2723 2676
2724 snprintf (rune, sizeof (rune), "%s\n", msg); 2677 snprintf (rune, sizeof (rune), "%s\n", msg);
2725 2678
2726 tmp->race = op->name; /*Save the owner of the rune */ 2679 tmp->race = op->name; /*Save the owner of the rune */
2727 tmp->msg = rune; 2680 tmp->msg = rune;
2728 tmp->x = op->x; 2681
2729 tmp->y = op->y; 2682 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2731 return 1; 2683 return 1;
2732} 2684}

Diff Legend

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