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.20 by root, Thu Dec 14 04:30:32 2006 UTC vs.
Revision 1.52 by root, Thu May 17 14:14:55 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
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
… …
151 /* If it starts with a letter, presume it is a description */ 154 /* If it starts with a letter, presume it is a description */
152 if (isalpha (*stringarg)) 155 if (isalpha (*stringarg))
153 { 156 {
154 artifact *al = find_artifactlist (missile->type)->items; 157 artifact *al = find_artifactlist (missile->type)->items;
155 158
156 for (; al != NULL; al = al->next) 159 for (; al; al = al->next)
157 if (!strcasecmp (al->item->name, stringarg)) 160 if (!strcasecmp (al->item->name, stringarg))
158 break; 161 break;
159 162
160 if (!al) 163 if (!al)
161 { 164 {
… …
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;
… …
370 * normal applies. 373 * normal applies.
371 */ 374 */
372int 375int
373cast_invisible (object *op, object *caster, object *spell_ob) 376cast_invisible (object *op, object *caster, object *spell_ob)
374{ 377{
375 object *tmp;
376
377 if (op->invisible > 1000) 378 if (op->invisible > 1000)
378 { 379 {
379 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 380 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");
380 return 0; 381 return 0;
381 } 382 }
… …
397 else 398 else
398 op->contr->tmp_invis = 1; 399 op->contr->tmp_invis = 1;
399 400
400 op->contr->hidden = 0; 401 op->contr->hidden = 0;
401 } 402 }
403
402 if (makes_invisible_to (op, op)) 404 if (makes_invisible_to (op, op))
403 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!"); 405 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");
404 else 406 else
405 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!"); 407 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
406 408
407 update_object (op, UP_OBJ_FACE); 409 update_object (op, UP_OBJ_CHANGE);
408 410
409 /* Only search the active objects - only these should actually do 411 /* Only search the active objects - only these should actually do
410 * harm to the player. 412 * harm to the player.
411 */ 413 */
412 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 414 for_all_actives (tmp)
413 if (tmp->enemy == op) 415 if (tmp->enemy == op)
414 tmp->enemy = NULL; 416 tmp->enemy = 0;
417
415 return 1; 418 return 1;
416} 419}
417 420
418/* earth to dust spell. Basically destroys earthwalls in the area. 421/* earth to dust spell. Basically destroys earthwalls in the area.
419 */ 422 */
… …
440 443
441 if (mflags & P_OUT_OF_MAP) 444 if (mflags & P_OUT_OF_MAP)
442 continue; 445 continue;
443 446
444 // earth to dust tears down everything that can be teared down 447 // earth to dust tears down everything that can be teared down
445 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 448 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
446 { 449 {
447 next = tmp->above; 450 next = tmp->above;
448 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 451 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
449 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 452 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
450 } 453 }
451 } 454 }
455
452 return 1; 456 return 1;
453} 457}
454
455 458
456void 459void
457execute_word_of_recall (object *op) 460execute_word_of_recall (object *op)
458{ 461{
459 object *wor = op; 462 if (object *pl = op->in_player ())
460 463 {
461 while (op != NULL && op->type != PLAYER) 464 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."); 465 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 466 else
467 {
468 // remove first so we do not call update_stats
469 op->remove ();
468 enter_exit (op, wor); 470 pl->enter_exit (op);
471 }
472 }
469 473
470 wor->destroy (); 474 op->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'.
474 * we put a force into the player object, so that there is a 478 * we put a force into the player object, so that there is a
475 * time delay effect. 479 * time delay effect.
… …
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 op->insert (dummy);
525
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 526 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
527
522 return 1; 528 return 1;
523} 529}
524 530
525/* cast_wonder 531/* cast_wonder
526 * wonder is really just a spell that will likely cast another 532 * wonder is really just a spell that will likely cast another
… …
556 return cast_spell (op, caster, dir, newspell, NULL); 562 return cast_spell (op, caster, dir, newspell, NULL);
557 } 563 }
558 return 1; 564 return 1;
559} 565}
560 566
561
562int 567int
563perceive_self (object *op) 568perceive_self (object *op)
564{ 569{
570 char buf[MAX_BUF];
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 571 const char *cp = describe_item (op, op);
566 archetype *at = archetype::find (ARCH_DEPLETION); 572 archetype *at = archetype::find (ARCH_DEPLETION);
567 object *tmp; 573 object *tmp;
568 int i; 574 int i;
569 575
570 tmp = find_god (determine_god (op)); 576 tmp = find_god (determine_god (op));
… …
579 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 585 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane");
580 else 586 else
581 { 587 {
582 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 588 new_draw_info (NDI_UNIQUE, 0, op, "You have:");
583 new_draw_info (NDI_UNIQUE, 0, op, cp); 589 new_draw_info (NDI_UNIQUE, 0, op, cp);
590
584 if (tmp != NULL) 591 if (tmp)
585 {
586 for (i = 0; i < NUM_STATS; i++) 592 for (i = 0; i < NUM_STATS; i++)
587 { 593 if (tmp->stats.stat (i) < 0)
588 if (get_attr_value (&tmp->stats, i) < 0)
589 {
590 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -(get_attr_value (&tmp->stats, i))); 594 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -tmp->stats.stat (i));
591 }
592 }
593 }
594 } 595 }
595 596
596 if (is_dragon_pl (op)) 597 if (is_dragon_pl (op))
597 { 598 {
598 /* now grab the 'dragon_ability'-force from the player's inventory */ 599 /* now grab the 'dragon_ability'-force from the player's inventory */
599 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 600 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
600 { 601 {
601 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 602 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force"))
602 { 603 {
603 if (tmp->stats.exp == 0) 604 if (tmp->stats.exp == 0)
604 {
605 sprintf (buf, "Your metabolism isn't focused on anything."); 605 sprintf (buf, "Your metabolism isn't focused on anything.");
606 }
607 else 606 else
608 {
609 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 607 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]);
610 } 608
611 new_draw_info (NDI_UNIQUE, 0, op, buf); 609 new_draw_info (NDI_UNIQUE, 0, op, buf);
612 break; 610 break;
613 } 611 }
614 } 612 }
615 } 613 }
614
616 return 1; 615 return 1;
617} 616}
618 617
619/* int cast_create_town_portal (object *op, object *caster, int dir) 618/* int cast_create_town_portal (object *op, object *caster, int dir)
620 * 619 *
… …
634 * Code by Tchize (david.delbecq@usa.net) 633 * Code by Tchize (david.delbecq@usa.net)
635 */ 634 */
636int 635int
637cast_create_town_portal (object *op, object *caster, object *spell, int dir) 636cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{ 637{
639 object *dummy, *force, *old_force, *tmp; 638 object *dummy, *force, *old_force;
640 archetype *perm_portal; 639 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024]; 640 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap; 641 maptile *exitmap;
644 int op_level; 642 int op_level;
645
646
647 /* 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 * full pathname listed.
650 */
651 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
652 {
653 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
654 return 0;
655 }
656 643
657 /* The first thing to do is to check if we have a marked destination 644 /* The first thing to do is to check if we have a marked destination
658 * dummy is used to make a check inventory for the force 645 * dummy is used to make a check inventory for the force
659 */ 646 */
660 dummy = arch_to_object (spell->other_arch); 647 dummy = arch_to_object (spell->other_arch);
… …
676 */ 663 */
677 dummy->name = op->map->path; 664 dummy->name = op->map->path;
678 EXIT_X (dummy) = op->x; 665 EXIT_X (dummy) = op->x;
679 EXIT_Y (dummy) = op->y; 666 EXIT_Y (dummy) = op->y;
680 insert_ob_in_ob (dummy, op); 667 insert_ob_in_ob (dummy, op);
681 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere."); 668 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind. You feel you are able to come here from anywhere.");
682 return 1; 669 return 1;
683 } 670 }
684 671
685 dummy->destroy (); 672 dummy->destroy ();
686 673
… …
718 * If it has the good name, we destruct it. 705 * If it has the good name, we destruct it.
719 * -We destruct the force indicating that portal. 706 * -We destruct the force indicating that portal.
720 */ 707 */
721 while ((old_force = check_inv_recursive (op, dummy))) 708 while ((old_force = check_inv_recursive (op, dummy)))
722 { 709 {
723 exitx = EXIT_X (old_force); 710 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 711
732 if (exitmap) 712 if (exitmap)
733 { 713 {
714 exitmap->load_sync ();
715
716 int exitx = EXIT_X (old_force);
717 int exity = EXIT_Y (old_force);
718
734 tmp = present_arch (perm_portal, exitmap, exitx, exity); 719 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
735 while (tmp)
736 { 720 {
737 if (tmp->name == old_force->name) 721 if (tmp->name == old_force->name)
738 { 722 {
739 tmp->destroy (); 723 tmp->destroy ();
740 break; 724 break;
741 } 725 }
742
743 tmp = tmp->above;
744 } 726 }
745 } 727 }
746 728
747 old_force->destroy (); 729 old_force->destroy ();
748 LOG (llevDebug, "\n");
749 } 730 }
750 731
751 dummy->destroy (); 732 dummy->destroy ();
752 733
753 /* Creating the portals. 734 /* Creating the portals.
… …
759 * 'force' is the destination of the town portal, which we got 740 * 'force' is the destination of the town portal, which we got
760 * from the players inventory above. 741 * from the players inventory above.
761 */ 742 */
762 743
763 /* Ensure exit map is loaded */ 744 /* Ensure exit map is loaded */
764 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir))) 745 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 746
769 /* If we were unable to load (ex. random map deleted), warn player */ 747 /* If we were unable to load (ex. random map deleted), warn player */
770 if (exitmap == NULL) 748 if (!exitmap)
771 { 749 {
772 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?"); 750 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens. You can't remember where to go!?");
773 force->destroy (); 751 force->destroy ();
774 return 1; 752 return 1;
775 } 753 }
754
755 exitmap->load_sync ();
776 756
777 op_level = caster_level (caster, spell); 757 op_level = caster_level (caster, spell);
778 if (op_level < 15) 758 if (op_level < 15)
779 snprintf (portal_message, 1024, 759 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", 760 "The air moves around you and a huge smell of ammonia surounds you as you pass through %s's tiny portal. Pouah!\n",
781 &op->name); 761 &op->name);
782 else if (op_level < 30) 762 else if (op_level < 30)
783 snprintf (portal_message, 1024, 763 snprintf (portal_message, 1024,
784 "\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name); 764 "%s's portal smells of ozone. You do a lot of movements and finally pass through the small hole in the air\n", &op->name);
785 else if (op_level < 60) 765 else if (op_level < 60)
786 snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n"); 766 snprintf (portal_message, 1024, "A shining door opens in the air in front of you, showing you the path to another place.\n");
787 else 767 else
788 snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n", 768 snprintf (portal_message, 1024, "As you walk through %s's portal, flowers come out from the ground around you. You feel awed.\n",
789 &op->name); 769 &op->name);
790 770
791 /* Create a portal in front of player 771 /* Create a portal in front of player
792 * dummy contain the portal and 772 * dummy contain the portal and
793 * force contain the track to kill it later 773 * force contain the track to kill it later
794 */ 774 */
795
796 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 775 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
797 dummy = get_archetype (spell->slaying); /*The portal */ 776 dummy = get_archetype (spell->slaying); /*The portal */
798 if (dummy == NULL) 777 if (dummy == NULL)
799 { 778 {
800 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 779 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
812 791
813 /* Now we need to to create a town portal marker inside the player 792 /* 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 793 * object, so on future castings, we can know that he has an active
815 * town portal. 794 * town portal.
816 */ 795 */
817 tmp = get_archetype (spell->race); 796 object *tmp = get_archetype (spell->race);
818 if (tmp == NULL) 797
798 if (!tmp)
819 { 799 {
820 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 800 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); 801 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
822 return 0; 802 return 0;
823 } 803 }
824 804
825 tmp->race = op->map->path; 805 tmp->race = op->map->path;
826 tmp->name = portal_name; 806 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x; 807 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y; 808 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op); 809 op->insert (tmp);
830 810
831 /* Create a portal in the destination map 811 /* Create a portal in the destination map
832 * dummy contain the portal and 812 * dummy contain the portal and
833 * force the track to kill it later 813 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of 814 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to. 815 * where this portal goes to.
836 */ 816 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 817 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */ 818 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL) 819 if (dummy == NULL)
840 { 820 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 821 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); 822 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; 826 EXIT_PATH (dummy) = op->map->path;
847 EXIT_X (dummy) = op->x; 827 EXIT_X (dummy) = op->x;
848 EXIT_Y (dummy) = op->y; 828 EXIT_Y (dummy) = op->y;
849 dummy->name = dummy->name_pl = portal_name; 829 dummy->name = dummy->name_pl = portal_name;
850 dummy->msg = portal_message; 830 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 */ 831 dummy->race = op->name; /*Save the owner of the portal */
854 insert_ob_in_map (dummy, exitmap, op, 0); 832 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
855 833
856 /* Now we create another town portal marker that 834 /* Now we create another town portal marker that
857 * points back to the one we just made 835 * points back to the one we just made
858 */ 836 */
859 tmp = get_archetype (spell->race); 837 tmp = get_archetype (spell->race);
… …
876 force->destroy (); 854 force->destroy ();
877 855
878 return 1; 856 return 1;
879} 857}
880 858
881
882/* This creates magic walls. Really, it can create most any object, 859/* This creates magic walls. Really, it can create most any object,
883 * within some reason. 860 * within some reason.
884 */ 861 */
885
886int 862int
887magic_wall (object *op, object *caster, int dir, object *spell_ob) 863magic_wall (object *op, object *caster, int dir, object *spell_ob)
888{ 864{
889 object *tmp, *tmp2; 865 object *tmp;
890 int i, posblocked, negblocked, maxrange; 866 int i, posblocked, negblocked, maxrange;
891 sint16 x, y; 867 sint16 x, y;
892 maptile *m; 868 maptile *m;
893 const char *name; 869 const char *name;
894 archetype *at; 870 archetype *at;
… …
902 else 878 else
903 { 879 {
904 x = op->x + freearr_x[dir]; 880 x = op->x + freearr_x[dir];
905 y = op->y + freearr_y[dir]; 881 y = op->y + freearr_y[dir];
906 } 882 }
883
907 m = op->map; 884 m = op->map;
908 885
909 if ((spell_ob->move_block || x != op->x || y != op->y) && 886 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) || 887 (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))) 888 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
912 { 889 {
913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 890 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
914 return 0; 891 return 0;
915 } 892 }
893
916 if (spell_ob->other_arch) 894 if (spell_ob->other_arch)
917 {
918 tmp = arch_to_object (spell_ob->other_arch); 895 tmp = arch_to_object (spell_ob->other_arch);
919 }
920 else if (spell_ob->race) 896 else if (spell_ob->race)
921 { 897 {
922 char buf1[MAX_BUF]; 898 char buf1[MAX_BUF];
923 899
924 sprintf (buf1, spell_ob->race, dir); 900 sprintf (buf1, spell_ob->race, dir);
… …
927 { 903 {
928 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 904 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
929 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 905 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
930 return 0; 906 return 0;
931 } 907 }
908
932 tmp = arch_to_object (at); 909 tmp = arch_to_object (at);
933 } 910 }
934 else 911 else
935 { 912 {
936 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 913 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
946 } 923 }
947 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 924 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
948 { 925 {
949 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 926 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
950 tmp->stats.maxhp = tmp->stats.hp; 927 tmp->stats.maxhp = tmp->stats.hp;
951 tmp->set_owner (op);
952 set_spell_skill (op, caster, spell_ob, tmp);
953 } 928 }
929
954 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 930 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
955 { 931 {
956 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 932 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
957 SET_FLAG (tmp, FLAG_IS_USED_UP); 933 SET_FLAG (tmp, FLAG_IS_USED_UP);
958 } 934 }
935
959 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 936 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
960 { 937 {
961 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 938 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
962 tmp->stats.maxhp = tmp->stats.hp; 939 tmp->stats.maxhp = tmp->stats.hp;
963 SET_FLAG (tmp, FLAG_TEAR_DOWN); 940 SET_FLAG (tmp, FLAG_TEAR_DOWN);
964 SET_FLAG (tmp, FLAG_ALIVE); 941 SET_FLAG (tmp, FLAG_ALIVE);
965 } 942 }
966 943
967 /* This can't really hurt - if the object doesn't kill anything, 944 /* This can't really hurt - if the object doesn't kill anything,
968 * these fields just won't be used. 945 * these fields just won't be used. Do not set the owner for
946 * earthwalls, though, so they survive restarts.
969 */ 947 */
948 if (tmp->type != EARTHWALL) //TODO
970 tmp->set_owner (op); 949 tmp->set_owner (op);
950
971 set_spell_skill (op, caster, spell_ob, tmp); 951 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; 952 tmp->level = caster_level (caster, spell_ob) / 2;
975 953
976 name = tmp->name; 954 name = tmp->name;
977 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 955 if (!(tmp = m->insert (tmp, x, y, op)))
978 { 956 {
979 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 957 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
980 return 0; 958 return 0;
981 } 959 }
960
982 /* If this is a spellcasting wall, need to insert the spell object */ 961 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 962 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 963 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 964
986 /* This code causes the wall to extend some distance in 965 /* This code causes the wall to extend some distance in
… …
1004 m = tmp->map; 983 m = tmp->map;
1005 984
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 985 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) 986 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 987 {
1009 tmp2 = tmp->clone (); 988 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 989 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 990
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 991 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 992 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 993 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 994
1017 } 995 }
1018 else 996 else
1019 posblocked = 1; 997 posblocked = 1;
1020 998
… …
1023 m = tmp->map; 1001 m = tmp->map;
1024 1002
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1003 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1026 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 1004 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 1005 {
1028 tmp2 = tmp->clone (); 1006 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 1007 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 1008
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1009 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1010 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1011 }
1035 else 1012 else
1036 negblocked = 1; 1013 negblocked = 1;
1037 } 1014 }
1038 1015
… …
1087 { 1064 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1065 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1066 op->contr->count = 0;
1090 return 0; 1067 return 0;
1091 } 1068 }
1069
1092 op->contr->count = 0; 1070 op->contr->count = 0;
1093 1071
1094 /* Remove code that puts player on random space on maps. IMO, 1072 /* 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, 1073 * 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 1074 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1123 return 0;
1146 } 1124 }
1147 } 1125 }
1148 1126
1149 /* Actually move the player now */ 1127 /* Actually move the player now */
1150 op->remove (); 1128 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; 1129 return 1;
1155 1130
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1131 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1132 return 1;
1158} 1133}
… …
1171 object *poison; 1146 object *poison;
1172 int heal = 0, success = 0; 1147 int heal = 0, success = 0;
1173 1148
1174 tmp = find_target_for_friendly_spell (op, dir); 1149 tmp = find_target_for_friendly_spell (op, dir);
1175 1150
1176 if (tmp == NULL) 1151 if (!tmp)
1177 return 0; 1152 return 0;
1178 1153
1179 /* Figure out how many hp this spell might cure. 1154 /* Figure out how many hp this spell might cure.
1180 * could be zero if this spell heals effects, not damage. 1155 * could be zero if this spell heals effects, not damage.
1181 */ 1156 */
… …
1184 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp; 1159 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1185 1160
1186 if (heal) 1161 if (heal)
1187 { 1162 {
1188 if (tmp->stats.hp >= tmp->stats.maxhp) 1163 if (tmp->stats.hp >= tmp->stats.maxhp)
1189 {
1190 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed."); 1164 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1191 }
1192 else 1165 else
1193 { 1166 {
1194 /* See how many points we actually heal. Instead of messages 1167 /* See how many points we actually heal. Instead of messages
1195 * based on type of spell, we instead do messages based 1168 * based on type of spell, we instead do messages based
1196 * on amount of damage healed. 1169 * on amount of damage healed.
… …
1198 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 1171 if (heal > (tmp->stats.maxhp - tmp->stats.hp))
1199 heal = tmp->stats.maxhp - tmp->stats.hp; 1172 heal = tmp->stats.maxhp - tmp->stats.hp;
1200 tmp->stats.hp += heal; 1173 tmp->stats.hp += heal;
1201 1174
1202 if (tmp->stats.hp >= tmp->stats.maxhp) 1175 if (tmp->stats.hp >= tmp->stats.maxhp)
1203 {
1204 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 1176 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1205 }
1206 else if (heal > 50) 1177 else if (heal > 50)
1207 {
1208 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!"); 1178 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1209 }
1210 else if (heal > 25) 1179 else if (heal > 25)
1211 {
1212 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close."); 1180 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1213 }
1214 else if (heal > 10) 1181 else if (heal > 10)
1215 {
1216 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade."); 1182 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1217 }
1218 else 1183 else
1219 {
1220 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close."); 1184 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1221 } 1185
1222 success = 1; 1186 success = 1;
1223 } 1187 }
1224 } 1188 }
1189
1225 if (spell->attacktype & AT_DISEASE) 1190 if (spell->attacktype & AT_DISEASE)
1226 if (cure_disease (tmp, op)) 1191 if (cure_disease (tmp, op))
1227 success = 1; 1192 success = 1;
1228 1193
1229 if (spell->attacktype & AT_POISON) 1194 if (spell->attacktype & AT_POISON)
… …
1235 success = 1; 1200 success = 1;
1236 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 1201 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1237 poison->stats.food = 1; 1202 poison->stats.food = 1;
1238 } 1203 }
1239 } 1204 }
1205
1240 if (spell->attacktype & AT_CONFUSION) 1206 if (spell->attacktype & AT_CONFUSION)
1241 { 1207 {
1242 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 1208 poison = present_in_ob_by_name (FORCE, "confusion", tmp);
1243 if (poison) 1209 if (poison)
1244 { 1210 {
1245 success = 1; 1211 success = 1;
1246 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 1212 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1247 poison->duration = 1; 1213 poison->duration = 1;
1248 } 1214 }
1249 } 1215 }
1216
1250 if (spell->attacktype & AT_BLIND) 1217 if (spell->attacktype & AT_BLIND)
1251 { 1218 {
1252 at = archetype::find ("blindness"); 1219 at = archetype::find ("blindness");
1253 poison = present_arch_in_ob (at, tmp); 1220 poison = present_arch_in_ob (at, tmp);
1254 if (poison) 1221 if (poison)
… …
1256 success = 1; 1223 success = 1;
1257 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 1224 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1258 poison->stats.food = 1; 1225 poison->stats.food = 1;
1259 } 1226 }
1260 } 1227 }
1228
1261 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp) 1229 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1262 { 1230 {
1263 tmp->stats.sp += spell->last_sp; 1231 tmp->stats.sp += spell->last_sp;
1264 if (tmp->stats.sp > tmp->stats.maxsp) 1232 if (tmp->stats.sp > tmp->stats.maxsp)
1265 tmp->stats.sp = tmp->stats.maxsp; 1233 tmp->stats.sp = tmp->stats.maxsp;
1266 success = 1; 1234 success = 1;
1267 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!"); 1235 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1268 } 1236 }
1237
1269 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace) 1238 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1270 { 1239 {
1271 tmp->stats.grace += spell->last_grace; 1240 tmp->stats.grace += spell->last_grace;
1272 if (tmp->stats.grace > tmp->stats.maxgrace) 1241 if (tmp->stats.grace > tmp->stats.maxgrace)
1273 tmp->stats.grace = tmp->stats.maxgrace; 1242 tmp->stats.grace = tmp->stats.maxgrace;
1274 success = 1; 1243 success = 1;
1275 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1244 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1276 } 1245 }
1246
1277 if (spell->stats.food && tmp->stats.food < 999) 1247 if (spell->stats.food && tmp->stats.food < 999)
1278 { 1248 {
1279 tmp->stats.food += spell->stats.food; 1249 tmp->stats.food += spell->stats.food;
1280 if (tmp->stats.food > 999) 1250 if (tmp->stats.food > 999)
1281 tmp->stats.food = 999; 1251 tmp->stats.food = 999;
1282 success = 1; 1252 success = 1;
1283 /* We could do something a bit better like the messages for healing above */ 1253 /* We could do something a bit better like the messages for healing above */
1284 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 1254 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1285 } 1255 }
1256
1286 return success; 1257 return success;
1287} 1258}
1288 1259
1289 1260
1290/* This is used for the spells that gain stats. There are no spells 1261/* This is used for the spells that gain stats. There are no spells
… …
1302}; 1273};
1303 1274
1304int 1275int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1276cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1277{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1278 object *force = NULL;
1309 int i; 1279 int i;
1310 1280
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1281 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1282 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1283 ? find_target_for_friendly_spell (op, dir)
1315 } 1284 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1285
1321 if (tmp == NULL) 1286 if (!tmp)
1322 return 0; 1287 return 0;
1323 1288
1324 /* If we've already got a force of this type, don't add a new one. */ 1289 /* 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) 1290 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1291 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1292 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1293 {
1329 if (tmp2->name == spell_ob->name) 1294 if (tmp2->name == spell_ob->name)
1330 { 1295 {
… …
1388 if (tmp->type == PLAYER) 1353 if (tmp->type == PLAYER)
1389 { 1354 {
1390 /* Stat adjustment spells */ 1355 /* Stat adjustment spells */
1391 for (i = 0; i < NUM_STATS; i++) 1356 for (i = 0; i < NUM_STATS; i++)
1392 { 1357 {
1393 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1358 if (sint8 stat = spell_ob->stats.stat (i))
1394
1395 if (stat)
1396 { 1359 {
1397 sm = 0; 1360 sint8 sm = 0;
1398 for (k = 0; k < stat; k++) 1361 for (sint8 k = 0; k < stat; k++)
1399 sm += rndm (1, 3); 1362 sm += rndm (1, 3);
1400 1363
1401 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1364 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1402 { 1365 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1403 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1366
1404 if (sm < 0) 1367 force->stats.stat (i) = sm;
1405 sm = 0; 1368
1406 }
1407 set_attr_value (&force->stats, i, sm);
1408 if (!sm) 1369 if (!sm)
1409 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1370 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1410 } 1371 }
1411 } 1372 }
1412 } 1373 }
… …
1432 force->stats.ac = spell_ob->stats.ac; 1393 force->stats.ac = spell_ob->stats.ac;
1433 force->attacktype = spell_ob->attacktype; 1394 force->attacktype = spell_ob->attacktype;
1434 1395
1435 insert_ob_in_ob (force, tmp); 1396 insert_ob_in_ob (force, tmp);
1436 change_abil (tmp, force); /* Mostly to display any messages */ 1397 change_abil (tmp, force); /* Mostly to display any messages */
1437 fix_player (tmp); 1398 tmp->update_stats ();
1438 return 1; 1399 return 1;
1439} 1400}
1440 1401
1441/* This used to be part of cast_change_ability, but it really didn't make 1402/* 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 1403 * a lot of sense, since most of the values it derives are from the god
… …
1541 force->stats.wc = spell_ob->stats.wc; 1502 force->stats.wc = spell_ob->stats.wc;
1542 force->stats.ac = spell_ob->stats.ac; 1503 force->stats.ac = spell_ob->stats.ac;
1543 1504
1544 change_abil (tmp, force); /* Mostly to display any messages */ 1505 change_abil (tmp, force); /* Mostly to display any messages */
1545 insert_ob_in_ob (force, tmp); 1506 insert_ob_in_ob (force, tmp);
1546 fix_player (tmp); 1507 tmp->update_stats ();
1547 return 1; 1508 return 1;
1548} 1509}
1549
1550
1551 1510
1552/* Alchemy code by Mark Wedel 1511/* Alchemy code by Mark Wedel
1553 * 1512 *
1554 * This code adds a new spell, called alchemy. Alchemy will turn 1513 * This code adds a new spell, called alchemy. Alchemy will turn
1555 * objects to gold nuggets, the value of the gold nuggets being 1514 * objects to gold nuggets, the value of the gold nuggets being
… …
1565 * For example, if an item is worth 110 gold, you will get 1524 * For example, if an item is worth 110 gold, you will get
1566 * 4 large nuggets, and from 0-10 small nuggets. 1525 * 4 large nuggets, and from 0-10 small nuggets.
1567 * 1526 *
1568 * There is also a chance (1:30) that you will get nothing at all 1527 * 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 1528 * for the object. There is also a maximum weight that will be
1570 * alchemied. 1529 * alchemised.
1571 */ 1530 */
1572
1573/* I didn't feel like passing these as arguements to the
1574 * two functions that need them. Real values are put in them
1575 * when the spell is cast, and these are freed when the spell
1576 * is finished.
1577 */
1578static object *small, *large;
1579
1580static void 1531static void
1581alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight) 1532alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1582{ 1533{
1583 uint64 value = query_cost (obj, NULL, F_TRUE); 1534 uint64 value = query_cost (obj, NULL, F_TRUE);
1584 1535
1585 /* Give third price when we alchemy money (This should hopefully 1536 /* Give third price when we alchemy money (This should hopefully
1586 * make it so that it isn't worth it to alchemy money, sell 1537 * make it so that it isn't worth it to alchemy money, sell
1587 * the nuggets, alchemy the gold from that, etc. 1538 * the nuggets, alchemy the gold from that, etc.
1588 * Otherwise, give 9 silver on the gold for other objects, 1539 * Otherwise, give 9 silver on the gold for other objects,
1589 * so that it would still be more affordable to haul 1540 * so that it would still be more affordable to haul
1590 * the stuff back to town. 1541 * the stuff back to town.
1591 */ 1542 */
1592
1593 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1543 if (QUERY_FLAG (obj, FLAG_UNPAID))
1594 value = 0; 1544 value = 0;
1595 else if (obj->type == MONEY || obj->type == GEM) 1545 else if (obj->type == MONEY || obj->type == GEM)
1596 value /= 3; 1546 value /= 3;
1597 else 1547 else
1598 value = (value * 9) / 10; 1548 value = value * 9 / 10;
1599 1549
1600 value /= 4; // fix by GHJ, don't understand, pcg
1601
1602 if ((obj->value > 0) && rndm (0, 29)) 1550 if (obj->value > 0 && rndm (0, 29))
1603 { 1551 total_value += value;
1604 int count;
1605 1552
1606 count = value / large->value;
1607 *large_nuggets += count;
1608 value -= (uint64) count *(uint64) large->value;
1609
1610 count = value / small->value;
1611 *small_nuggets += count;
1612 }
1613
1614 /* Turn 25 small nuggets into 1 large nugget. If the value
1615 * of large nuggets is not evenly divisable by the small nugget
1616 * value, take off an extra small_nugget (Assuming small_nuggets!=0)
1617 */
1618 if (*small_nuggets * small->value >= large->value)
1619 {
1620 (*large_nuggets)++;
1621 *small_nuggets -= large->value / small->value;
1622 if (*small_nuggets && large->value % small->value)
1623 (*small_nuggets)--;
1624 }
1625 weight += obj->weight; 1553 total_weight += obj->total_weight ();
1554
1626 obj->destroy (); 1555 obj->destroy ();
1627} 1556}
1628 1557
1629static void 1558static void
1630update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y) 1559update_map (object *op, maptile *m, int small_nuggets, object *small, int large_nuggets, object *large, int x, int y)
1631{ 1560{
1632 object *tmp;
1633 int flag = 0; 1561 int flag = 0;
1634 1562
1635 /* Put any nuggets below the player, but we can only pass this 1563 /* Put any nuggets below the player, but we can only pass this
1636 * flag if we are on the same space as the player 1564 * flag if we are on the same space as the player
1637 */ 1565 */
1638 if (x == op->x && y == op->y && op->map == m) 1566 if (x == op->x && y == op->y && op->map == m)
1639 flag = INS_BELOW_ORIGINATOR; 1567 flag = INS_BELOW_ORIGINATOR;
1640 1568
1641 if (small_nuggets) 1569 if (small_nuggets)
1642 { 1570 {
1643 tmp = small->clone (); 1571 object *tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1572 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1573 m->insert (tmp, x, y, op, flag);
1648 } 1574 }
1649 1575
1650 if (large_nuggets) 1576 if (large_nuggets)
1651 { 1577 {
1652 tmp = large->clone (); 1578 object *tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1579 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1580 m->insert (tmp, x, y, op, flag);
1657 } 1581 }
1582
1583 if (object *pl = m->at (x, y).player ())
1584 if (pl->contr->ns)
1585 pl->contr->ns->look_position = 0;
1658} 1586}
1659 1587
1660int 1588int
1661alchemy (object *op, object *caster, object *spell_ob) 1589alchemy (object *op, object *caster, object *spell_ob)
1662{ 1590{
1663 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1664 sint16 nx, ny;
1665 object *next, *tmp;
1666 maptile *mp;
1667
1668 if (op->type != PLAYER) 1591 if (op->type != PLAYER)
1669 return 0; 1592 return 0;
1670 1593
1594 object *large = get_archetype ("largenugget");
1595 object *small = get_archetype ("smallnugget");
1596
1671 /* Put a maximum weight of items that can be alchemied. Limits the power 1597 /* Put a maximum weight of items that can be alchemised. Limits the power
1672 * some, and also prevents people from alcheming every table/chair/clock 1598 * some, and also prevents people from alchemising every table/chair/clock
1673 * in sight 1599 * in sight
1674 */ 1600 */
1675 weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob); 1601 int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1676 weight_max *= 1000; 1602 int weight_max = duration * 1000;
1677 small = get_archetype ("smallnugget"), large = get_archetype ("largenugget"); 1603 uint64 value_max = duration * 1000;
1678 1604
1605 int weight = 0;
1606
1679 for (y = op->y - 1; y <= op->y + 1; y++) 1607 for (int y = op->y - 1; y <= op->y + 1; y++)
1680 { 1608 {
1681 for (x = op->x - 1; x <= op->x + 1; x++) 1609 for (int x = op->x - 1; x <= op->x + 1; x++)
1682 { 1610 {
1611 uint64 value = 0;
1612
1683 nx = x; 1613 sint16 nx = x;
1684 ny = y; 1614 sint16 ny = y;
1685 1615
1686 mp = op->map; 1616 maptile *mp = op->map;
1687 1617
1688 mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny); 1618 int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1689 1619
1690 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC)) 1620 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1691 continue; 1621 continue;
1692 1622
1693 /* Treat alchemy a little differently - most spell effects 1623 /* Treat alchemy a little differently - most spell effects
… …
1695 * ground level effect. 1625 * ground level effect.
1696 */ 1626 */
1697 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK) 1627 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1698 continue; 1628 continue;
1699 1629
1700 small_nuggets = 0; 1630 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1701 large_nuggets = 0;
1702
1703 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next)
1704 { 1631 {
1705 next = tmp->above; 1632 next = tmp->above;
1633
1706 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1634 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1707 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1635 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1708 { 1636 {
1709
1710 if (tmp->inv) 1637 if (tmp->inv)
1711 { 1638 {
1712 object *next1, *tmp1; 1639 object *next1, *tmp1;
1713 1640
1714 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1641 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1715 { 1642 {
1716 next1 = tmp1->below; 1643 next1 = tmp1->below;
1717 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1644 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1718 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1645 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1719 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1646 alchemy_object (tmp1, value, weight);
1720 } 1647 }
1721 } 1648 }
1649
1722 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1650 alchemy_object (tmp, value, weight);
1723 1651
1724 if (weight > weight_max) 1652 if (weight > weight_max)
1725 { 1653 break;
1726 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1727 large->destroy ();
1728 small->destroy ();
1729 return 1;
1730 } 1654 }
1731 } /* is alchemable object */ 1655 }
1732 } /* process all objects on this space */ 1656
1657 value = min (value, value_max);
1658
1659 uint64 count = value / large->value;
1660 int large_nuggets = count;
1661 value -= count * large->value;
1662
1663 count = value / small->value;
1664 int small_nuggets = count;
1733 1665
1734 /* Insert all the nuggets at one time. This probably saves time, but 1666 /* Insert all the nuggets at one time. This probably saves time, but
1735 * it also prevents us from alcheming nuggets that were just created 1667 * it also prevents us from alcheming nuggets that were just created
1736 * with this spell. 1668 * with this spell.
1737 */ 1669 */
1738 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1670 update_map (op, mp, small_nuggets, small, large_nuggets, large, nx, ny);
1739 }
1740 }
1741 1671
1672 if (weight > weight_max)
1673 goto bailout;
1674 }
1675 }
1676
1677bailout:
1742 large->destroy (); 1678 large->destroy ();
1743 small->destroy (); 1679 small->destroy ();
1744 /* reset this so that if player standing on a big pile of stuff,
1745 * it is redrawn properly.
1746 */
1747 op->contr->socket->look_position = 0;
1748 return 1; 1680 return 1;
1749} 1681}
1750 1682
1751 1683
1752/* This function removes the cursed/damned status on equipped 1684/* This function removes the cursed/damned status on equipped
… …
1761 for (tmp = op->inv; tmp; tmp = tmp->below) 1693 for (tmp = op->inv; tmp; tmp = tmp->below)
1762 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1694 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1763 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1695 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1764 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1696 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1765 { 1697 {
1766
1767 was_one++; 1698 was_one++;
1768 if (tmp->level <= caster_level (caster, spell)) 1699 if (tmp->level <= caster_level (caster, spell))
1769 { 1700 {
1770 success++; 1701 success++;
1771 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1702 if (QUERY_FLAG (spell, FLAG_DAMNED))
… …
1780 } 1711 }
1781 1712
1782 if (op->type == PLAYER) 1713 if (op->type == PLAYER)
1783 { 1714 {
1784 if (success) 1715 if (success)
1785 {
1786 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1716 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1787 }
1788 else 1717 else
1789 { 1718 {
1790 if (was_one) 1719 if (was_one)
1791 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1720 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1792 else 1721 else
1793 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items."); 1722 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items.");
1794 } 1723 }
1795 } 1724 }
1725
1796 return success; 1726 return success;
1797} 1727}
1798 1728
1799/* Identifies objects in the players inventory/on the ground */ 1729/* Identifies objects in the players inventory/on the ground */
1800 1730
… …
1807 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1737 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1808 1738
1809 if (num_ident < 1) 1739 if (num_ident < 1)
1810 num_ident = 1; 1740 num_ident = 1;
1811 1741
1812
1813 for (tmp = op->inv; tmp; tmp = tmp->below) 1742 for (tmp = op->inv; tmp; tmp = tmp->below)
1814 { 1743 {
1815 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1744 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1816 { 1745 {
1817 identify (tmp); 1746 identify (tmp);
1747
1818 if (op->type == PLAYER) 1748 if (op->type == PLAYER)
1819 { 1749 {
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1750 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op));
1751
1821 if (tmp->msg) 1752 if (tmp->msg)
1822 { 1753 {
1823 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1754 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1824 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1755 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1825 } 1756 }
1826 } 1757 }
1758
1827 num_ident--; 1759 num_ident--;
1828 success = 1; 1760 success = 1;
1829 if (!num_ident) 1761 if (!num_ident)
1830 break; 1762 break;
1831 } 1763 }
1832 } 1764 }
1765
1833 /* If all the power of the spell has been used up, don't go and identify 1766 /* If all the power of the spell has been used up, don't go and identify
1834 * stuff on the floor. Only identify stuff on the floor if the spell 1767 * stuff on the floor. Only identify stuff on the floor if the spell
1835 * was not fully used. 1768 * was not fully used.
1836 */ 1769 */
1837 if (num_ident) 1770 if (num_ident)
1838 { 1771 {
1839 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1772 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1840 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1773 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1841 { 1774 {
1842
1843 identify (tmp); 1775 identify (tmp);
1776
1844 if (op->type == PLAYER) 1777 if (op->type == PLAYER)
1845 { 1778 {
1846 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1779 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op));
1780
1847 if (tmp->msg) 1781 if (tmp->msg)
1848 { 1782 {
1849 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1783 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1850 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1784 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1851 } 1785 }
1786
1852 esrv_send_item (op, tmp); 1787 esrv_send_item (op, tmp);
1853 } 1788 }
1789
1854 num_ident--; 1790 num_ident--;
1855 success = 1; 1791 success = 1;
1856 if (!num_ident) 1792 if (!num_ident)
1857 break; 1793 break;
1858 } 1794 }
1859 } 1795 }
1796
1860 if (!success) 1797 if (!success)
1861 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1798 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified.");
1862 else 1799 else
1863 {
1864 spell_effect (spell, op->x, op->y, op->map, op); 1800 spell_effect (spell, op->x, op->y, op->map, op);
1865 } 1801
1866 return success; 1802 return success;
1867} 1803}
1868
1869 1804
1870int 1805int
1871cast_detection (object *op, object *caster, object *spell, object *skill) 1806cast_detection (object *op, object *caster, object *spell, object *skill)
1872{ 1807{
1873 object *tmp, *last, *god, *detect; 1808 object *tmp, *last, *god, *detect;
… …
1886 skill = caster; 1821 skill = caster;
1887 1822
1888 for (x = op->x - range; x <= op->x + range; x++) 1823 for (x = op->x - range; x <= op->x + range; x++)
1889 for (y = op->y - range; y <= op->y + range; y++) 1824 for (y = op->y - range; y <= op->y + range; y++)
1890 { 1825 {
1891
1892 m = op->map; 1826 m = op->map;
1893 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1827 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1894 if (mflags & P_OUT_OF_MAP) 1828 if (mflags & P_OUT_OF_MAP)
1895 continue; 1829 continue;
1896 1830
… …
1898 * floor. But this is not true for show invisible. 1832 * floor. But this is not true for show invisible.
1899 * Basically, we just go and find the top object and work 1833 * Basically, we just go and find the top object and work
1900 * down - that is easier than working up. 1834 * down - that is easier than working up.
1901 */ 1835 */
1902 1836
1903 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1837 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1904 last = tmp; 1838 last = tmp;
1839
1905 /* Shouldn't happen, but if there are no objects on a space, this 1840 /* Shouldn't happen, but if there are no objects on a space, this
1906 * would happen. 1841 * would happen.
1907 */ 1842 */
1908 if (!last) 1843 if (!last)
1909 continue; 1844 continue;
… …
1911 done_one = 0; 1846 done_one = 0;
1912 floor = 0; 1847 floor = 0;
1913 detect = NULL; 1848 detect = NULL;
1914 for (tmp = last; tmp; tmp = tmp->below) 1849 for (tmp = last; tmp; tmp = tmp->below)
1915 { 1850 {
1916
1917 /* show invisible */ 1851 /* show invisible */
1918 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1852 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1919 /* Might there be other objects that we can make visibile? */ 1853 /* Might there be other objects that we can make visible? */
1920 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1854 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
1921 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) || 1855 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||
1922 tmp->type == CF_HANDLE || 1856 tmp->type == CF_HANDLE ||
1923 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE || 1857 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||
1924 tmp->type == BUTTON || tmp->type == TELEPORTER || 1858 tmp->type == BUTTON || tmp->type == TELEPORTER ||
… …
1931 { 1865 {
1932 tmp->invisible = 0; 1866 tmp->invisible = 0;
1933 done_one = 1; 1867 done_one = 1;
1934 } 1868 }
1935 } 1869 }
1870
1936 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1871 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1937 floor = 1; 1872 floor = 1;
1938 1873
1939 /* All detections below this point don't descend beneath the floor, 1874 /* All detections below this point don't descend beneath the floor,
1940 * so just continue on. We could be clever and look at the type of 1875 * so just continue on. We could be clever and look at the type of
… …
1993 */ 1928 */
1994 if (done_one) 1929 if (done_one)
1995 { 1930 {
1996 object *detect_ob = arch_to_object (spell->other_arch); 1931 object *detect_ob = arch_to_object (spell->other_arch);
1997 1932
1998 detect_ob->x = nx;
1999 detect_ob->y = ny;
2000 /* if this is set, we want to copy the face */ 1933 /* if this is set, we want to copy the face */
2001 if (done_one == 2 && detect) 1934 if (done_one == 2 && detect)
2002 { 1935 {
2003 detect_ob->face = detect->face; 1936 detect_ob->face = detect->face;
2004 detect_ob->animation_id = detect->animation_id; 1937 detect_ob->animation_id = detect->animation_id;
… …
2006 detect_ob->last_anim = 0; 1939 detect_ob->last_anim = 0;
2007 /* by default, the detect_ob is already animated */ 1940 /* by default, the detect_ob is already animated */
2008 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1941 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2009 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1942 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2010 } 1943 }
1944
2011 insert_ob_in_map (detect_ob, m, op, 0); 1945 m->insert (detect_ob, nx, ny, op);
2012 } 1946 }
2013 } /* for processing the surrounding spaces */ 1947 } /* for processing the surrounding spaces */
2014 1948
2015 1949
2016 /* Now process objects in the players inventory if detect curse or magic */ 1950 /* Now process objects in the players inventory if detect curse or magic */
… …
2065 1999
2066 /* Explodes a fireball centered at player */ 2000 /* Explodes a fireball centered at player */
2067 tmp = get_archetype (EXPLODING_FIREBALL); 2001 tmp = get_archetype (EXPLODING_FIREBALL);
2068 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2002 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2069 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2; 2003 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2070 tmp->x = victim->x; 2004
2071 tmp->y = victim->y; 2005 tmp->insert_at (victim);
2072 insert_ob_in_map (tmp, victim->map, NULL, 0);
2073 victim->stats.sp = 2 * victim->stats.maxsp; 2006 victim->stats.sp = 2 * victim->stats.maxsp;
2074 } 2007 }
2075 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2008 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2076 {
2077 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 2009 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");
2078 }
2079 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 2010 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2080 {
2081 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2011 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2082 }
2083 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2012 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2084 { 2013 {
2085 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2014 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2086 confuse_player (victim, victim, 99); 2015 confuse_player (victim, victim, 99);
2087 } 2016 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2017 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2089 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2018 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2091 }
2092} 2019}
2093 2020
2094/* cast_transfer 2021/* cast_transfer
2095 * This spell transfers sp from the player to another person. 2022 * This spell transfers sp from the player to another person.
2096 * We let the target go above their normal maximum SP. 2023 * We let the target go above their normal maximum SP.
… …
2110 2037
2111 mflags = get_map_flags (m, &m, x, y, &x, &y); 2038 mflags = get_map_flags (m, &m, x, y, &x, &y);
2112 2039
2113 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 2040 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2114 { 2041 {
2115 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 2042 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2116 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2043 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2117 break; 2044 break;
2118 } 2045 }
2119 2046
2120 2047
2121 /* If we did not find a player in the specified direction, transfer 2048 /* If we did not find a player in the specified direction, transfer
2122 * to anyone on top of us. This is used for the rune of transference mostly. 2049 * to anyone on top of us. This is used for the rune of transference mostly.
2123 */ 2050 */
2124 if (plyr == NULL) 2051 if (plyr == NULL)
2125 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 2052 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2126 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2053 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2127 break; 2054 break;
2128 2055
2129 if (!plyr) 2056 if (!plyr)
2130 { 2057 {
… …
2185 m = op->map; 2112 m = op->map;
2186 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 2113 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2187 if (mflags & P_OUT_OF_MAP) 2114 if (mflags & P_OUT_OF_MAP)
2188 return; 2115 return;
2189 2116
2190 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 2117 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2191 { 2118 {
2192 next = tmp->above; 2119 next = tmp->above;
2193 2120
2194 /* Need to look at the head object - otherwise, if tmp 2121 /* Need to look at the head object - otherwise, if tmp
2195 * points to a monster, we don't have all the necessary 2122 * points to a monster, we don't have all the necessary
… …
2207 /* Basically, if the object is magical and not counterspell, 2134 /* Basically, if the object is magical and not counterspell,
2208 * we will more or less remove the object. Don't counterspell 2135 * we will more or less remove the object. Don't counterspell
2209 * monsters either. 2136 * monsters either.
2210 */ 2137 */
2211 2138
2212 if (head->attacktype & AT_MAGIC && 2139 if (head->attacktype & AT_MAGIC
2213 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 2140 && !(head->attacktype & AT_COUNTERSPELL)
2141 && !QUERY_FLAG (head, FLAG_MONSTER)
2142 && (op->level > head->level))
2214 head->destroy (); 2143 head->destroy ();
2215 else 2144 else
2216 switch (head->type) 2145 switch (head->type)
2217 { 2146 {
2218 case SPELL_EFFECT: 2147 case SPELL_EFFECT:
2148 // XXX: Don't affect floor spelleffects. See also XXX comment
2149 // about sanctuary in spell_util.C
2150 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2151 continue;
2152
2219 if (op->level > head->level) 2153 if (op->level > head->level)
2220 head->destroy (); 2154 head->destroy ();
2221 2155
2222 break; 2156 break;
2223 2157
… …
2290 * This code was very odd - code early on would only let players use the spell, 2224 * This code was very odd - code early on would only let players use the spell,
2291 * yet the code wass full of player checks. I've presumed that the code 2225 * yet the code wass full of player checks. I've presumed that the code
2292 * that only let players use it was correct, and removed all the other 2226 * that only let players use it was correct, and removed all the other
2293 * player checks. MSW 2003-01-06 2227 * player checks. MSW 2003-01-06
2294 */ 2228 */
2295
2296int 2229int
2297animate_weapon (object *op, object *caster, object *spell, int dir) 2230animate_weapon (object *op, object *caster, object *spell, int dir)
2298{ 2231{
2299 object *weapon, *tmp; 2232 object *weapon, *tmp;
2300 char buf[MAX_BUF]; 2233 char buf[MAX_BUF];
… …
2312 /* exit if it's not a player using this spell. */ 2245 /* exit if it's not a player using this spell. */
2313 if (op->type != PLAYER) 2246 if (op->type != PLAYER)
2314 return 0; 2247 return 0;
2315 2248
2316 /* if player already has a golem, abort */ 2249 /* if player already has a golem, abort */
2317 if (op->contr->ranges[range_golem]) 2250 if (object *golem = op->contr->golem)
2318 { 2251 {
2319 control_golem (op->contr->ranges[range_golem], dir); 2252 control_golem (golem, dir);
2320 return 0; 2253 return 0;
2321 } 2254 }
2322 2255
2323 /* if no direction specified, pick one */ 2256 /* if no direction specified, pick one */
2324 if (!dir) 2257 if (!dir)
… …
2370 /* create the golem object */ 2303 /* create the golem object */
2371 tmp = arch_to_object (spell->other_arch); 2304 tmp = arch_to_object (spell->other_arch);
2372 2305
2373 /* if animated by a player, give the player control of the golem */ 2306 /* if animated by a player, give the player control of the golem */
2374 CLEAR_FLAG (tmp, FLAG_MONSTER); 2307 CLEAR_FLAG (tmp, FLAG_MONSTER);
2375 SET_FLAG (tmp, FLAG_FRIENDLY);
2376 tmp->stats.exp = 0; 2308 tmp->stats.exp = 0;
2377 add_friendly_object (tmp); 2309 add_friendly_object (tmp);
2378 tmp->type = GOLEM; 2310 tmp->type = GOLEM;
2379 tmp->set_owner (op); 2311 tmp->set_owner (op);
2312 op->contr->golem = tmp;
2380 set_spell_skill (op, caster, spell, tmp); 2313 set_spell_skill (op, caster, spell, tmp);
2381 op->contr->ranges[range_golem] = tmp;
2382 op->contr->shoottype = range_golem;
2383 2314
2384 /* Give the weapon to the golem now. A bit of a hack to check the 2315 /* Give the weapon to the golem now. A bit of a hack to check the
2385 * removed flag - it should only be set if get_split_object was 2316 * removed flag - it should only be set if get_split_object was
2386 * used above. 2317 * used above.
2387 */ 2318 */
2388 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2319 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2389 weapon->remove (); 2320 weapon->remove ();
2321
2390 insert_ob_in_ob (weapon, tmp); 2322 insert_ob_in_ob (weapon, tmp);
2391 esrv_send_item (op, weapon); 2323 esrv_send_item (op, weapon);
2392 /* To do everything necessary to let a golem use the weapon is a pain, 2324 /* To do everything necessary to let a golem use the weapon is a pain,
2393 * so instead, just set it as equipped (otherwise, we need to update 2325 * so instead, just set it as equipped (otherwise, we need to update
2394 * body_info, skills, etc) 2326 * body_info, skills, etc)
2395 */ 2327 */
2396 SET_FLAG (tmp, FLAG_USE_WEAPON); 2328 SET_FLAG (tmp, FLAG_USE_WEAPON);
2397 SET_FLAG (weapon, FLAG_APPLIED); 2329 SET_FLAG (weapon, FLAG_APPLIED);
2398 fix_player (tmp); 2330 tmp->update_stats ();
2399 2331
2400 /* There used to be 'odd' code that basically seemed to take the absolute 2332 /* There used to be 'odd' code that basically seemed to take the absolute
2401 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2333 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2402 * if you're using a crappy weapon, it shouldn't be as good. 2334 * if you're using a crappy weapon, it shouldn't be as good.
2403 */ 2335 */
… …
2455 if (a > 14) 2387 if (a > 14)
2456 a = 14; 2388 a = 14;
2457 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2389 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2458 2390
2459 /* Determine golem's speed */ 2391 /* Determine golem's speed */
2460 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2392 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2461
2462 if (tmp->speed > 3.33)
2463 tmp->speed = 3.33;
2464 2393
2465 if (!spell->race) 2394 if (!spell->race)
2466 { 2395 {
2467 sprintf (buf, "animated %s", &weapon->name); 2396 sprintf (buf, "animated %s", &weapon->name);
2468 tmp->name = buf; 2397 tmp->name = buf;
… …
2470 tmp->face = weapon->face; 2399 tmp->face = weapon->face;
2471 tmp->animation_id = weapon->animation_id; 2400 tmp->animation_id = weapon->animation_id;
2472 tmp->anim_speed = weapon->anim_speed; 2401 tmp->anim_speed = weapon->anim_speed;
2473 tmp->last_anim = weapon->last_anim; 2402 tmp->last_anim = weapon->last_anim;
2474 tmp->state = weapon->state; 2403 tmp->state = weapon->state;
2475 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2404 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2476 {
2477 SET_FLAG (tmp, FLAG_ANIMATE);
2478 }
2479 else
2480 {
2481 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2482 }
2483 update_ob_speed (tmp);
2484 } 2405 }
2485 2406
2486 /* make experience increase in proportion to the strength of the summoned creature. */ 2407 /* make experience increase in proportion to the strength of the summoned creature. */
2487 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2408 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2488 2409
2489 tmp->speed_left = -1; 2410 tmp->speed_left = -1;
2490 tmp->x = x;
2491 tmp->y = y;
2492 tmp->direction = dir; 2411 tmp->direction = dir;
2493 insert_ob_in_map (tmp, m, op, 0); 2412
2413 m->insert (tmp, x, y, op);
2494 return 1; 2414 return 1;
2495} 2415}
2496 2416
2497/* cast_daylight() - changes the map darkness level *lower* */ 2417/* cast_daylight() - changes the map darkness level *lower* */
2498 2418
… …
2506 int success; 2426 int success;
2507 2427
2508 if (!op->map) 2428 if (!op->map)
2509 return 0; /* shouldnt happen */ 2429 return 0; /* shouldnt happen */
2510 2430
2511 success = change_map_light (op->map, spell->stats.dam); 2431 success = op->map->change_map_light (spell->stats.dam);
2432
2512 if (!success) 2433 if (!success)
2513 { 2434 {
2514 if (spell->stats.dam < 0) 2435 if (spell->stats.dam < 0)
2515 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2436 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2516 else 2437 else
… …
2593 { 2514 {
2594 aura->destroy (); 2515 aura->destroy ();
2595 return; 2516 return;
2596 } 2517 }
2597 2518
2598 aura->x = env->x;
2599 aura->y = env->y;
2600
2601 /* we need to jump out of the inventory for a bit 2519 /* we need to jump out of the inventory for a bit
2602 * in order to hit the map conveniently. 2520 * in order to hit the map conveniently.
2603 */ 2521 */
2604 insert_ob_in_map (aura, env->map, aura, 0); 2522 aura->insert_at (env, aura);
2605 2523
2606 for (i = 1; i < 9; i++) 2524 for (i = 1; i < 9; i++)
2607 { 2525 {
2608 sint16 nx, ny; 2526 sint16 nx, ny;
2609 2527
… …
2618 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2536 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2619 { 2537 {
2620 hit_map (aura, i, aura->attacktype, 0); 2538 hit_map (aura, i, aura->attacktype, 0);
2621 2539
2622 if (aura->other_arch) 2540 if (aura->other_arch)
2623 { 2541 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2624 object *new_ob;
2625
2626 new_ob = arch_to_object (aura->other_arch);
2627 new_ob->x = nx;
2628 new_ob->y = ny;
2629 insert_ob_in_map (new_ob, m, aura, 0);
2630 } 2542 }
2631 }
2632 } 2543 }
2544
2633 /* put the aura back in the player's inventory */ 2545 /* put the aura back in the player's inventory */
2634 aura->remove (); 2546 aura->remove ();
2635 insert_ob_in_ob (aura, env); 2547 insert_ob_in_ob (aura, env);
2636} 2548}
2637 2549
… …
2642void 2554void
2643move_peacemaker (object *op) 2555move_peacemaker (object *op)
2644{ 2556{
2645 object *tmp; 2557 object *tmp;
2646 2558
2647 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2559 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2648 { 2560 {
2649 int atk_lev, def_lev; 2561 int atk_lev, def_lev;
2650 object *victim = tmp; 2562 object *victim = tmp;
2651 2563
2652 if (tmp->head) 2564 if (tmp->head)
… …
2718 2630
2719 snprintf (rune, sizeof (rune), "%s\n", msg); 2631 snprintf (rune, sizeof (rune), "%s\n", msg);
2720 2632
2721 tmp->race = op->name; /*Save the owner of the rune */ 2633 tmp->race = op->name; /*Save the owner of the rune */
2722 tmp->msg = rune; 2634 tmp->msg = rune;
2723 tmp->x = op->x; 2635
2724 tmp->y = op->y; 2636 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2725 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2726 return 1; 2637 return 1;
2727} 2638}

Diff Legend

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