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.16 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.42 by root, Wed Mar 14 04:12:29 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;
… …
74 if (!(random_roll (0, 3, op, PREFER_HIGH))) 72 if (!(random_roll (0, 3, op, PREFER_HIGH)))
75 { 73 {
76 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 74 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
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->remove ();
80 wand->destroy (0); 77 wand->destroy ();
81 tmp = get_archetype ("fireball"); 78 tmp = get_archetype ("fireball");
82 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
83 if (!tmp->stats.dam) 81 if (!tmp->stats.dam)
84 tmp->stats.dam = 1; 82 tmp->stats.dam = 1;
83
85 tmp->stats.hp = tmp->stats.dam / 2; 84 tmp->stats.hp = tmp->stats.dam / 2;
85
86 if (tmp->stats.hp < 2) 86 if (tmp->stats.hp < 2)
87 tmp->stats.hp = 2; 87 tmp->stats.hp = 2;
88 tmp->x = op->x; 88
89 tmp->y = op->y; 89 tmp->insert_at (op);
90 insert_ob_in_map (tmp, op->map, NULL, 0);
91 return 1; 90 return 1;
92 } 91 }
93 92
94 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
95 if (wand->inv && wand->inv->level) 95 if (wand->inv && wand->inv->level)
96 ncharges /= wand->inv->level; 96 ncharges /= wand->inv->level;
97 else 97 else
98 { 98 {
99 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));
100 return 0; 100 return 0;
101 } 101 }
102
102 if (!ncharges) 103 if (!ncharges)
103 ncharges = 1; 104 ncharges = 1;
104 105
105 wand->stats.food += ncharges; 106 wand->stats.food += ncharges;
106 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
107 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 109 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
108 { 110 {
109 SET_FLAG (wand, FLAG_ANIMATE); 111 SET_FLAG (wand, FLAG_ANIMATE);
110 wand->speed = wand->arch->clone.speed; 112 wand->set_speed (wand->arch->clone.speed);
111 update_ob_speed (wand);
112 } 113 }
114
113 return 1; 115 return 1;
114} 116}
115 117
116/* 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
117 * 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
… …
158 if (!strcasecmp (al->item->name, stringarg)) 160 if (!strcasecmp (al->item->name, stringarg))
159 break; 161 break;
160 162
161 if (!al) 163 if (!al)
162 { 164 {
163 missile->destroy (0); 165 missile->destroy ();
164 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg); 166 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);
165 return 0; 167 return 0;
166 } 168 }
167 169
168 if (al->item->slaying) 170 if (al->item->slaying)
169 { 171 {
170 missile->destroy (0); 172 missile->destroy ();
171 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg); 173 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);
172 return 0; 174 return 0;
173 } 175 }
174 176
175 give_artifact_abilities (missile, al->item); 177 give_artifact_abilities (missile, al->item);
… …
303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 305 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
304 return 0; 306 return 0;
305 } 307 }
306 if (mflags & P_IS_ALIVE) 308 if (mflags & P_IS_ALIVE)
307 { 309 {
308 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)
309 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)))
310 { 312 {
311 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 313 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
312 if (tmp->head != NULL) 314 if (tmp->head != NULL)
313 tmp = tmp->head; 315 tmp = tmp->head;
… …
371 * normal applies. 373 * normal applies.
372 */ 374 */
373int 375int
374cast_invisible (object *op, object *caster, object *spell_ob) 376cast_invisible (object *op, object *caster, object *spell_ob)
375{ 377{
376 object *tmp;
377
378 if (op->invisible > 1000) 378 if (op->invisible > 1000)
379 { 379 {
380 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");
381 return 0; 381 return 0;
382 } 382 }
… …
398 else 398 else
399 op->contr->tmp_invis = 1; 399 op->contr->tmp_invis = 1;
400 400
401 op->contr->hidden = 0; 401 op->contr->hidden = 0;
402 } 402 }
403
403 if (makes_invisible_to (op, op)) 404 if (makes_invisible_to (op, op))
404 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!");
405 else 406 else
406 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!"); 407 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
407 408
408 update_object (op, UP_OBJ_FACE); 409 update_object (op, UP_OBJ_CHANGE);
409 410
410 /* Only search the active objects - only these should actually do 411 /* Only search the active objects - only these should actually do
411 * harm to the player. 412 * harm to the player.
412 */ 413 */
413 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 414 for_all_actives (tmp)
414 if (tmp->enemy == op) 415 if (tmp->enemy == op)
415 tmp->enemy = NULL; 416 tmp->enemy = 0;
417
416 return 1; 418 return 1;
417} 419}
418 420
419/* earth to dust spell. Basically destroys earthwalls in the area. 421/* earth to dust spell. Basically destroys earthwalls in the area.
420 */ 422 */
… …
441 443
442 if (mflags & P_OUT_OF_MAP) 444 if (mflags & P_OUT_OF_MAP)
443 continue; 445 continue;
444 446
445 // earth to dust tears down everything that can be teared down 447 // earth to dust tears down everything that can be teared down
446 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)
447 { 449 {
448 next = tmp->above; 450 next = tmp->above;
449 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 451 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
450 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 452 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
451 } 453 }
452 } 454 }
455
453 return 1; 456 return 1;
454} 457}
455
456 458
457void 459void
458execute_word_of_recall (object *op) 460execute_word_of_recall (object *op)
459{ 461{
460 object *wor = op; 462 if (object *pl = op->in_player ())
461 463 {
462 while (op != NULL && op->type != PLAYER) 464 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
463 op = op->env;
464
465 if (op != NULL && op->map)
466 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
467 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.");
468 else 466 else
467 {
468 // remove first so we do not call update_stats
469 op->remove ();
469 enter_exit (op, wor); 470 pl->enter_exit (op);
471 }
472 }
470 473
471 wor->remove ();
472 wor->destroy (0); 474 op->destroy ();
473} 475}
474 476
475/* Word of recall causes the player to return 'home'. 477/* Word of recall causes the player to return 'home'.
476 * 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
477 * time delay effect. 479 * time delay effect.
… …
496 { 498 {
497 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 499 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
498 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 500 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
499 return 0; 501 return 0;
500 } 502 }
503
501 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 504 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
502 if (time < 1) 505 if (time < 1)
503 time = 1; 506 time = 1;
504 507
505 /* 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
506 * 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
507 * do anything really odd if it say a -1000 or something. 510 * do anything really odd if it say a -1000 or something.
508 */ 511 */
509 dummy->speed = 0.002; 512 dummy->set_speed (0.002);
510 update_ob_speed (dummy);
511 dummy->speed_left = -dummy->speed * time; 513 dummy->speed_left = -dummy->speed * time;
512 dummy->type = SPELL_EFFECT; 514 dummy->type = SPELL_EFFECT;
513 dummy->subtype = SP_WORD_OF_RECALL; 515 dummy->subtype = SP_WORD_OF_RECALL;
514 516
515 /* 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
516 * nice, but until the map load fails, we can't. 518 * nice, but until the map load fails, we can't.
517 */ 519 */
518 EXIT_PATH (dummy) = op->contr->savebed_map; 520 EXIT_PATH (dummy) = op->contr->savebed_map;
519 EXIT_X (dummy) = op->contr->bed_x; 521 EXIT_X (dummy) = op->contr->bed_x;
520 EXIT_Y (dummy) = op->contr->bed_y; 522 EXIT_Y (dummy) = op->contr->bed_y;
521 523
522 (void) insert_ob_in_ob (dummy, op); 524 op->insert (dummy);
525
523 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
524 return 1; 528 return 1;
525} 529}
526 530
527/* cast_wonder 531/* cast_wonder
528 * wonder is really just a spell that will likely cast another 532 * wonder is really just a spell that will likely cast another
… …
557 } 561 }
558 return cast_spell (op, caster, dir, newspell, NULL); 562 return cast_spell (op, caster, dir, newspell, NULL);
559 } 563 }
560 return 1; 564 return 1;
561} 565}
562
563 566
564int 567int
565perceive_self (object *op) 568perceive_self (object *op)
566{ 569{
567 char *cp = describe_item (op, op), buf[MAX_BUF]; 570 char *cp = describe_item (op, op), buf[MAX_BUF];
… …
601 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 604 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
602 { 605 {
603 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 606 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force"))
604 { 607 {
605 if (tmp->stats.exp == 0) 608 if (tmp->stats.exp == 0)
606 {
607 sprintf (buf, "Your metabolism isn't focused on anything."); 609 sprintf (buf, "Your metabolism isn't focused on anything.");
608 }
609 else 610 else
610 {
611 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 611 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]);
612 } 612
613 new_draw_info (NDI_UNIQUE, 0, op, buf); 613 new_draw_info (NDI_UNIQUE, 0, op, buf);
614 break; 614 break;
615 } 615 }
616 } 616 }
617 } 617 }
618
618 return 1; 619 return 1;
619} 620}
620 621
621/* int cast_create_town_portal (object *op, object *caster, int dir) 622/* int cast_create_town_portal (object *op, object *caster, int dir)
622 * 623 *
… …
636 * Code by Tchize (david.delbecq@usa.net) 637 * Code by Tchize (david.delbecq@usa.net)
637 */ 638 */
638int 639int
639cast_create_town_portal (object *op, object *caster, object *spell, int dir) 640cast_create_town_portal (object *op, object *caster, object *spell, int dir)
640{ 641{
641 object *dummy, *force, *old_force, *tmp; 642 object *dummy, *force, *old_force;
642 archetype *perm_portal; 643 archetype *perm_portal;
643 char portal_name[1024], portal_message[1024]; 644 char portal_name[1024], portal_message[1024];
644 sint16 exitx, exity;
645 maptile *exitmap; 645 maptile *exitmap;
646 int op_level; 646 int op_level;
647
648 647
649 /* Check to see if the map the player is currently on is a per player unique 648 /* Check to see if the map the player is currently on is a per player unique
650 * map. This can be determined in that per player unique maps have the 649 * map. This can be determined in that per player unique maps have the
651 * full pathname listed. 650 * full pathname listed.
652 */ 651 */
… …
661 */ 660 */
662 dummy = arch_to_object (spell->other_arch); 661 dummy = arch_to_object (spell->other_arch);
663 if (dummy == NULL) 662 if (dummy == NULL)
664 { 663 {
665 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 664 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
666 LOG (llevError, "get_object failed (force in cast_create_town_portal for %s!\n", &op->name); 665 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
667 return 0; 666 return 0;
668 } 667 }
668
669 force = check_inv_recursive (op, dummy); 669 force = check_inv_recursive (op, dummy);
670 670
671 if (force == NULL) 671 if (force == NULL)
672 { 672 {
673 /* Here we know there is no destination marked up. 673 /* Here we know there is no destination marked up.
… …
680 EXIT_Y (dummy) = op->y; 680 EXIT_Y (dummy) = op->y;
681 insert_ob_in_ob (dummy, op); 681 insert_ob_in_ob (dummy, op);
682 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."); 682 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.");
683 return 1; 683 return 1;
684 } 684 }
685
685 dummy->destroy (0); 686 dummy->destroy ();
686 687
687 /* Here we know where the town portal should go to 688 /* Here we know where the town portal should go to
688 * We should kill any existing portal associated with the player. 689 * We should kill any existing portal associated with the player.
689 * Than we should create the 2 portals. 690 * Than we should create the 2 portals.
690 * For each of them, we need: 691 * For each of them, we need:
… …
703 /* First step: killing existing town portals */ 704 /* First step: killing existing town portals */
704 dummy = get_archetype (spell->race); 705 dummy = get_archetype (spell->race);
705 if (dummy == NULL) 706 if (dummy == NULL)
706 { 707 {
707 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 708 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
708 LOG (llevError, "get_object failed (force) in cast_create_town_portal for %s!\n", &op->name); 709 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
709 return 0; 710 return 0;
710 } 711 }
712
711 perm_portal = archetype::find (spell->slaying); 713 perm_portal = archetype::find (spell->slaying);
712 714
713 /* To kill a town portal, we go trough the player's inventory, 715 /* To kill a town portal, we go trough the player's inventory,
714 * for each marked portal in player's inventory, 716 * for each marked portal in player's inventory,
715 * -We try load the associated map (if impossible, consider the portal destructed) 717 * -We try load the associated map (if impossible, consider the portal destructed)
… …
717 * If it has the good name, we destruct it. 719 * If it has the good name, we destruct it.
718 * -We destruct the force indicating that portal. 720 * -We destruct the force indicating that portal.
719 */ 721 */
720 while ((old_force = check_inv_recursive (op, dummy))) 722 while ((old_force = check_inv_recursive (op, dummy)))
721 { 723 {
722 exitx = EXIT_X (old_force); 724 exitmap = maptile::find_sync (old_force->race, op->map);
723 exity = EXIT_Y (old_force);
724 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
725
726 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
727 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
728 else
729 exitmap = ready_map_name (old_force->race, 0);
730 725
731 if (exitmap) 726 if (exitmap)
732 { 727 {
728 exitmap->load_sync ();
729
730 int exitx = EXIT_X (old_force);
731 int exity = EXIT_Y (old_force);
732
733 tmp = present_arch (perm_portal, exitmap, exitx, exity); 733 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
734 while (tmp)
735 { 734 {
736 if (tmp->name == old_force->name) 735 if (tmp->name == old_force->name)
737 { 736 {
738 tmp->remove ();
739 tmp->destroy (0); 737 tmp->destroy ();
740 break; 738 break;
741 } 739 }
742 else
743 {
744 tmp = tmp->above;
745 }
746 } 740 }
747 } 741 }
748 old_force->remove (); 742
749 old_force->destroy (0); 743 old_force->destroy ();
750 LOG (llevDebug, "\n");
751 } 744 }
745
752 dummy->destroy (0); 746 dummy->destroy ();
753 747
754 /* Creating the portals. 748 /* Creating the portals.
755 * The very first thing to do is to ensure 749 * The very first thing to do is to ensure
756 * access to the destination map. 750 * access to the destination map.
757 * If we can't, don't fizzle. Simply warn player. 751 * If we can't, don't fizzle. Simply warn player.
… …
760 * 'force' is the destination of the town portal, which we got 754 * 'force' is the destination of the town portal, which we got
761 * from the players inventory above. 755 * from the players inventory above.
762 */ 756 */
763 757
764 /* Ensure exit map is loaded */ 758 /* Ensure exit map is loaded */
765 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir))) 759 exitmap = maptile::find_sync (force->name);
766 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
767 else
768 exitmap = ready_map_name (force->name, 0);
769 760
770 /* If we were unable to load (ex. random map deleted), warn player */ 761 /* If we were unable to load (ex. random map deleted), warn player */
771 if (exitmap == NULL) 762 if (!exitmap)
772 { 763 {
773 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?"); 764 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
774 force->remove ();
775 force->destroy (0); 765 force->destroy ();
776 return 1; 766 return 1;
777 } 767 }
768
769 exitmap->load_sync ();
778 770
779 op_level = caster_level (caster, spell); 771 op_level = caster_level (caster, spell);
780 if (op_level < 15) 772 if (op_level < 15)
781 snprintf (portal_message, 1024, 773 snprintf (portal_message, 1024,
782 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n", 774 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
… …
792 784
793 /* Create a portal in front of player 785 /* Create a portal in front of player
794 * dummy contain the portal and 786 * dummy contain the portal and
795 * force contain the track to kill it later 787 * force contain the track to kill it later
796 */ 788 */
797
798 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 789 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
799 dummy = get_archetype (spell->slaying); /*The portal */ 790 dummy = get_archetype (spell->slaying); /*The portal */
800 if (dummy == NULL) 791 if (dummy == NULL)
801 { 792 {
802 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 793 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
803 LOG (llevError, "get_object failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 794 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
804 return 0; 795 return 0;
805 } 796 }
797
806 EXIT_PATH (dummy) = force->name; 798 EXIT_PATH (dummy) = force->name;
807 EXIT_X (dummy) = EXIT_X (force); 799 EXIT_X (dummy) = EXIT_X (force);
808 EXIT_Y (dummy) = EXIT_Y (force); 800 EXIT_Y (dummy) = EXIT_Y (force);
809 dummy->name = dummy->name_pl = portal_name; 801 dummy->name = dummy->name_pl = portal_name;
810 dummy->msg = portal_message; 802 dummy->msg = portal_message;
… …
813 805
814 /* Now we need to to create a town portal marker inside the player 806 /* Now we need to to create a town portal marker inside the player
815 * object, so on future castings, we can know that he has an active 807 * object, so on future castings, we can know that he has an active
816 * town portal. 808 * town portal.
817 */ 809 */
818 tmp = get_archetype (spell->race); 810 object *tmp = get_archetype (spell->race);
819 if (tmp == NULL) 811
812 if (!tmp)
820 { 813 {
821 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 814 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
822 LOG (llevError, "get_object failed (force) in cast_create_town_portal for %s!\n", &op->name); 815 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
823 return 0; 816 return 0;
824 } 817 }
818
825 tmp->race = op->map->path; 819 tmp->race = op->map->path;
826 tmp->name = portal_name; 820 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x; 821 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y; 822 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op); 823 op->insert (tmp);
830 824
831 /* Create a portal in the destination map 825 /* Create a portal in the destination map
832 * dummy contain the portal and 826 * dummy contain the portal and
833 * force the track to kill it later 827 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of 828 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to. 829 * where this portal goes to.
836 */ 830 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 831 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */ 832 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL) 833 if (dummy == NULL)
840 { 834 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 835 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
842 LOG (llevError, "get_object failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 836 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
843 return 0; 837 return 0;
844 } 838 }
839
845 EXIT_PATH (dummy) = op->map->path; 840 EXIT_PATH (dummy) = op->map->path;
846 EXIT_X (dummy) = op->x; 841 EXIT_X (dummy) = op->x;
847 EXIT_Y (dummy) = op->y; 842 EXIT_Y (dummy) = op->y;
848 dummy->name = dummy->name_pl = portal_name; 843 dummy->name = dummy->name_pl = portal_name;
849 dummy->msg = portal_message; 844 dummy->msg = portal_message;
850 dummy->x = EXIT_X (force);
851 dummy->y = EXIT_Y (force);
852 dummy->race = op->name; /*Save the owner of the portal */ 845 dummy->race = op->name; /*Save the owner of the portal */
853 insert_ob_in_map (dummy, exitmap, op, 0); 846 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
854 847
855 /* Now we create another town portal marker that 848 /* Now we create another town portal marker that
856 * points back to the one we just made 849 * points back to the one we just made
857 */ 850 */
858 tmp = get_archetype (spell->race); 851 tmp = get_archetype (spell->race);
859 if (tmp == NULL) 852 if (tmp == NULL)
860 { 853 {
861 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 854 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
862 LOG (llevError, "get_object failed (force) in cast_create_town_portal for %s!\n", &op->name); 855 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
863 return 0; 856 return 0;
864 } 857 }
858
865 tmp->race = force->name; 859 tmp->race = force->name;
866 tmp->name = portal_name; 860 tmp->name = portal_name;
867 EXIT_X (tmp) = dummy->x; 861 EXIT_X (tmp) = dummy->x;
868 EXIT_Y (tmp) = dummy->y; 862 EXIT_Y (tmp) = dummy->y;
869 insert_ob_in_ob (tmp, op); 863 insert_ob_in_ob (tmp, op);
870 864
871 /* Describe the player what happened 865 /* Describe the player what happened
872 */ 866 */
873 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home."); 867 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
874 force->remove (); /* Delete the force inside the player */
875 force->destroy (0); 868 force->destroy ();
869
876 return 1; 870 return 1;
877} 871}
878
879 872
880/* This creates magic walls. Really, it can create most any object, 873/* This creates magic walls. Really, it can create most any object,
881 * within some reason. 874 * within some reason.
882 */ 875 */
883
884int 876int
885magic_wall (object *op, object *caster, int dir, object *spell_ob) 877magic_wall (object *op, object *caster, int dir, object *spell_ob)
886{ 878{
887 object *tmp, *tmp2; 879 object *tmp;
888 int i, posblocked, negblocked, maxrange; 880 int i, posblocked, negblocked, maxrange;
889 sint16 x, y; 881 sint16 x, y;
890 maptile *m; 882 maptile *m;
891 const char *name; 883 const char *name;
892 archetype *at; 884 archetype *at;
… …
900 else 892 else
901 { 893 {
902 x = op->x + freearr_x[dir]; 894 x = op->x + freearr_x[dir];
903 y = op->y + freearr_y[dir]; 895 y = op->y + freearr_y[dir];
904 } 896 }
897
905 m = op->map; 898 m = op->map;
906 899
907 if ((spell_ob->move_block || x != op->x || y != op->y) && 900 if ((spell_ob->move_block || x != op->x || y != op->y) &&
908 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 901 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
909 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 902 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
910 { 903 {
911 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 904 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
912 return 0; 905 return 0;
913 } 906 }
907
914 if (spell_ob->other_arch) 908 if (spell_ob->other_arch)
915 {
916 tmp = arch_to_object (spell_ob->other_arch); 909 tmp = arch_to_object (spell_ob->other_arch);
917 }
918 else if (spell_ob->race) 910 else if (spell_ob->race)
919 { 911 {
920 char buf1[MAX_BUF]; 912 char buf1[MAX_BUF];
921 913
922 sprintf (buf1, spell_ob->race, dir); 914 sprintf (buf1, spell_ob->race, dir);
… …
925 { 917 {
926 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 918 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
927 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 919 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
928 return 0; 920 return 0;
929 } 921 }
922
930 tmp = arch_to_object (at); 923 tmp = arch_to_object (at);
931 } 924 }
932 else 925 else
933 { 926 {
934 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 927 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
944 } 937 }
945 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 938 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
946 { 939 {
947 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 940 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
948 tmp->stats.maxhp = tmp->stats.hp; 941 tmp->stats.maxhp = tmp->stats.hp;
949 set_owner (tmp, op);
950 set_spell_skill (op, caster, spell_ob, tmp);
951 } 942 }
943
952 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 944 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
953 { 945 {
954 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 946 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
955 SET_FLAG (tmp, FLAG_IS_USED_UP); 947 SET_FLAG (tmp, FLAG_IS_USED_UP);
956 } 948 }
949
957 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 950 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
958 { 951 {
959 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 952 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
960 tmp->stats.maxhp = tmp->stats.hp; 953 tmp->stats.maxhp = tmp->stats.hp;
961 SET_FLAG (tmp, FLAG_TEAR_DOWN); 954 SET_FLAG (tmp, FLAG_TEAR_DOWN);
962 SET_FLAG (tmp, FLAG_ALIVE); 955 SET_FLAG (tmp, FLAG_ALIVE);
963 } 956 }
964 957
965 /* This can't really hurt - if the object doesn't kill anything, 958 /* This can't really hurt - if the object doesn't kill anything,
966 * these fields just won't be used. 959 * these fields just won't be used. Do not set the owner for
960 * earthwalls, though, so they survive restarts.
967 */ 961 */
968 set_owner (tmp, op); 962 if (tmp->type != EARTHWALL) //TODO
963 tmp->set_owner (op);
964
969 set_spell_skill (op, caster, spell_ob, tmp); 965 set_spell_skill (op, caster, spell_ob, tmp);
970 tmp->x = x;
971 tmp->y = y;
972 tmp->level = caster_level (caster, spell_ob) / 2; 966 tmp->level = caster_level (caster, spell_ob) / 2;
973 967
974 name = tmp->name; 968 name = tmp->name;
975 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 969 if (!(tmp = m->insert (tmp, x, y, op)))
976 { 970 {
977 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 971 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
978 return 0; 972 return 0;
979 } 973 }
974
980 /* If this is a spellcasting wall, need to insert the spell object */ 975 /* If this is a spellcasting wall, need to insert the spell object */
981 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 976 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
982 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 977 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
983 978
984 /* This code causes the wall to extend some distance in 979 /* This code causes the wall to extend some distance in
… …
1002 m = tmp->map; 997 m = tmp->map;
1003 998
1004 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 999 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1005 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked) 1000 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1006 { 1001 {
1007 tmp2 = get_object (); 1002 object *tmp2 = tmp->clone ();
1008 copy_object (tmp, tmp2); 1003 m->insert (tmp2, x, y, op);
1009 tmp2->x = x; 1004
1010 tmp2->y = y;
1011 insert_ob_in_map (tmp2, m, op, 0);
1012 /* If this is a spellcasting wall, need to insert the spell object */ 1005 /* If this is a spellcasting wall, need to insert the spell object */
1013 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1006 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1014 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1007 tmp2->insert (arch_to_object (tmp2->other_arch));
1015 1008
1016 } 1009 }
1017 else 1010 else
1018 posblocked = 1; 1011 posblocked = 1;
1019 1012
… …
1022 m = tmp->map; 1015 m = tmp->map;
1023 1016
1024 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1017 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1025 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 1018 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1026 { 1019 {
1027 tmp2 = get_object (); 1020 object *tmp2 = tmp->clone ();
1028 copy_object (tmp, tmp2); 1021 m->insert (tmp2, x, y, op);
1029 tmp2->x = x; 1022
1030 tmp2->y = y;
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1023 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1024 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1025 }
1035 else 1026 else
1036 negblocked = 1; 1027 negblocked = 1;
1037 } 1028 }
1038 1029
… …
1087 { 1078 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1079 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1080 op->contr->count = 0;
1090 return 0; 1081 return 0;
1091 } 1082 }
1083
1092 op->contr->count = 0; 1084 op->contr->count = 0;
1093 1085
1094 /* Remove code that puts player on random space on maps. IMO, 1086 /* 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, 1087 * 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 1088 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1137 return 0;
1146 } 1138 }
1147 } 1139 }
1148 1140
1149 /* Actually move the player now */ 1141 /* Actually move the player now */
1150 op->remove (); 1142 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; 1143 return 1;
1155 1144
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1145 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1146 return 1;
1158} 1147}
… …
1171 object *poison; 1160 object *poison;
1172 int heal = 0, success = 0; 1161 int heal = 0, success = 0;
1173 1162
1174 tmp = find_target_for_friendly_spell (op, dir); 1163 tmp = find_target_for_friendly_spell (op, dir);
1175 1164
1176 if (tmp == NULL) 1165 if (!tmp)
1177 return 0; 1166 return 0;
1178 1167
1179 /* Figure out how many hp this spell might cure. 1168 /* Figure out how many hp this spell might cure.
1180 * could be zero if this spell heals effects, not damage. 1169 * could be zero if this spell heals effects, not damage.
1181 */ 1170 */
… …
1184 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp; 1173 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1185 1174
1186 if (heal) 1175 if (heal)
1187 { 1176 {
1188 if (tmp->stats.hp >= tmp->stats.maxhp) 1177 if (tmp->stats.hp >= tmp->stats.maxhp)
1189 {
1190 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed."); 1178 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1191 }
1192 else 1179 else
1193 { 1180 {
1194 /* See how many points we actually heal. Instead of messages 1181 /* See how many points we actually heal. Instead of messages
1195 * based on type of spell, we instead do messages based 1182 * based on type of spell, we instead do messages based
1196 * on amount of damage healed. 1183 * on amount of damage healed.
… …
1198 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 1185 if (heal > (tmp->stats.maxhp - tmp->stats.hp))
1199 heal = tmp->stats.maxhp - tmp->stats.hp; 1186 heal = tmp->stats.maxhp - tmp->stats.hp;
1200 tmp->stats.hp += heal; 1187 tmp->stats.hp += heal;
1201 1188
1202 if (tmp->stats.hp >= tmp->stats.maxhp) 1189 if (tmp->stats.hp >= tmp->stats.maxhp)
1203 {
1204 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 1190 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1205 }
1206 else if (heal > 50) 1191 else if (heal > 50)
1207 {
1208 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!"); 1192 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1209 }
1210 else if (heal > 25) 1193 else if (heal > 25)
1211 {
1212 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close."); 1194 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1213 }
1214 else if (heal > 10) 1195 else if (heal > 10)
1215 {
1216 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade."); 1196 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1217 }
1218 else 1197 else
1219 {
1220 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close."); 1198 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1221 } 1199
1222 success = 1; 1200 success = 1;
1223 } 1201 }
1224 } 1202 }
1203
1225 if (spell->attacktype & AT_DISEASE) 1204 if (spell->attacktype & AT_DISEASE)
1226 if (cure_disease (tmp, op)) 1205 if (cure_disease (tmp, op))
1227 success = 1; 1206 success = 1;
1228 1207
1229 if (spell->attacktype & AT_POISON) 1208 if (spell->attacktype & AT_POISON)
… …
1235 success = 1; 1214 success = 1;
1236 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 1215 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1237 poison->stats.food = 1; 1216 poison->stats.food = 1;
1238 } 1217 }
1239 } 1218 }
1219
1240 if (spell->attacktype & AT_CONFUSION) 1220 if (spell->attacktype & AT_CONFUSION)
1241 { 1221 {
1242 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 1222 poison = present_in_ob_by_name (FORCE, "confusion", tmp);
1243 if (poison) 1223 if (poison)
1244 { 1224 {
1245 success = 1; 1225 success = 1;
1246 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 1226 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1247 poison->duration = 1; 1227 poison->duration = 1;
1248 } 1228 }
1249 } 1229 }
1230
1250 if (spell->attacktype & AT_BLIND) 1231 if (spell->attacktype & AT_BLIND)
1251 { 1232 {
1252 at = archetype::find ("blindness"); 1233 at = archetype::find ("blindness");
1253 poison = present_arch_in_ob (at, tmp); 1234 poison = present_arch_in_ob (at, tmp);
1254 if (poison) 1235 if (poison)
… …
1256 success = 1; 1237 success = 1;
1257 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 1238 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1258 poison->stats.food = 1; 1239 poison->stats.food = 1;
1259 } 1240 }
1260 } 1241 }
1242
1261 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp) 1243 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1262 { 1244 {
1263 tmp->stats.sp += spell->last_sp; 1245 tmp->stats.sp += spell->last_sp;
1264 if (tmp->stats.sp > tmp->stats.maxsp) 1246 if (tmp->stats.sp > tmp->stats.maxsp)
1265 tmp->stats.sp = tmp->stats.maxsp; 1247 tmp->stats.sp = tmp->stats.maxsp;
1266 success = 1; 1248 success = 1;
1267 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!"); 1249 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1268 } 1250 }
1251
1269 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace) 1252 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1270 { 1253 {
1271 tmp->stats.grace += spell->last_grace; 1254 tmp->stats.grace += spell->last_grace;
1272 if (tmp->stats.grace > tmp->stats.maxgrace) 1255 if (tmp->stats.grace > tmp->stats.maxgrace)
1273 tmp->stats.grace = tmp->stats.maxgrace; 1256 tmp->stats.grace = tmp->stats.maxgrace;
1274 success = 1; 1257 success = 1;
1275 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1258 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1276 } 1259 }
1260
1277 if (spell->stats.food && tmp->stats.food < 999) 1261 if (spell->stats.food && tmp->stats.food < 999)
1278 { 1262 {
1279 tmp->stats.food += spell->stats.food; 1263 tmp->stats.food += spell->stats.food;
1280 if (tmp->stats.food > 999) 1264 if (tmp->stats.food > 999)
1281 tmp->stats.food = 999; 1265 tmp->stats.food = 999;
1282 success = 1; 1266 success = 1;
1283 /* We could do something a bit better like the messages for healing above */ 1267 /* 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"); 1268 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1285 } 1269 }
1270
1286 return success; 1271 return success;
1287} 1272}
1288 1273
1289 1274
1290/* This is used for the spells that gain stats. There are no spells 1275/* This is used for the spells that gain stats. There are no spells
… …
1302}; 1287};
1303 1288
1304int 1289int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1290cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1291{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1292 object *force = NULL;
1309 int i; 1293 int i;
1310 1294
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1295 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1296 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1297 ? find_target_for_friendly_spell (op, dir)
1315 } 1298 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1299
1321 if (tmp == NULL) 1300 if (!tmp)
1322 return 0; 1301 return 0;
1323 1302
1324 /* If we've already got a force of this type, don't add a new one. */ 1303 /* 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) 1304 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1305 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1306 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1307 {
1329 if (tmp2->name == spell_ob->name) 1308 if (tmp2->name == spell_ob->name)
1330 { 1309 {
… …
1432 force->stats.ac = spell_ob->stats.ac; 1411 force->stats.ac = spell_ob->stats.ac;
1433 force->attacktype = spell_ob->attacktype; 1412 force->attacktype = spell_ob->attacktype;
1434 1413
1435 insert_ob_in_ob (force, tmp); 1414 insert_ob_in_ob (force, tmp);
1436 change_abil (tmp, force); /* Mostly to display any messages */ 1415 change_abil (tmp, force); /* Mostly to display any messages */
1437 fix_player (tmp); 1416 tmp->update_stats ();
1438 return 1; 1417 return 1;
1439} 1418}
1440 1419
1441/* This used to be part of cast_change_ability, but it really didn't make 1420/* 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 1421 * a lot of sense, since most of the values it derives are from the god
… …
1541 force->stats.wc = spell_ob->stats.wc; 1520 force->stats.wc = spell_ob->stats.wc;
1542 force->stats.ac = spell_ob->stats.ac; 1521 force->stats.ac = spell_ob->stats.ac;
1543 1522
1544 change_abil (tmp, force); /* Mostly to display any messages */ 1523 change_abil (tmp, force); /* Mostly to display any messages */
1545 insert_ob_in_ob (force, tmp); 1524 insert_ob_in_ob (force, tmp);
1546 fix_player (tmp); 1525 tmp->update_stats ();
1547 return 1; 1526 return 1;
1548} 1527}
1549
1550
1551 1528
1552/* Alchemy code by Mark Wedel 1529/* Alchemy code by Mark Wedel
1553 * 1530 *
1554 * This code adds a new spell, called alchemy. Alchemy will turn 1531 * This code adds a new spell, called alchemy. Alchemy will turn
1555 * objects to gold nuggets, the value of the gold nuggets being 1532 * objects to gold nuggets, the value of the gold nuggets being
… …
1565 * For example, if an item is worth 110 gold, you will get 1542 * For example, if an item is worth 110 gold, you will get
1566 * 4 large nuggets, and from 0-10 small nuggets. 1543 * 4 large nuggets, and from 0-10 small nuggets.
1567 * 1544 *
1568 * There is also a chance (1:30) that you will get nothing at all 1545 * 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 1546 * for the object. There is also a maximum weight that will be
1570 * alchemied. 1547 * alchemised.
1571 */ 1548 */
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 1549static void
1581alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight) 1550alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1582{ 1551{
1583 uint64 value = query_cost (obj, NULL, F_TRUE); 1552 uint64 value = query_cost (obj, NULL, F_TRUE);
1584 1553
1585 /* Give third price when we alchemy money (This should hopefully 1554 /* Give third price when we alchemy money (This should hopefully
1586 * make it so that it isn't worth it to alchemy money, sell 1555 * make it so that it isn't worth it to alchemy money, sell
1587 * the nuggets, alchemy the gold from that, etc. 1556 * the nuggets, alchemy the gold from that, etc.
1588 * Otherwise, give 9 silver on the gold for other objects, 1557 * Otherwise, give 9 silver on the gold for other objects,
1589 * so that it would still be more affordable to haul 1558 * so that it would still be more affordable to haul
1590 * the stuff back to town. 1559 * the stuff back to town.
1591 */ 1560 */
1592
1593 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1561 if (QUERY_FLAG (obj, FLAG_UNPAID))
1594 value = 0; 1562 value = 0;
1595 else if (obj->type == MONEY || obj->type == GEM) 1563 else if (obj->type == MONEY || obj->type == GEM)
1596 value /= 3; 1564 value /= 3;
1597 else 1565 else
1598 value = (value * 9) / 10; 1566 value = value * 9 / 10;
1599 1567
1600 value /= 4; // fix by GHJ, don't understand, pcg
1601
1602 if ((obj->value > 0) && rndm (0, 29)) 1568 if (obj->value > 0 && rndm (0, 29))
1603 { 1569 total_value += value;
1604 int count;
1605 1570
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; 1571 total_weight += obj->total_weight ();
1626 obj->remove (); 1572
1627 obj->destroy (0); 1573 obj->destroy ();
1628} 1574}
1629 1575
1630static void 1576static void
1631update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y) 1577update_map (object *op, maptile *m, int small_nuggets, object *small, int large_nuggets, object *large, int x, int y)
1632{ 1578{
1633 object *tmp;
1634 int flag = 0; 1579 int flag = 0;
1635 1580
1636 /* Put any nuggets below the player, but we can only pass this 1581 /* Put any nuggets below the player, but we can only pass this
1637 * flag if we are on the same space as the player 1582 * flag if we are on the same space as the player
1638 */ 1583 */
1639 if (x == op->x && y == op->y && op->map == m) 1584 if (x == op->x && y == op->y && op->map == m)
1640 flag = INS_BELOW_ORIGINATOR; 1585 flag = INS_BELOW_ORIGINATOR;
1641 1586
1642 if (small_nuggets) 1587 if (small_nuggets)
1643 { 1588 {
1644 tmp = get_object (); 1589 object *tmp = small->clone ();
1645 copy_object (small, tmp);
1646 tmp->nrof = small_nuggets; 1590 tmp->nrof = small_nuggets;
1647 tmp->x = x;
1648 tmp->y = y;
1649 insert_ob_in_map (tmp, m, op, flag); 1591 m->insert (tmp, x, y, op, flag);
1650 } 1592 }
1593
1651 if (large_nuggets) 1594 if (large_nuggets)
1652 { 1595 {
1653 tmp = get_object (); 1596 object *tmp = large->clone ();
1654 copy_object (large, tmp);
1655 tmp->nrof = large_nuggets; 1597 tmp->nrof = large_nuggets;
1656 tmp->x = x;
1657 tmp->y = y;
1658 insert_ob_in_map (tmp, m, op, flag); 1598 m->insert (tmp, x, y, op, flag);
1659 } 1599 }
1600
1601 if (object *pl = m->at (x, y).player ())
1602 if (pl->contr->ns)
1603 pl->contr->ns->look_position = 0;
1660} 1604}
1661 1605
1662int 1606int
1663alchemy (object *op, object *caster, object *spell_ob) 1607alchemy (object *op, object *caster, object *spell_ob)
1664{ 1608{
1665 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1666 sint16 nx, ny;
1667 object *next, *tmp;
1668 maptile *mp;
1669
1670 if (op->type != PLAYER) 1609 if (op->type != PLAYER)
1671 return 0; 1610 return 0;
1672 1611
1612 object *large = get_archetype ("largenugget");
1613 object *small = get_archetype ("smallnugget");
1614
1673 /* Put a maximum weight of items that can be alchemied. Limits the power 1615 /* Put a maximum weight of items that can be alchemised. Limits the power
1674 * some, and also prevents people from alcheming every table/chair/clock 1616 * some, and also prevents people from alchemising every table/chair/clock
1675 * in sight 1617 * in sight
1676 */ 1618 */
1677 weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob); 1619 int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1678 weight_max *= 1000; 1620 int weight_max = duration * 1000;
1679 small = get_archetype ("smallnugget"), large = get_archetype ("largenugget"); 1621 uint64 value_max = duration * 1000;
1680 1622
1623 int weight = 0;
1624
1681 for (y = op->y - 1; y <= op->y + 1; y++) 1625 for (int y = op->y - 1; y <= op->y + 1; y++)
1682 { 1626 {
1683 for (x = op->x - 1; x <= op->x + 1; x++) 1627 for (int x = op->x - 1; x <= op->x + 1; x++)
1684 { 1628 {
1629 uint64 value = 0;
1630
1685 nx = x; 1631 sint16 nx = x;
1686 ny = y; 1632 sint16 ny = y;
1687 1633
1688 mp = op->map; 1634 maptile *mp = op->map;
1689 1635
1690 mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny); 1636 int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1691 1637
1692 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC)) 1638 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1693 continue; 1639 continue;
1694 1640
1695 /* Treat alchemy a little differently - most spell effects 1641 /* Treat alchemy a little differently - most spell effects
… …
1697 * ground level effect. 1643 * ground level effect.
1698 */ 1644 */
1699 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK) 1645 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1700 continue; 1646 continue;
1701 1647
1702 small_nuggets = 0; 1648 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1703 large_nuggets = 0;
1704
1705 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next)
1706 { 1649 {
1707 next = tmp->above; 1650 next = tmp->above;
1651
1708 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1652 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1709 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1653 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1710 { 1654 {
1711
1712 if (tmp->inv) 1655 if (tmp->inv)
1713 { 1656 {
1714 object *next1, *tmp1; 1657 object *next1, *tmp1;
1715 1658
1716 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1659 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1717 { 1660 {
1718 next1 = tmp1->below; 1661 next1 = tmp1->below;
1719 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1662 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1720 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1663 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1721 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1664 alchemy_object (tmp1, value, weight);
1722 } 1665 }
1723 } 1666 }
1667
1724 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1668 alchemy_object (tmp, value, weight);
1725 1669
1726 if (weight > weight_max) 1670 if (weight > weight_max)
1727 { 1671 break;
1728 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1729 large->destroy (0);
1730 small->destroy (0);
1731 return 1;
1732 } 1672 }
1733 } /* is alchemable object */ 1673 }
1734 } /* process all objects on this space */ 1674
1675 value = min (value, value_max);
1676
1677 uint64 count = value / large->value;
1678 int large_nuggets = count;
1679 value -= count * large->value;
1680
1681 count = value / small->value;
1682 int small_nuggets = count;
1735 1683
1736 /* Insert all the nuggets at one time. This probably saves time, but 1684 /* Insert all the nuggets at one time. This probably saves time, but
1737 * it also prevents us from alcheming nuggets that were just created 1685 * it also prevents us from alcheming nuggets that were just created
1738 * with this spell. 1686 * with this spell.
1739 */ 1687 */
1740 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1688 update_map (op, mp, small_nuggets, small, large_nuggets, large, nx, ny);
1689
1690 if (weight > weight_max)
1691 goto bailout;
1741 } 1692 }
1742 } 1693 }
1694
1695bailout:
1743 large->destroy (0); 1696 large->destroy ();
1744 small->destroy (0); 1697 small->destroy ();
1745 /* reset this so that if player standing on a big pile of stuff,
1746 * it is redrawn properly.
1747 */
1748 op->contr->socket.look_position = 0;
1749 return 1; 1698 return 1;
1750} 1699}
1751 1700
1752 1701
1753/* This function removes the cursed/damned status on equipped 1702/* This function removes the cursed/damned status on equipped
… …
1762 for (tmp = op->inv; tmp; tmp = tmp->below) 1711 for (tmp = op->inv; tmp; tmp = tmp->below)
1763 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1712 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1764 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1713 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1765 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1714 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1766 { 1715 {
1767
1768 was_one++; 1716 was_one++;
1769 if (tmp->level <= caster_level (caster, spell)) 1717 if (tmp->level <= caster_level (caster, spell))
1770 { 1718 {
1771 success++; 1719 success++;
1772 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1720 if (QUERY_FLAG (spell, FLAG_DAMNED))
… …
1781 } 1729 }
1782 1730
1783 if (op->type == PLAYER) 1731 if (op->type == PLAYER)
1784 { 1732 {
1785 if (success) 1733 if (success)
1786 {
1787 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1734 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1788 }
1789 else 1735 else
1790 { 1736 {
1791 if (was_one) 1737 if (was_one)
1792 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1738 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1793 else 1739 else
1794 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items."); 1740 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items.");
1795 } 1741 }
1796 } 1742 }
1743
1797 return success; 1744 return success;
1798} 1745}
1799 1746
1800/* Identifies objects in the players inventory/on the ground */ 1747/* Identifies objects in the players inventory/on the ground */
1801 1748
… …
1808 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1755 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1809 1756
1810 if (num_ident < 1) 1757 if (num_ident < 1)
1811 num_ident = 1; 1758 num_ident = 1;
1812 1759
1813
1814 for (tmp = op->inv; tmp; tmp = tmp->below) 1760 for (tmp = op->inv; tmp; tmp = tmp->below)
1815 { 1761 {
1816 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1762 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1817 { 1763 {
1818 identify (tmp); 1764 identify (tmp);
1765
1819 if (op->type == PLAYER) 1766 if (op->type == PLAYER)
1820 { 1767 {
1821 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1768 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op));
1769
1822 if (tmp->msg) 1770 if (tmp->msg)
1823 { 1771 {
1824 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1772 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1825 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1773 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1826 } 1774 }
1827 } 1775 }
1776
1828 num_ident--; 1777 num_ident--;
1829 success = 1; 1778 success = 1;
1830 if (!num_ident) 1779 if (!num_ident)
1831 break; 1780 break;
1832 } 1781 }
1833 } 1782 }
1783
1834 /* If all the power of the spell has been used up, don't go and identify 1784 /* If all the power of the spell has been used up, don't go and identify
1835 * stuff on the floor. Only identify stuff on the floor if the spell 1785 * stuff on the floor. Only identify stuff on the floor if the spell
1836 * was not fully used. 1786 * was not fully used.
1837 */ 1787 */
1838 if (num_ident) 1788 if (num_ident)
1839 { 1789 {
1840 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1790 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1841 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1791 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1842 { 1792 {
1843
1844 identify (tmp); 1793 identify (tmp);
1794
1845 if (op->type == PLAYER) 1795 if (op->type == PLAYER)
1846 { 1796 {
1847 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1797 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op));
1798
1848 if (tmp->msg) 1799 if (tmp->msg)
1849 { 1800 {
1850 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1801 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1851 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1802 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1852 } 1803 }
1804
1853 esrv_send_item (op, tmp); 1805 esrv_send_item (op, tmp);
1854 } 1806 }
1807
1855 num_ident--; 1808 num_ident--;
1856 success = 1; 1809 success = 1;
1857 if (!num_ident) 1810 if (!num_ident)
1858 break; 1811 break;
1859 } 1812 }
1860 } 1813 }
1814
1861 if (!success) 1815 if (!success)
1862 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1816 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified.");
1863 else 1817 else
1864 {
1865 spell_effect (spell, op->x, op->y, op->map, op); 1818 spell_effect (spell, op->x, op->y, op->map, op);
1866 } 1819
1867 return success; 1820 return success;
1868} 1821}
1869
1870 1822
1871int 1823int
1872cast_detection (object *op, object *caster, object *spell, object *skill) 1824cast_detection (object *op, object *caster, object *spell, object *skill)
1873{ 1825{
1874 object *tmp, *last, *god, *detect; 1826 object *tmp, *last, *god, *detect;
… …
1887 skill = caster; 1839 skill = caster;
1888 1840
1889 for (x = op->x - range; x <= op->x + range; x++) 1841 for (x = op->x - range; x <= op->x + range; x++)
1890 for (y = op->y - range; y <= op->y + range; y++) 1842 for (y = op->y - range; y <= op->y + range; y++)
1891 { 1843 {
1892
1893 m = op->map; 1844 m = op->map;
1894 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1845 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1895 if (mflags & P_OUT_OF_MAP) 1846 if (mflags & P_OUT_OF_MAP)
1896 continue; 1847 continue;
1897 1848
… …
1899 * floor. But this is not true for show invisible. 1850 * floor. But this is not true for show invisible.
1900 * Basically, we just go and find the top object and work 1851 * Basically, we just go and find the top object and work
1901 * down - that is easier than working up. 1852 * down - that is easier than working up.
1902 */ 1853 */
1903 1854
1904 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1855 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1905 last = tmp; 1856 last = tmp;
1857
1906 /* Shouldn't happen, but if there are no objects on a space, this 1858 /* Shouldn't happen, but if there are no objects on a space, this
1907 * would happen. 1859 * would happen.
1908 */ 1860 */
1909 if (!last) 1861 if (!last)
1910 continue; 1862 continue;
… …
1912 done_one = 0; 1864 done_one = 0;
1913 floor = 0; 1865 floor = 0;
1914 detect = NULL; 1866 detect = NULL;
1915 for (tmp = last; tmp; tmp = tmp->below) 1867 for (tmp = last; tmp; tmp = tmp->below)
1916 { 1868 {
1917
1918 /* show invisible */ 1869 /* show invisible */
1919 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1870 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1920 /* Might there be other objects that we can make visibile? */ 1871 /* Might there be other objects that we can make visible? */
1921 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1872 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
1922 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) || 1873 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||
1923 tmp->type == CF_HANDLE || 1874 tmp->type == CF_HANDLE ||
1924 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE || 1875 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||
1925 tmp->type == BUTTON || tmp->type == TELEPORTER || 1876 tmp->type == BUTTON || tmp->type == TELEPORTER ||
… …
1932 { 1883 {
1933 tmp->invisible = 0; 1884 tmp->invisible = 0;
1934 done_one = 1; 1885 done_one = 1;
1935 } 1886 }
1936 } 1887 }
1888
1937 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1889 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1938 floor = 1; 1890 floor = 1;
1939 1891
1940 /* All detections below this point don't descend beneath the floor, 1892 /* All detections below this point don't descend beneath the floor,
1941 * so just continue on. We could be clever and look at the type of 1893 * so just continue on. We could be clever and look at the type of
… …
1994 */ 1946 */
1995 if (done_one) 1947 if (done_one)
1996 { 1948 {
1997 object *detect_ob = arch_to_object (spell->other_arch); 1949 object *detect_ob = arch_to_object (spell->other_arch);
1998 1950
1999 detect_ob->x = nx;
2000 detect_ob->y = ny;
2001 /* if this is set, we want to copy the face */ 1951 /* if this is set, we want to copy the face */
2002 if (done_one == 2 && detect) 1952 if (done_one == 2 && detect)
2003 { 1953 {
2004 detect_ob->face = detect->face; 1954 detect_ob->face = detect->face;
2005 detect_ob->animation_id = detect->animation_id; 1955 detect_ob->animation_id = detect->animation_id;
… …
2007 detect_ob->last_anim = 0; 1957 detect_ob->last_anim = 0;
2008 /* by default, the detect_ob is already animated */ 1958 /* by default, the detect_ob is already animated */
2009 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1959 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2010 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1960 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2011 } 1961 }
1962
2012 insert_ob_in_map (detect_ob, m, op, 0); 1963 m->insert (detect_ob, nx, ny, op);
2013 } 1964 }
2014 } /* for processing the surrounding spaces */ 1965 } /* for processing the surrounding spaces */
2015 1966
2016 1967
2017 /* Now process objects in the players inventory if detect curse or magic */ 1968 /* Now process objects in the players inventory if detect curse or magic */
… …
2066 2017
2067 /* Explodes a fireball centered at player */ 2018 /* Explodes a fireball centered at player */
2068 tmp = get_archetype (EXPLODING_FIREBALL); 2019 tmp = get_archetype (EXPLODING_FIREBALL);
2069 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2020 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2070 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2; 2021 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2071 tmp->x = victim->x; 2022
2072 tmp->y = victim->y; 2023 tmp->insert_at (victim);
2073 insert_ob_in_map (tmp, victim->map, NULL, 0);
2074 victim->stats.sp = 2 * victim->stats.maxsp; 2024 victim->stats.sp = 2 * victim->stats.maxsp;
2075 } 2025 }
2076 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2026 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2077 {
2078 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 2027 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");
2079 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 2028 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2081 {
2082 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2029 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2083 }
2084 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2030 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2085 { 2031 {
2086 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2032 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2087 confuse_player (victim, victim, 99); 2033 confuse_player (victim, victim, 99);
2088 } 2034 }
2089 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2035 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2090 {
2091 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2036 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2092 }
2093} 2037}
2094 2038
2095/* cast_transfer 2039/* cast_transfer
2096 * This spell transfers sp from the player to another person. 2040 * This spell transfers sp from the player to another person.
2097 * We let the target go above their normal maximum SP. 2041 * We let the target go above their normal maximum SP.
… …
2111 2055
2112 mflags = get_map_flags (m, &m, x, y, &x, &y); 2056 mflags = get_map_flags (m, &m, x, y, &x, &y);
2113 2057
2114 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 2058 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2115 { 2059 {
2116 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 2060 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2117 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2061 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2118 break; 2062 break;
2119 } 2063 }
2120 2064
2121 2065
2122 /* If we did not find a player in the specified direction, transfer 2066 /* If we did not find a player in the specified direction, transfer
2123 * to anyone on top of us. This is used for the rune of transference mostly. 2067 * to anyone on top of us. This is used for the rune of transference mostly.
2124 */ 2068 */
2125 if (plyr == NULL) 2069 if (plyr == NULL)
2126 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 2070 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2127 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2071 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2128 break; 2072 break;
2129 2073
2130 if (!plyr) 2074 if (!plyr)
2131 { 2075 {
… …
2186 m = op->map; 2130 m = op->map;
2187 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 2131 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2188 if (mflags & P_OUT_OF_MAP) 2132 if (mflags & P_OUT_OF_MAP)
2189 return; 2133 return;
2190 2134
2191 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 2135 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2192 { 2136 {
2193 next = tmp->above; 2137 next = tmp->above;
2194 2138
2195 /* Need to look at the head object - otherwise, if tmp 2139 /* Need to look at the head object - otherwise, if tmp
2196 * points to a monster, we don't have all the necessary 2140 * points to a monster, we don't have all the necessary
… …
2210 * monsters either. 2154 * monsters either.
2211 */ 2155 */
2212 2156
2213 if (head->attacktype & AT_MAGIC && 2157 if (head->attacktype & AT_MAGIC &&
2214 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 2158 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level))
2215 {
2216 head->remove ();
2217 head->destroy (0); 2159 head->destroy ();
2218 }
2219 else 2160 else
2220 switch (head->type) 2161 switch (head->type)
2221 { 2162 {
2222 case SPELL_EFFECT: 2163 case SPELL_EFFECT:
2223 if (op->level > head->level) 2164 if (op->level > head->level)
2224 {
2225 head->remove ();
2226 head->destroy (0); 2165 head->destroy ();
2227 } 2166
2228 break; 2167 break;
2229 2168
2230 /* I really don't get this rune code that much - that 2169 /* I really don't get this rune code that much - that
2231 * random chance seems really low. 2170 * random chance seems really low.
2232 */ 2171 */
2233 case RUNE: 2172 case RUNE:
2234 if (rndm (0, 149) == 0) 2173 if (rndm (0, 149) == 0)
2235 { 2174 {
2236 head->stats.hp--; /* weaken the rune */ 2175 head->stats.hp--; /* weaken the rune */
2237 if (!head->stats.hp) 2176 if (!head->stats.hp)
2238 {
2239 head->remove ();
2240 head->destroy (0); 2177 head->destroy ();
2241 }
2242 } 2178 }
2243 break; 2179 break;
2244 } 2180 }
2245 } 2181 }
2246} 2182}
… …
2379 /* create the golem object */ 2315 /* create the golem object */
2380 tmp = arch_to_object (spell->other_arch); 2316 tmp = arch_to_object (spell->other_arch);
2381 2317
2382 /* if animated by a player, give the player control of the golem */ 2318 /* if animated by a player, give the player control of the golem */
2383 CLEAR_FLAG (tmp, FLAG_MONSTER); 2319 CLEAR_FLAG (tmp, FLAG_MONSTER);
2384 SET_FLAG (tmp, FLAG_FRIENDLY);
2385 tmp->stats.exp = 0; 2320 tmp->stats.exp = 0;
2386 add_friendly_object (tmp); 2321 add_friendly_object (tmp);
2387 tmp->type = GOLEM; 2322 tmp->type = GOLEM;
2388 set_owner (tmp, op); 2323 tmp->set_owner (op);
2389 set_spell_skill (op, caster, spell, tmp); 2324 set_spell_skill (op, caster, spell, tmp);
2390 op->contr->ranges[range_golem] = tmp; 2325 op->contr->ranges[range_golem] = tmp;
2391 op->contr->shoottype = range_golem; 2326 op->contr->shoottype = range_golem;
2392 2327
2393 /* Give the weapon to the golem now. A bit of a hack to check the 2328 /* Give the weapon to the golem now. A bit of a hack to check the
… …
2402 * so instead, just set it as equipped (otherwise, we need to update 2337 * so instead, just set it as equipped (otherwise, we need to update
2403 * body_info, skills, etc) 2338 * body_info, skills, etc)
2404 */ 2339 */
2405 SET_FLAG (tmp, FLAG_USE_WEAPON); 2340 SET_FLAG (tmp, FLAG_USE_WEAPON);
2406 SET_FLAG (weapon, FLAG_APPLIED); 2341 SET_FLAG (weapon, FLAG_APPLIED);
2407 fix_player (tmp); 2342 tmp->update_stats ();
2408 2343
2409 /* There used to be 'odd' code that basically seemed to take the absolute 2344 /* There used to be 'odd' code that basically seemed to take the absolute
2410 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2345 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2411 * if you're using a crappy weapon, it shouldn't be as good. 2346 * if you're using a crappy weapon, it shouldn't be as good.
2412 */ 2347 */
… …
2464 if (a > 14) 2399 if (a > 14)
2465 a = 14; 2400 a = 14;
2466 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2401 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2467 2402
2468 /* Determine golem's speed */ 2403 /* Determine golem's speed */
2469 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2404 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2470
2471 if (tmp->speed > 3.33)
2472 tmp->speed = 3.33;
2473 2405
2474 if (!spell->race) 2406 if (!spell->race)
2475 { 2407 {
2476 sprintf (buf, "animated %s", &weapon->name); 2408 sprintf (buf, "animated %s", &weapon->name);
2477 tmp->name = buf; 2409 tmp->name = buf;
… …
2479 tmp->face = weapon->face; 2411 tmp->face = weapon->face;
2480 tmp->animation_id = weapon->animation_id; 2412 tmp->animation_id = weapon->animation_id;
2481 tmp->anim_speed = weapon->anim_speed; 2413 tmp->anim_speed = weapon->anim_speed;
2482 tmp->last_anim = weapon->last_anim; 2414 tmp->last_anim = weapon->last_anim;
2483 tmp->state = weapon->state; 2415 tmp->state = weapon->state;
2484 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2416 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2485 {
2486 SET_FLAG (tmp, FLAG_ANIMATE);
2487 }
2488 else
2489 {
2490 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2491 }
2492 update_ob_speed (tmp);
2493 } 2417 }
2494 2418
2495 /* make experience increase in proportion to the strength of the summoned creature. */ 2419 /* make experience increase in proportion to the strength of the summoned creature. */
2496 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2420 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2497 2421
2498 tmp->speed_left = -1; 2422 tmp->speed_left = -1;
2499 tmp->x = x;
2500 tmp->y = y;
2501 tmp->direction = dir; 2423 tmp->direction = dir;
2502 insert_ob_in_map (tmp, m, op, 0); 2424
2425 m->insert (tmp, x, y, op);
2503 return 1; 2426 return 1;
2504} 2427}
2505 2428
2506/* cast_daylight() - changes the map darkness level *lower* */ 2429/* cast_daylight() - changes the map darkness level *lower* */
2507 2430
… …
2515 int success; 2438 int success;
2516 2439
2517 if (!op->map) 2440 if (!op->map)
2518 return 0; /* shouldnt happen */ 2441 return 0; /* shouldnt happen */
2519 2442
2520 success = change_map_light (op->map, spell->stats.dam); 2443 success = op->map->change_map_light (spell->stats.dam);
2444
2521 if (!success) 2445 if (!success)
2522 { 2446 {
2523 if (spell->stats.dam < 0) 2447 if (spell->stats.dam < 0)
2524 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2448 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2525 else 2449 else
… …
2550 2474
2551 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2475 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2552 2476
2553 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2477 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2554 2478
2555 set_owner (new_aura, op); 2479 new_aura->set_owner (op);
2556 set_spell_skill (op, caster, spell, new_aura); 2480 set_spell_skill (op, caster, spell, new_aura);
2557 new_aura->attacktype = spell->attacktype; 2481 new_aura->attacktype = spell->attacktype;
2558 2482
2559 new_aura->level = caster_level (caster, spell); 2483 new_aura->level = caster_level (caster, spell);
2560 if (refresh) 2484 if (refresh)
… …
2591 aura->remove (); 2515 aura->remove ();
2592 2516
2593 /* exit if we're out of gas */ 2517 /* exit if we're out of gas */
2594 if (aura->duration-- < 0) 2518 if (aura->duration-- < 0)
2595 { 2519 {
2596 aura->destroy (0); 2520 aura->destroy ();
2597 return; 2521 return;
2598 } 2522 }
2599 2523
2600 /* auras only exist in inventories */ 2524 /* auras only exist in inventories */
2601 if (env == NULL || env->map == NULL) 2525 if (env == NULL || env->map == NULL)
2602 { 2526 {
2603 aura->destroy (0); 2527 aura->destroy ();
2604 return; 2528 return;
2605 } 2529 }
2606 aura->x = env->x;
2607 aura->y = env->y;
2608 2530
2609 /* we need to jump out of the inventory for a bit 2531 /* we need to jump out of the inventory for a bit
2610 * in order to hit the map conveniently. 2532 * in order to hit the map conveniently.
2611 */ 2533 */
2612 insert_ob_in_map (aura, env->map, aura, 0); 2534 aura->insert_at (env, aura);
2613 2535
2614 for (i = 1; i < 9; i++) 2536 for (i = 1; i < 9; i++)
2615 { 2537 {
2616 sint16 nx, ny; 2538 sint16 nx, ny;
2617 2539
… …
2626 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2548 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2627 { 2549 {
2628 hit_map (aura, i, aura->attacktype, 0); 2550 hit_map (aura, i, aura->attacktype, 0);
2629 2551
2630 if (aura->other_arch) 2552 if (aura->other_arch)
2631 { 2553 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2632 object *new_ob;
2633
2634 new_ob = arch_to_object (aura->other_arch);
2635 new_ob->x = nx;
2636 new_ob->y = ny;
2637 insert_ob_in_map (new_ob, m, aura, 0);
2638 } 2554 }
2639 }
2640 } 2555 }
2556
2641 /* put the aura back in the player's inventory */ 2557 /* put the aura back in the player's inventory */
2642 aura->remove (); 2558 aura->remove ();
2643 insert_ob_in_ob (aura, env); 2559 insert_ob_in_ob (aura, env);
2644} 2560}
2645 2561
… …
2650void 2566void
2651move_peacemaker (object *op) 2567move_peacemaker (object *op)
2652{ 2568{
2653 object *tmp; 2569 object *tmp;
2654 2570
2655 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2571 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2656 { 2572 {
2657 int atk_lev, def_lev; 2573 int atk_lev, def_lev;
2658 object *victim = tmp; 2574 object *victim = tmp;
2659 2575
2660 if (tmp->head) 2576 if (tmp->head)
… …
2671 2587
2672 if (rndm (0, atk_lev - 1) > def_lev) 2588 if (rndm (0, atk_lev - 1) > def_lev)
2673 { 2589 {
2674 /* make this sucker peaceful. */ 2590 /* make this sucker peaceful. */
2675 2591
2676 change_exp (get_owner (op), victim->stats.exp, op->skill, 0); 2592 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2677 victim->stats.exp = 0; 2593 victim->stats.exp = 0;
2678#if 0 2594#if 0
2679 /* No idea why these were all set to zero - if something 2595 /* No idea why these were all set to zero - if something
2680 * makes this creature agressive, he should still do damage. 2596 * makes this creature agressive, he should still do damage.
2681 */ 2597 */
… …
2726 2642
2727 snprintf (rune, sizeof (rune), "%s\n", msg); 2643 snprintf (rune, sizeof (rune), "%s\n", msg);
2728 2644
2729 tmp->race = op->name; /*Save the owner of the rune */ 2645 tmp->race = op->name; /*Save the owner of the rune */
2730 tmp->msg = rune; 2646 tmp->msg = rune;
2731 tmp->x = op->x; 2647
2732 tmp->y = op->y; 2648 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2733 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2734 return 1; 2649 return 1;
2735} 2650}

Diff Legend

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