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.8 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.28 by root, Sat Dec 30 10:16:11 2006 UTC

1
2/*
3 * static char *rcsid_spell_effect_c =
4 * "$Id: spell_effect.C,v 1.8 2006/09/10 15:59:57 root Exp $";
5 */
6
7
8/* 1/*
9 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
10 3
11 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
23 16
24 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
25 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27 20
28 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
29*/ 22*/
30 23
31#include <global.h> 24#include <global.h>
32#include <object.h> 25#include <object.h>
33#include <living.h> 26#include <living.h>
… …
44void 37void
45cast_magic_storm (object *op, object *tmp, int lvl) 38cast_magic_storm (object *op, object *tmp, int lvl)
46{ 39{
47 if (!tmp) 40 if (!tmp)
48 return; /* error */ 41 return; /* error */
42
49 tmp->level = op->level; 43 tmp->level = op->level;
50 tmp->x = op->x;
51 tmp->y = op->y;
52 tmp->range += lvl / 5; /* increase the area of destruction */ 44 tmp->range += lvl / 5; /* increase the area of destruction */
53 tmp->duration += lvl / 5; 45 tmp->duration += lvl / 5;
54 46
55 /* Put a cap on duration for this - if the player fails in their 47 /* Put a cap on duration for this - if the player fails in their
56 * apartment, don't want it to go on so long that it kills them 48 * apartment, don't want it to go on so long that it kills them
57 * multiple times. Also, damge already increases with level, 49 * multiple times. Also, damge already increases with level,
58 * so don't really need to increase the duration as much either. 50 * so don't really need to increase the duration as much either.
59 */ 51 */
60 if (tmp->duration >= 40) 52 if (tmp->duration >= 40)
61 tmp->duration = 40; 53 tmp->duration = 40;
54
62 tmp->stats.dam = lvl; /* nasty recoils! */ 55 tmp->stats.dam = lvl; /* nasty recoils! */
63 tmp->stats.maxhp = tmp->count; /* tract single parent */ 56 tmp->stats.maxhp = tmp->count; /* tract single parent */
64 insert_ob_in_map (tmp, op->map, op, 0);
65 57
58 tmp->insert_at (op, op);
66} 59}
67
68 60
69int 61int
70recharge (object *op, object *caster, object *spell_ob) 62recharge (object *op, object *caster, object *spell_ob)
71{ 63{
72 object *wand, *tmp; 64 object *wand, *tmp;
… …
81 if (!(random_roll (0, 3, op, PREFER_HIGH))) 73 if (!(random_roll (0, 3, op, PREFER_HIGH)))
82 { 74 {
83 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 75 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
84 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 76 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
85 esrv_del_item (op->contr, wand->count); 77 esrv_del_item (op->contr, wand->count);
86 remove_ob (wand); 78 wand->destroy ();
87 free_object (wand);
88 tmp = get_archetype ("fireball"); 79 tmp = get_archetype ("fireball");
89 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 80 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
81
90 if (!tmp->stats.dam) 82 if (!tmp->stats.dam)
91 tmp->stats.dam = 1; 83 tmp->stats.dam = 1;
84
92 tmp->stats.hp = tmp->stats.dam / 2; 85 tmp->stats.hp = tmp->stats.dam / 2;
86
93 if (tmp->stats.hp < 2) 87 if (tmp->stats.hp < 2)
94 tmp->stats.hp = 2; 88 tmp->stats.hp = 2;
95 tmp->x = op->x; 89
96 tmp->y = op->y; 90 tmp->insert_at (op);
97 insert_ob_in_map (tmp, op->map, NULL, 0);
98 return 1; 91 return 1;
99 } 92 }
100 93
101 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 94 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
95
102 if (wand->inv && wand->inv->level) 96 if (wand->inv && wand->inv->level)
103 ncharges /= wand->inv->level; 97 ncharges /= wand->inv->level;
104 else 98 else
105 { 99 {
106 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 100 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
107 return 0; 101 return 0;
108 } 102 }
103
109 if (!ncharges) 104 if (!ncharges)
110 ncharges = 1; 105 ncharges = 1;
111 106
112 wand->stats.food += ncharges; 107 wand->stats.food += ncharges;
113 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 108 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
109
114 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 110 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
115 { 111 {
116 SET_FLAG (wand, FLAG_ANIMATE); 112 SET_FLAG (wand, FLAG_ANIMATE);
117 wand->speed = wand->arch->clone.speed; 113 wand->set_speed (wand->arch->clone.speed);
118 update_ob_speed (wand);
119 } 114 }
115
120 return 1; 116 return 1;
121} 117}
122 118
123/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 119/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows
124 * based on whether a crossbow or bow is equiped. If neither, it defaults to 120 * based on whether a crossbow or bow is equiped. If neither, it defaults to
… …
135cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg) 131cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
136{ 132{
137 int missile_plus = 0, bonus_plus = 0; 133 int missile_plus = 0, bonus_plus = 0;
138 const char *missile_name; 134 const char *missile_name;
139 object *tmp, *missile; 135 object *tmp, *missile;
140 tag_t tag;
141 136
142 missile_name = "arrow"; 137 missile_name = "arrow";
143 138
144 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 139 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
145 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 140 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
146 {
147 missile_name = tmp->race; 141 missile_name = tmp->race;
148 }
149 142
150 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 143 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
151 144
152 if (find_archetype (missile_name) == NULL) 145 if (archetype::find (missile_name) == NULL)
153 { 146 {
154 LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name); 147 LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name);
155 return 0; 148 return 0;
156 } 149 }
150
157 missile = get_archetype (missile_name); 151 missile = get_archetype (missile_name);
158 152
159 if (stringarg) 153 if (stringarg)
160 { 154 {
161 /* If it starts with a letter, presume it is a description */ 155 /* If it starts with a letter, presume it is a description */
… …
167 if (!strcasecmp (al->item->name, stringarg)) 161 if (!strcasecmp (al->item->name, stringarg))
168 break; 162 break;
169 163
170 if (!al) 164 if (!al)
171 { 165 {
172 free_object (missile); 166 missile->destroy ();
173 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg); 167 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);
174 return 0; 168 return 0;
175 } 169 }
170
176 if (al->item->slaying) 171 if (al->item->slaying)
177 { 172 {
178 free_object (missile); 173 missile->destroy ();
179 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg); 174 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);
180 return 0; 175 return 0;
181 } 176 }
177
182 give_artifact_abilities (missile, al->item); 178 give_artifact_abilities (missile, al->item);
183 /* These special arrows cost something extra. Don't have them also be magical - 179 /* These special arrows cost something extra. Don't have them also be magical -
184 * otherwise, in most cases, not enough will be created. I don't want to get into 180 * otherwise, in most cases, not enough will be created. I don't want to get into
185 * the parsing of having to do both plus and type. 181 * the parsing of having to do both plus and type.
186 */ 182 */
… …
188 missile_plus = 0; 184 missile_plus = 0;
189 } 185 }
190 else if (atoi (stringarg) < missile_plus) 186 else if (atoi (stringarg) < missile_plus)
191 missile_plus = atoi (stringarg); 187 missile_plus = atoi (stringarg);
192 } 188 }
189
193 if (missile_plus > 4) 190 if (missile_plus > 4)
194 missile_plus = 4; 191 missile_plus = 4;
195 else if (missile_plus < -4) 192 else if (missile_plus < -4)
196 missile_plus = -4; 193 missile_plus = -4;
197 194
198 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 195 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
199 missile->nrof -= 3 * (missile_plus + bonus_plus); 196 missile->nrof -= 3 * (missile_plus + bonus_plus);
197
200 if (missile->nrof < 1) 198 if (missile->nrof < 1)
201 missile->nrof = 1; 199 missile->nrof = 1;
202 200
203 missile->magic = missile_plus; 201 missile->magic = missile_plus;
204 /* Can't get any money for these objects */ 202 /* Can't get any money for these objects */
205 missile->value = 0; 203 missile->value = 0;
206 204
207 SET_FLAG (missile, FLAG_IDENTIFIED); 205 SET_FLAG (missile, FLAG_IDENTIFIED);
208 tag = missile->count;
209 206
210 if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !was_destroyed (missile, tag)) 207 if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())
211 {
212 pick_up (op, missile); 208 pick_up (op, missile);
213 } 209
214 return 1; 210 return 1;
215} 211}
216 212
217 213
218/* allows the choice of what sort of food object to make. 214/* allows the choice of what sort of food object to make.
… …
284int 280int
285probe (object *op, object *caster, object *spell_ob, int dir) 281probe (object *op, object *caster, object *spell_ob, int dir)
286{ 282{
287 int r, mflags, maxrange; 283 int r, mflags, maxrange;
288 object *tmp; 284 object *tmp;
289 mapstruct *m; 285 maptile *m;
290 286
291 287
292 if (!dir) 288 if (!dir)
293 { 289 {
294 examine_monster (op, op); 290 examine_monster (op, op);
… …
310 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 306 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
311 return 0; 307 return 0;
312 } 308 }
313 if (mflags & P_IS_ALIVE) 309 if (mflags & P_IS_ALIVE)
314 { 310 {
315 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 311 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
316 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 312 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
317 { 313 {
318 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 314 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
319 if (tmp->head != NULL) 315 if (tmp->head != NULL)
320 tmp = tmp->head; 316 tmp = tmp->head;
… …
429cast_earth_to_dust (object *op, object *caster, object *spell_ob) 425cast_earth_to_dust (object *op, object *caster, object *spell_ob)
430{ 426{
431 object *tmp, *next; 427 object *tmp, *next;
432 int range, i, j, mflags; 428 int range, i, j, mflags;
433 sint16 sx, sy; 429 sint16 sx, sy;
434 mapstruct *m; 430 maptile *m;
435 431
436 if (op->type != PLAYER) 432 if (op->type != PLAYER)
437 return 0; 433 return 0;
438 434
439 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 435 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
… …
448 444
449 if (mflags & P_OUT_OF_MAP) 445 if (mflags & P_OUT_OF_MAP)
450 continue; 446 continue;
451 447
452 // earth to dust tears down everything that can be teared down 448 // earth to dust tears down everything that can be teared down
453 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 449 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
454 { 450 {
455 next = tmp->above; 451 next = tmp->above;
456 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 452 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
457 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 453 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
458 } 454 }
… …
468 464
469 while (op != NULL && op->type != PLAYER) 465 while (op != NULL && op->type != PLAYER)
470 op = op->env; 466 op = op->env;
471 467
472 if (op != NULL && op->map) 468 if (op != NULL && op->map)
473 {
474 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST))) 469 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
475 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you."); 470 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you.");
476 else 471 else
477 enter_exit (op, wor); 472 op->enter_exit (wor);
478 } 473
479 remove_ob (wor); 474 wor->destroy ();
480 free_object (wor);
481} 475}
482 476
483/* Word of recall causes the player to return 'home'. 477/* Word of recall causes the player to return 'home'.
484 * 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
485 * time delay effect. 479 * time delay effect.
… …
512 506
513 /* value of speed really doesn't make much difference, as long as it is 507 /* value of speed really doesn't make much difference, as long as it is
514 * positive. Lower value may be useful so that the problem doesn't 508 * positive. Lower value may be useful so that the problem doesn't
515 * do anything really odd if it say a -1000 or something. 509 * do anything really odd if it say a -1000 or something.
516 */ 510 */
517 dummy->speed = 0.002; 511 dummy->set_speed (0.002);
518 update_ob_speed (dummy);
519 dummy->speed_left = -dummy->speed * time; 512 dummy->speed_left = -dummy->speed * time;
520 dummy->type = SPELL_EFFECT; 513 dummy->type = SPELL_EFFECT;
521 dummy->subtype = SP_WORD_OF_RECALL; 514 dummy->subtype = SP_WORD_OF_RECALL;
522 515
523 /* If we could take advantage of enter_player_savebed() here, it would be 516 /* If we could take advantage of enter_player_savebed() here, it would be
… …
566 return cast_spell (op, caster, dir, newspell, NULL); 559 return cast_spell (op, caster, dir, newspell, NULL);
567 } 560 }
568 return 1; 561 return 1;
569} 562}
570 563
571
572int 564int
573perceive_self (object *op) 565perceive_self (object *op)
574{ 566{
575 char *cp = describe_item (op, op), buf[MAX_BUF]; 567 char *cp = describe_item (op, op), buf[MAX_BUF];
576 archetype *at = find_archetype (ARCH_DEPLETION); 568 archetype *at = archetype::find (ARCH_DEPLETION);
577 object *tmp; 569 object *tmp;
578 int i; 570 int i;
579 571
580 tmp = find_god (determine_god (op)); 572 tmp = find_god (determine_god (op));
581 if (tmp) 573 if (tmp)
… …
647cast_create_town_portal (object *op, object *caster, object *spell, int dir) 639cast_create_town_portal (object *op, object *caster, object *spell, int dir)
648{ 640{
649 object *dummy, *force, *old_force, *tmp; 641 object *dummy, *force, *old_force, *tmp;
650 archetype *perm_portal; 642 archetype *perm_portal;
651 char portal_name[1024], portal_message[1024]; 643 char portal_name[1024], portal_message[1024];
652 sint16 exitx, exity;
653 mapstruct *exitmap; 644 maptile *exitmap;
654 int op_level; 645 int op_level;
655
656 646
657 /* Check to see if the map the player is currently on is a per player unique 647 /* Check to see if the map the player is currently on is a per player unique
658 * map. This can be determined in that per player unique maps have the 648 * map. This can be determined in that per player unique maps have the
659 * full pathname listed. 649 * full pathname listed.
660 */ 650 */
… …
669 */ 659 */
670 dummy = arch_to_object (spell->other_arch); 660 dummy = arch_to_object (spell->other_arch);
671 if (dummy == NULL) 661 if (dummy == NULL)
672 { 662 {
673 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 663 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
674 LOG (llevError, "get_object failed (force in cast_create_town_portal for %s!\n", &op->name); 664 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
675 return 0; 665 return 0;
676 } 666 }
667
677 force = check_inv_recursive (op, dummy); 668 force = check_inv_recursive (op, dummy);
678 669
679 if (force == NULL) 670 if (force == NULL)
680 { 671 {
681 /* Here we know there is no destination marked up. 672 /* Here we know there is no destination marked up.
… …
688 EXIT_Y (dummy) = op->y; 679 EXIT_Y (dummy) = op->y;
689 insert_ob_in_ob (dummy, op); 680 insert_ob_in_ob (dummy, op);
690 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."); 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.");
691 return 1; 682 return 1;
692 } 683 }
693 free_object (dummy); 684
685 dummy->destroy ();
694 686
695 /* Here we know where the town portal should go to 687 /* Here we know where the town portal should go to
696 * We should kill any existing portal associated with the player. 688 * We should kill any existing portal associated with the player.
697 * Than we should create the 2 portals. 689 * Than we should create the 2 portals.
698 * For each of them, we need: 690 * For each of them, we need:
… …
711 /* First step: killing existing town portals */ 703 /* First step: killing existing town portals */
712 dummy = get_archetype (spell->race); 704 dummy = get_archetype (spell->race);
713 if (dummy == NULL) 705 if (dummy == NULL)
714 { 706 {
715 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 707 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
716 LOG (llevError, "get_object failed (force) in cast_create_town_portal for %s!\n", &op->name); 708 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
717 return 0; 709 return 0;
718 } 710 }
711
719 perm_portal = find_archetype (spell->slaying); 712 perm_portal = archetype::find (spell->slaying);
720 713
721 /* To kill a town portal, we go trough the player's inventory, 714 /* To kill a town portal, we go trough the player's inventory,
722 * for each marked portal in player's inventory, 715 * for each marked portal in player's inventory,
723 * -We try load the associated map (if impossible, consider the portal destructed) 716 * -We try load the associated map (if impossible, consider the portal destructed)
724 * -We find any portal in the specified location. 717 * -We find any portal in the specified location.
725 * If it has the good name, we destruct it. 718 * If it has the good name, we destruct it.
726 * -We destruct the force indicating that portal. 719 * -We destruct the force indicating that portal.
727 */ 720 */
728 while ((old_force = check_inv_recursive (op, dummy))) 721 while ((old_force = check_inv_recursive (op, dummy)))
729 { 722 {
730 exitx = EXIT_X (old_force); 723 exitmap = maptile::find_map (old_force->race, op->map);
731 exity = EXIT_Y (old_force);
732 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
733
734 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
735 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
736 else
737 exitmap = ready_map_name (old_force->race, 0);
738 724
739 if (exitmap) 725 if (exitmap)
740 { 726 {
727 int exitx = EXIT_X (old_force);
728 int exity = EXIT_Y (old_force);
729
741 tmp = present_arch (perm_portal, exitmap, exitx, exity); 730 tmp = present_arch (perm_portal, exitmap, exitx, exity);
742 while (tmp) 731 while (tmp)
743 { 732 {
744 if (tmp->name == old_force->name) 733 if (tmp->name == old_force->name)
745 { 734 {
746 remove_ob (tmp); 735 tmp->destroy ();
747 free_object (tmp);
748 break; 736 break;
749 } 737 }
750 else 738
751 {
752 tmp = tmp->above; 739 tmp = tmp->above;
753 }
754 } 740 }
755 } 741 }
756 remove_ob (old_force); 742
757 free_object (old_force); 743 old_force->destroy ();
758 LOG (llevDebug, "\n");
759 } 744 }
760 free_object (dummy); 745
746 dummy->destroy ();
761 747
762 /* Creating the portals. 748 /* Creating the portals.
763 * The very first thing to do is to ensure 749 * The very first thing to do is to ensure
764 * access to the destination map. 750 * access to the destination map.
765 * If we can't, don't fizzle. Simply warn player. 751 * If we can't, don't fizzle. Simply warn player.
… …
768 * 'force' is the destination of the town portal, which we got 754 * 'force' is the destination of the town portal, which we got
769 * from the players inventory above. 755 * from the players inventory above.
770 */ 756 */
771 757
772 /* Ensure exit map is loaded */ 758 /* Ensure exit map is loaded */
773 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
774 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
775 else
776 exitmap = ready_map_name (force->name, 0); 759 exitmap = maptile::find_map (force->name, 0);
777 760
778 /* 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 */
779 if (exitmap == NULL) 762 if (!exitmap)
780 { 763 {
781 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!?");
782 remove_ob (force); 765 force->destroy ();
783 free_object (force);
784 return 1; 766 return 1;
785 } 767 }
786 768
787 op_level = caster_level (caster, spell); 769 op_level = caster_level (caster, spell);
788 if (op_level < 15) 770 if (op_level < 15)
… …
800 782
801 /* Create a portal in front of player 783 /* Create a portal in front of player
802 * dummy contain the portal and 784 * dummy contain the portal and
803 * force contain the track to kill it later 785 * force contain the track to kill it later
804 */ 786 */
805
806 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 787 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
807 dummy = get_archetype (spell->slaying); /*The portal */ 788 dummy = get_archetype (spell->slaying); /*The portal */
808 if (dummy == NULL) 789 if (dummy == NULL)
809 { 790 {
810 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 791 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
811 LOG (llevError, "get_object failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 792 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
812 return 0; 793 return 0;
813 } 794 }
795
814 EXIT_PATH (dummy) = force->name; 796 EXIT_PATH (dummy) = force->name;
815 EXIT_X (dummy) = EXIT_X (force); 797 EXIT_X (dummy) = EXIT_X (force);
816 EXIT_Y (dummy) = EXIT_Y (force); 798 EXIT_Y (dummy) = EXIT_Y (force);
817 dummy->name = dummy->name_pl = portal_name; 799 dummy->name = dummy->name_pl = portal_name;
818 dummy->msg = portal_message; 800 dummy->msg = portal_message;
… …
825 */ 807 */
826 tmp = get_archetype (spell->race); 808 tmp = get_archetype (spell->race);
827 if (tmp == NULL) 809 if (tmp == NULL)
828 { 810 {
829 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 811 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
830 LOG (llevError, "get_object failed (force) in cast_create_town_portal for %s!\n", &op->name); 812 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
831 return 0; 813 return 0;
832 } 814 }
815
833 tmp->race = op->map->path; 816 tmp->race = op->map->path;
834 tmp->name = portal_name; 817 tmp->name = portal_name;
835 EXIT_X (tmp) = dummy->x; 818 EXIT_X (tmp) = dummy->x;
836 EXIT_Y (tmp) = dummy->y; 819 EXIT_Y (tmp) = dummy->y;
837 insert_ob_in_ob (tmp, op); 820 op->insert (tmp);
838 821
839 /* Create a portal in the destination map 822 /* Create a portal in the destination map
840 * dummy contain the portal and 823 * dummy contain the portal and
841 * force the track to kill it later 824 * force the track to kill it later
842 * the 'force' variable still contains the 'reminder' of 825 * the 'force' variable still contains the 'reminder' of
843 * where this portal goes to. 826 * where this portal goes to.
844 */ 827 */
845 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 828 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
846 dummy = get_archetype (spell->slaying); /*The portal */ 829 dummy = get_archetype (spell->slaying); /*The portal */
847 if (dummy == NULL) 830 if (dummy == NULL)
848 { 831 {
849 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 832 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
850 LOG (llevError, "get_object failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 833 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
851 return 0; 834 return 0;
852 } 835 }
836
853 EXIT_PATH (dummy) = op->map->path; 837 EXIT_PATH (dummy) = op->map->path;
854 EXIT_X (dummy) = op->x; 838 EXIT_X (dummy) = op->x;
855 EXIT_Y (dummy) = op->y; 839 EXIT_Y (dummy) = op->y;
856 dummy->name = dummy->name_pl = portal_name; 840 dummy->name = dummy->name_pl = portal_name;
857 dummy->msg = portal_message; 841 dummy->msg = portal_message;
858 dummy->x = EXIT_X (force);
859 dummy->y = EXIT_Y (force);
860 dummy->race = op->name; /*Save the owner of the portal */ 842 dummy->race = op->name; /*Save the owner of the portal */
861 insert_ob_in_map (dummy, exitmap, op, 0); 843 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
862 844
863 /* Now we create another town portal marker that 845 /* Now we create another town portal marker that
864 * points back to the one we just made 846 * points back to the one we just made
865 */ 847 */
866 tmp = get_archetype (spell->race); 848 tmp = get_archetype (spell->race);
867 if (tmp == NULL) 849 if (tmp == NULL)
868 { 850 {
869 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 851 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
870 LOG (llevError, "get_object failed (force) in cast_create_town_portal for %s!\n", &op->name); 852 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
871 return 0; 853 return 0;
872 } 854 }
855
873 tmp->race = force->name; 856 tmp->race = force->name;
874 tmp->name = portal_name; 857 tmp->name = portal_name;
875 EXIT_X (tmp) = dummy->x; 858 EXIT_X (tmp) = dummy->x;
876 EXIT_Y (tmp) = dummy->y; 859 EXIT_Y (tmp) = dummy->y;
877 insert_ob_in_ob (tmp, op); 860 insert_ob_in_ob (tmp, op);
878 861
879 /* Describe the player what happened 862 /* Describe the player what happened
880 */ 863 */
881 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home."); 864 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
882 remove_ob (force); /* Delete the force inside the player */ 865 force->destroy ();
883 free_object (force); 866
884 return 1; 867 return 1;
885} 868}
886
887 869
888/* This creates magic walls. Really, it can create most any object, 870/* This creates magic walls. Really, it can create most any object,
889 * within some reason. 871 * within some reason.
890 */ 872 */
891
892int 873int
893magic_wall (object *op, object *caster, int dir, object *spell_ob) 874magic_wall (object *op, object *caster, int dir, object *spell_ob)
894{ 875{
895 object *tmp, *tmp2; 876 object *tmp;
896 int i, posblocked, negblocked, maxrange; 877 int i, posblocked, negblocked, maxrange;
897 sint16 x, y; 878 sint16 x, y;
898 mapstruct *m; 879 maptile *m;
899 const char *name; 880 const char *name;
900 archetype *at; 881 archetype *at;
901 882
902 if (!dir) 883 if (!dir)
903 { 884 {
… …
908 else 889 else
909 { 890 {
910 x = op->x + freearr_x[dir]; 891 x = op->x + freearr_x[dir];
911 y = op->y + freearr_y[dir]; 892 y = op->y + freearr_y[dir];
912 } 893 }
894
913 m = op->map; 895 m = op->map;
914 896
915 if ((spell_ob->move_block || x != op->x || y != op->y) && 897 if ((spell_ob->move_block || x != op->x || y != op->y) &&
916 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 898 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
917 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 899 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
918 { 900 {
919 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 901 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
920 return 0; 902 return 0;
921 } 903 }
904
922 if (spell_ob->other_arch) 905 if (spell_ob->other_arch)
923 {
924 tmp = arch_to_object (spell_ob->other_arch); 906 tmp = arch_to_object (spell_ob->other_arch);
925 }
926 else if (spell_ob->race) 907 else if (spell_ob->race)
927 { 908 {
928 char buf1[MAX_BUF]; 909 char buf1[MAX_BUF];
929 910
930 sprintf (buf1, spell_ob->race, dir); 911 sprintf (buf1, spell_ob->race, dir);
931 at = find_archetype (buf1); 912 at = archetype::find (buf1);
932 if (!at) 913 if (!at)
933 { 914 {
934 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 915 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
935 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 916 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
936 return 0; 917 return 0;
937 } 918 }
919
938 tmp = arch_to_object (at); 920 tmp = arch_to_object (at);
939 } 921 }
940 else 922 else
941 { 923 {
942 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 924 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
952 } 934 }
953 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 935 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
954 { 936 {
955 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 937 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
956 tmp->stats.maxhp = tmp->stats.hp; 938 tmp->stats.maxhp = tmp->stats.hp;
957 set_owner (tmp, op);
958 set_spell_skill (op, caster, spell_ob, tmp);
959 } 939 }
940
960 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 941 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
961 { 942 {
962 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 943 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
963 SET_FLAG (tmp, FLAG_IS_USED_UP); 944 SET_FLAG (tmp, FLAG_IS_USED_UP);
964 } 945 }
946
965 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 947 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
966 { 948 {
967 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 949 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
968 tmp->stats.maxhp = tmp->stats.hp; 950 tmp->stats.maxhp = tmp->stats.hp;
969 SET_FLAG (tmp, FLAG_TEAR_DOWN); 951 SET_FLAG (tmp, FLAG_TEAR_DOWN);
970 SET_FLAG (tmp, FLAG_ALIVE); 952 SET_FLAG (tmp, FLAG_ALIVE);
971 } 953 }
972 954
973 /* This can't really hurt - if the object doesn't kill anything, 955 /* This can't really hurt - if the object doesn't kill anything,
974 * these fields just won't be used. 956 * these fields just won't be used. Do not set the owner for
957 * earthwalls, though, so they survive restarts.
975 */ 958 */
976 set_owner (tmp, op); 959 if (tmp->type != EARTHWALL) //TODO
960 tmp->set_owner (op);
961
977 set_spell_skill (op, caster, spell_ob, tmp); 962 set_spell_skill (op, caster, spell_ob, tmp);
978 tmp->x = x;
979 tmp->y = y;
980 tmp->level = caster_level (caster, spell_ob) / 2; 963 tmp->level = caster_level (caster, spell_ob) / 2;
981 964
982 name = tmp->name; 965 name = tmp->name;
983 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 966 if (!(tmp = m->insert (tmp, x, y, op)))
984 { 967 {
985 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 968 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
986 return 0; 969 return 0;
987 } 970 }
971
988 /* If this is a spellcasting wall, need to insert the spell object */ 972 /* If this is a spellcasting wall, need to insert the spell object */
989 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 973 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
990 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 974 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
991 975
992 /* This code causes the wall to extend some distance in 976 /* This code causes the wall to extend some distance in
… …
1010 m = tmp->map; 994 m = tmp->map;
1011 995
1012 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 996 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1013 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked) 997 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1014 { 998 {
1015 tmp2 = get_object (); 999 object *tmp2 = tmp->clone ();
1016 copy_object (tmp, tmp2); 1000 m->insert (tmp2, x, y, op);
1017 tmp2->x = x; 1001
1018 tmp2->y = y;
1019 insert_ob_in_map (tmp2, m, op, 0);
1020 /* If this is a spellcasting wall, need to insert the spell object */ 1002 /* If this is a spellcasting wall, need to insert the spell object */
1021 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1003 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1022 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1004 tmp2->insert (arch_to_object (tmp2->other_arch));
1023 1005
1024 } 1006 }
1025 else 1007 else
1026 posblocked = 1; 1008 posblocked = 1;
1027 1009
… …
1030 m = tmp->map; 1012 m = tmp->map;
1031 1013
1032 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1014 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1033 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 1015 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1034 { 1016 {
1035 tmp2 = get_object (); 1017 object *tmp2 = tmp->clone ();
1036 copy_object (tmp, tmp2); 1018 m->insert (tmp2, x, y, op);
1037 tmp2->x = x; 1019
1038 tmp2->y = y;
1039 insert_ob_in_map (tmp2, m, op, 0);
1040 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1020 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1041 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1021 tmp2->insert (arch_to_object (tmp2->other_arch));
1042 } 1022 }
1043 else 1023 else
1044 negblocked = 1; 1024 negblocked = 1;
1045 } 1025 }
1046 1026
… …
1053int 1033int
1054dimension_door (object *op, object *caster, object *spob, int dir) 1034dimension_door (object *op, object *caster, object *spob, int dir)
1055{ 1035{
1056 uint32 dist, maxdist; 1036 uint32 dist, maxdist;
1057 int mflags; 1037 int mflags;
1058 mapstruct *m; 1038 maptile *m;
1059 sint16 sx, sy; 1039 sint16 sx, sy;
1060 1040
1061 if (op->type != PLAYER) 1041 if (op->type != PLAYER)
1062 return 0; 1042 return 0;
1063 1043
… …
1095 { 1075 {
1096 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1076 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1097 op->contr->count = 0; 1077 op->contr->count = 0;
1098 return 0; 1078 return 0;
1099 } 1079 }
1080
1100 op->contr->count = 0; 1081 op->contr->count = 0;
1101 1082
1102 /* Remove code that puts player on random space on maps. IMO, 1083 /* Remove code that puts player on random space on maps. IMO,
1103 * a lot of maps probably have areas the player should not get to, 1084 * a lot of maps probably have areas the player should not get to,
1104 * but may not be marked as NO_MAGIC (as they may be bounded 1085 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1153 return 0; 1134 return 0;
1154 } 1135 }
1155 } 1136 }
1156 1137
1157 /* Actually move the player now */ 1138 /* Actually move the player now */
1158 remove_ob (op); 1139 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1159 op->x += freearr_x[dir] * dist;
1160 op->y += freearr_y[dir] * dist;
1161 if ((op = insert_ob_in_map (op, op->map, op, 0)) == NULL)
1162 return 1; 1140 return 1;
1163 1141
1164 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1142 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1165 return 1; 1143 return 1;
1166} 1144}
… …
1234 if (cure_disease (tmp, op)) 1212 if (cure_disease (tmp, op))
1235 success = 1; 1213 success = 1;
1236 1214
1237 if (spell->attacktype & AT_POISON) 1215 if (spell->attacktype & AT_POISON)
1238 { 1216 {
1239 at = find_archetype ("poisoning"); 1217 at = archetype::find ("poisoning");
1240 poison = present_arch_in_ob (at, tmp); 1218 poison = present_arch_in_ob (at, tmp);
1241 if (poison) 1219 if (poison)
1242 { 1220 {
1243 success = 1; 1221 success = 1;
1244 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 1222 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
… …
1255 poison->duration = 1; 1233 poison->duration = 1;
1256 } 1234 }
1257 } 1235 }
1258 if (spell->attacktype & AT_BLIND) 1236 if (spell->attacktype & AT_BLIND)
1259 { 1237 {
1260 at = find_archetype ("blindness"); 1238 at = archetype::find ("blindness");
1261 poison = present_arch_in_ob (at, tmp); 1239 poison = present_arch_in_ob (at, tmp);
1262 if (poison) 1240 if (poison)
1263 { 1241 {
1264 success = 1; 1242 success = 1;
1265 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 1243 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
… …
1310}; 1288};
1311 1289
1312int 1290int
1313cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1291cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1314{ 1292{
1315 object *tmp, *tmp2 = NULL;
1316 object *force = NULL; 1293 object *force = NULL;
1317 int i; 1294 int i;
1318 1295
1319 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1296 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1320 if (dir != 0) 1297 object *tmp = dir
1321 {
1322 tmp = find_target_for_friendly_spell (op, dir); 1298 ? find_target_for_friendly_spell (op, dir)
1323 } 1299 : op;
1324 else
1325 {
1326 tmp = op;
1327 }
1328 1300
1329 if (tmp == NULL) 1301 if (!tmp)
1330 return 0; 1302 return 0;
1331 1303
1332 /* If we've already got a force of this type, don't add a new one. */ 1304 /* If we've already got a force of this type, don't add a new one. */
1333 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1305 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1334 { 1306 {
1335 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1307 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1336 { 1308 {
1337 if (tmp2->name == spell_ob->name) 1309 if (tmp2->name == spell_ob->name)
1338 { 1310 {
… …
1440 force->stats.ac = spell_ob->stats.ac; 1412 force->stats.ac = spell_ob->stats.ac;
1441 force->attacktype = spell_ob->attacktype; 1413 force->attacktype = spell_ob->attacktype;
1442 1414
1443 insert_ob_in_ob (force, tmp); 1415 insert_ob_in_ob (force, tmp);
1444 change_abil (tmp, force); /* Mostly to display any messages */ 1416 change_abil (tmp, force); /* Mostly to display any messages */
1445 fix_player (tmp); 1417 tmp->update_stats ();
1446 return 1; 1418 return 1;
1447} 1419}
1448 1420
1449/* This used to be part of cast_change_ability, but it really didn't make 1421/* This used to be part of cast_change_ability, but it really didn't make
1450 * a lot of sense, since most of the values it derives are from the god 1422 * a lot of sense, since most of the values it derives are from the god
… …
1549 force->stats.wc = spell_ob->stats.wc; 1521 force->stats.wc = spell_ob->stats.wc;
1550 force->stats.ac = spell_ob->stats.ac; 1522 force->stats.ac = spell_ob->stats.ac;
1551 1523
1552 change_abil (tmp, force); /* Mostly to display any messages */ 1524 change_abil (tmp, force); /* Mostly to display any messages */
1553 insert_ob_in_ob (force, tmp); 1525 insert_ob_in_ob (force, tmp);
1554 fix_player (tmp); 1526 tmp->update_stats ();
1555 return 1; 1527 return 1;
1556} 1528}
1557 1529
1558 1530
1559 1531
… …
1629 *small_nuggets -= large->value / small->value; 1601 *small_nuggets -= large->value / small->value;
1630 if (*small_nuggets && large->value % small->value) 1602 if (*small_nuggets && large->value % small->value)
1631 (*small_nuggets)--; 1603 (*small_nuggets)--;
1632 } 1604 }
1633 weight += obj->weight; 1605 weight += obj->weight;
1634 remove_ob (obj); 1606 obj->destroy ();
1635 free_object (obj);
1636} 1607}
1637 1608
1638static void 1609static void
1639update_map (object *op, mapstruct *m, int small_nuggets, int large_nuggets, int x, int y) 1610update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y)
1640{ 1611{
1641 object *tmp; 1612 object *tmp;
1642 int flag = 0; 1613 int flag = 0;
1643 1614
1644 /* Put any nuggets below the player, but we can only pass this 1615 /* Put any nuggets below the player, but we can only pass this
… …
1647 if (x == op->x && y == op->y && op->map == m) 1618 if (x == op->x && y == op->y && op->map == m)
1648 flag = INS_BELOW_ORIGINATOR; 1619 flag = INS_BELOW_ORIGINATOR;
1649 1620
1650 if (small_nuggets) 1621 if (small_nuggets)
1651 { 1622 {
1652 tmp = get_object (); 1623 tmp = small->clone ();
1653 copy_object (small, tmp);
1654 tmp->nrof = small_nuggets; 1624 tmp->nrof = small_nuggets;
1655 tmp->x = x;
1656 tmp->y = y;
1657 insert_ob_in_map (tmp, m, op, flag); 1625 m->insert (tmp, x, y, op, flag);
1658 } 1626 }
1627
1659 if (large_nuggets) 1628 if (large_nuggets)
1660 { 1629 {
1661 tmp = get_object (); 1630 tmp = large->clone ();
1662 copy_object (large, tmp);
1663 tmp->nrof = large_nuggets; 1631 tmp->nrof = large_nuggets;
1664 tmp->x = x;
1665 tmp->y = y;
1666 insert_ob_in_map (tmp, m, op, flag); 1632 m->insert (tmp, x, y, op, flag);
1667 } 1633 }
1668} 1634}
1669 1635
1670int 1636int
1671alchemy (object *op, object *caster, object *spell_ob) 1637alchemy (object *op, object *caster, object *spell_ob)
1672{ 1638{
1673 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags; 1639 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1674 sint16 nx, ny; 1640 sint16 nx, ny;
1675 object *next, *tmp; 1641 object *next, *tmp;
1676 mapstruct *mp; 1642 maptile *mp;
1677 1643
1678 if (op->type != PLAYER) 1644 if (op->type != PLAYER)
1679 return 0; 1645 return 0;
1680 1646
1681 /* Put a maximum weight of items that can be alchemied. Limits the power 1647 /* Put a maximum weight of items that can be alchemied. Limits the power
… …
1708 continue; 1674 continue;
1709 1675
1710 small_nuggets = 0; 1676 small_nuggets = 0;
1711 large_nuggets = 0; 1677 large_nuggets = 0;
1712 1678
1713 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next) 1679 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
1714 { 1680 {
1715 next = tmp->above; 1681 next = tmp->above;
1716 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1682 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1717 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1683 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1718 { 1684 {
… …
1732 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1698 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight);
1733 1699
1734 if (weight > weight_max) 1700 if (weight > weight_max)
1735 { 1701 {
1736 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1702 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1737 free_object (large); 1703 large->destroy ();
1738 free_object (small); 1704 small->destroy ();
1739 return 1; 1705 return 1;
1740 } 1706 }
1741 } /* is alchemable object */ 1707 } /* is alchemable object */
1742 } /* process all objects on this space */ 1708 } /* process all objects on this space */
1743 1709
… …
1746 * with this spell. 1712 * with this spell.
1747 */ 1713 */
1748 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1714 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1749 } 1715 }
1750 } 1716 }
1751 free_object (large); 1717
1752 free_object (small); 1718 large->destroy ();
1719 small->destroy ();
1753 /* reset this so that if player standing on a big pile of stuff, 1720 /* reset this so that if player standing on a big pile of stuff,
1754 * it is redrawn properly. 1721 * it is redrawn properly.
1755 */ 1722 */
1756 op->contr->socket.look_position = 0; 1723 op->contr->ns->look_position = 0;
1757 return 1; 1724 return 1;
1758} 1725}
1759 1726
1760 1727
1761/* This function removes the cursed/damned status on equipped 1728/* This function removes the cursed/damned status on equipped
… …
1770 for (tmp = op->inv; tmp; tmp = tmp->below) 1737 for (tmp = op->inv; tmp; tmp = tmp->below)
1771 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1738 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1772 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1739 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1773 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1740 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1774 { 1741 {
1775
1776 was_one++; 1742 was_one++;
1777 if (tmp->level <= caster_level (caster, spell)) 1743 if (tmp->level <= caster_level (caster, spell))
1778 { 1744 {
1779 success++; 1745 success++;
1780 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1746 if (QUERY_FLAG (spell, FLAG_DAMNED))
… …
1800 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1766 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1801 else 1767 else
1802 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items."); 1768 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items.");
1803 } 1769 }
1804 } 1770 }
1771
1805 return success; 1772 return success;
1806} 1773}
1807 1774
1808/* Identifies objects in the players inventory/on the ground */ 1775/* Identifies objects in the players inventory/on the ground */
1809 1776
… …
1816 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1783 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1817 1784
1818 if (num_ident < 1) 1785 if (num_ident < 1)
1819 num_ident = 1; 1786 num_ident = 1;
1820 1787
1821
1822 for (tmp = op->inv; tmp; tmp = tmp->below) 1788 for (tmp = op->inv; tmp; tmp = tmp->below)
1823 { 1789 {
1824 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1790 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1825 { 1791 {
1826 identify (tmp); 1792 identify (tmp);
1793
1827 if (op->type == PLAYER) 1794 if (op->type == PLAYER)
1828 { 1795 {
1829 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1796 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op));
1797
1830 if (tmp->msg) 1798 if (tmp->msg)
1831 { 1799 {
1832 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1800 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1833 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1801 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1834 } 1802 }
1835 } 1803 }
1804
1836 num_ident--; 1805 num_ident--;
1837 success = 1; 1806 success = 1;
1838 if (!num_ident) 1807 if (!num_ident)
1839 break; 1808 break;
1840 } 1809 }
1841 } 1810 }
1811
1842 /* If all the power of the spell has been used up, don't go and identify 1812 /* If all the power of the spell has been used up, don't go and identify
1843 * stuff on the floor. Only identify stuff on the floor if the spell 1813 * stuff on the floor. Only identify stuff on the floor if the spell
1844 * was not fully used. 1814 * was not fully used.
1845 */ 1815 */
1846 if (num_ident) 1816 if (num_ident)
1847 { 1817 {
1848 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1818 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1849 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1819 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1850 { 1820 {
1851
1852 identify (tmp); 1821 identify (tmp);
1822
1853 if (op->type == PLAYER) 1823 if (op->type == PLAYER)
1854 { 1824 {
1855 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1825 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op));
1826
1856 if (tmp->msg) 1827 if (tmp->msg)
1857 { 1828 {
1858 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1829 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1859 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1830 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1860 } 1831 }
1832
1861 esrv_send_item (op, tmp); 1833 esrv_send_item (op, tmp);
1862 } 1834 }
1835
1863 num_ident--; 1836 num_ident--;
1864 success = 1; 1837 success = 1;
1865 if (!num_ident) 1838 if (!num_ident)
1866 break; 1839 break;
1867 } 1840 }
1868 } 1841 }
1842
1869 if (!success) 1843 if (!success)
1870 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1844 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified.");
1871 else 1845 else
1872 {
1873 spell_effect (spell, op->x, op->y, op->map, op); 1846 spell_effect (spell, op->x, op->y, op->map, op);
1874 } 1847
1875 return success; 1848 return success;
1876} 1849}
1877
1878 1850
1879int 1851int
1880cast_detection (object *op, object *caster, object *spell, object *skill) 1852cast_detection (object *op, object *caster, object *spell, object *skill)
1881{ 1853{
1882 object *tmp, *last, *god, *detect; 1854 object *tmp, *last, *god, *detect;
1883 int done_one, range, mflags, floor, level; 1855 int done_one, range, mflags, floor, level;
1884 sint16 x, y, nx, ny; 1856 sint16 x, y, nx, ny;
1885 mapstruct *m; 1857 maptile *m;
1886 1858
1887 /* We precompute some values here so that we don't have to keep 1859 /* We precompute some values here so that we don't have to keep
1888 * doing it over and over again. 1860 * doing it over and over again.
1889 */ 1861 */
1890 god = find_god (determine_god (op)); 1862 god = find_god (determine_god (op));
… …
1895 skill = caster; 1867 skill = caster;
1896 1868
1897 for (x = op->x - range; x <= op->x + range; x++) 1869 for (x = op->x - range; x <= op->x + range; x++)
1898 for (y = op->y - range; y <= op->y + range; y++) 1870 for (y = op->y - range; y <= op->y + range; y++)
1899 { 1871 {
1900
1901 m = op->map; 1872 m = op->map;
1902 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1873 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1903 if (mflags & P_OUT_OF_MAP) 1874 if (mflags & P_OUT_OF_MAP)
1904 continue; 1875 continue;
1905 1876
… …
1907 * floor. But this is not true for show invisible. 1878 * floor. But this is not true for show invisible.
1908 * Basically, we just go and find the top object and work 1879 * Basically, we just go and find the top object and work
1909 * down - that is easier than working up. 1880 * down - that is easier than working up.
1910 */ 1881 */
1911 1882
1912 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1883 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1913 last = tmp; 1884 last = tmp;
1885
1914 /* Shouldn't happen, but if there are no objects on a space, this 1886 /* Shouldn't happen, but if there are no objects on a space, this
1915 * would happen. 1887 * would happen.
1916 */ 1888 */
1917 if (!last) 1889 if (!last)
1918 continue; 1890 continue;
… …
1920 done_one = 0; 1892 done_one = 0;
1921 floor = 0; 1893 floor = 0;
1922 detect = NULL; 1894 detect = NULL;
1923 for (tmp = last; tmp; tmp = tmp->below) 1895 for (tmp = last; tmp; tmp = tmp->below)
1924 { 1896 {
1925
1926 /* show invisible */ 1897 /* show invisible */
1927 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1898 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1928 /* Might there be other objects that we can make visibile? */ 1899 /* Might there be other objects that we can make visible? */
1929 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1900 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
1930 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) || 1901 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||
1931 tmp->type == CF_HANDLE || 1902 tmp->type == CF_HANDLE ||
1932 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE || 1903 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||
1933 tmp->type == BUTTON || tmp->type == TELEPORTER || 1904 tmp->type == BUTTON || tmp->type == TELEPORTER ||
… …
1940 { 1911 {
1941 tmp->invisible = 0; 1912 tmp->invisible = 0;
1942 done_one = 1; 1913 done_one = 1;
1943 } 1914 }
1944 } 1915 }
1916
1945 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1917 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1946 floor = 1; 1918 floor = 1;
1947 1919
1948 /* All detections below this point don't descend beneath the floor, 1920 /* All detections below this point don't descend beneath the floor,
1949 * so just continue on. We could be clever and look at the type of 1921 * so just continue on. We could be clever and look at the type of
… …
2002 */ 1974 */
2003 if (done_one) 1975 if (done_one)
2004 { 1976 {
2005 object *detect_ob = arch_to_object (spell->other_arch); 1977 object *detect_ob = arch_to_object (spell->other_arch);
2006 1978
2007 detect_ob->x = nx;
2008 detect_ob->y = ny;
2009 /* if this is set, we want to copy the face */ 1979 /* if this is set, we want to copy the face */
2010 if (done_one == 2 && detect) 1980 if (done_one == 2 && detect)
2011 { 1981 {
2012 detect_ob->face = detect->face; 1982 detect_ob->face = detect->face;
2013 detect_ob->animation_id = detect->animation_id; 1983 detect_ob->animation_id = detect->animation_id;
… …
2015 detect_ob->last_anim = 0; 1985 detect_ob->last_anim = 0;
2016 /* by default, the detect_ob is already animated */ 1986 /* by default, the detect_ob is already animated */
2017 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1987 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2018 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1988 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2019 } 1989 }
1990
2020 insert_ob_in_map (detect_ob, m, op, 0); 1991 m->insert (detect_ob, nx, ny, op);
2021 } 1992 }
2022 } /* for processing the surrounding spaces */ 1993 } /* for processing the surrounding spaces */
2023 1994
2024 1995
2025 /* Now process objects in the players inventory if detect curse or magic */ 1996 /* Now process objects in the players inventory if detect curse or magic */
… …
2074 2045
2075 /* Explodes a fireball centered at player */ 2046 /* Explodes a fireball centered at player */
2076 tmp = get_archetype (EXPLODING_FIREBALL); 2047 tmp = get_archetype (EXPLODING_FIREBALL);
2077 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2048 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2078 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2; 2049 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2079 tmp->x = victim->x; 2050
2080 tmp->y = victim->y; 2051 tmp->insert_at (victim);
2081 insert_ob_in_map (tmp, victim->map, NULL, 0);
2082 victim->stats.sp = 2 * victim->stats.maxsp; 2052 victim->stats.sp = 2 * victim->stats.maxsp;
2083 } 2053 }
2084 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2054 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2085 {
2086 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 2055 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");
2087 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 2056 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2089 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2057 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2091 }
2092 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2058 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2093 { 2059 {
2094 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2060 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2095 confuse_player (victim, victim, 99); 2061 confuse_player (victim, victim, 99);
2096 } 2062 }
2097 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2063 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2098 {
2099 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2064 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2100 }
2101} 2065}
2102 2066
2103/* cast_transfer 2067/* cast_transfer
2104 * This spell transfers sp from the player to another person. 2068 * This spell transfers sp from the player to another person.
2105 * We let the target go above their normal maximum SP. 2069 * We let the target go above their normal maximum SP.
… …
2108int 2072int
2109cast_transfer (object *op, object *caster, object *spell, int dir) 2073cast_transfer (object *op, object *caster, object *spell, int dir)
2110{ 2074{
2111 object *plyr = NULL; 2075 object *plyr = NULL;
2112 sint16 x, y; 2076 sint16 x, y;
2113 mapstruct *m; 2077 maptile *m;
2114 int mflags; 2078 int mflags;
2115 2079
2116 m = op->map; 2080 m = op->map;
2117 x = op->x + freearr_x[dir]; 2081 x = op->x + freearr_x[dir];
2118 y = op->y + freearr_y[dir]; 2082 y = op->y + freearr_y[dir];
2119 2083
2120 mflags = get_map_flags (m, &m, x, y, &x, &y); 2084 mflags = get_map_flags (m, &m, x, y, &x, &y);
2121 2085
2122 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 2086 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2123 { 2087 {
2124 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 2088 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2125 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2089 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2126 break; 2090 break;
2127 } 2091 }
2128 2092
2129 2093
2130 /* If we did not find a player in the specified direction, transfer 2094 /* If we did not find a player in the specified direction, transfer
2131 * to anyone on top of us. This is used for the rune of transference mostly. 2095 * to anyone on top of us. This is used for the rune of transference mostly.
2132 */ 2096 */
2133 if (plyr == NULL) 2097 if (plyr == NULL)
2134 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 2098 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2135 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 2099 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2136 break; 2100 break;
2137 2101
2138 if (!plyr) 2102 if (!plyr)
2139 { 2103 {
… …
2184void 2148void
2185counterspell (object *op, int dir) 2149counterspell (object *op, int dir)
2186{ 2150{
2187 object *tmp, *head, *next; 2151 object *tmp, *head, *next;
2188 int mflags; 2152 int mflags;
2189 mapstruct *m; 2153 maptile *m;
2190 sint16 sx, sy; 2154 sint16 sx, sy;
2191 2155
2192 sx = op->x + freearr_x[dir]; 2156 sx = op->x + freearr_x[dir];
2193 sy = op->y + freearr_y[dir]; 2157 sy = op->y + freearr_y[dir];
2194 m = op->map; 2158 m = op->map;
2195 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 2159 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2196 if (mflags & P_OUT_OF_MAP) 2160 if (mflags & P_OUT_OF_MAP)
2197 return; 2161 return;
2198 2162
2199 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 2163 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2200 { 2164 {
2201 next = tmp->above; 2165 next = tmp->above;
2202 2166
2203 /* Need to look at the head object - otherwise, if tmp 2167 /* Need to look at the head object - otherwise, if tmp
2204 * points to a monster, we don't have all the necessary 2168 * points to a monster, we don't have all the necessary
… …
2218 * monsters either. 2182 * monsters either.
2219 */ 2183 */
2220 2184
2221 if (head->attacktype & AT_MAGIC && 2185 if (head->attacktype & AT_MAGIC &&
2222 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 2186 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level))
2223 { 2187 head->destroy ();
2224 remove_ob (head);
2225 free_object (head);
2226 }
2227 else 2188 else
2228 switch (head->type) 2189 switch (head->type)
2229 { 2190 {
2230 case SPELL_EFFECT: 2191 case SPELL_EFFECT:
2231 if (op->level > head->level) 2192 if (op->level > head->level)
2232 { 2193 head->destroy ();
2233 remove_ob (head); 2194
2234 free_object (head);
2235 }
2236 break; 2195 break;
2237 2196
2238 /* I really don't get this rune code that much - that 2197 /* I really don't get this rune code that much - that
2239 * random chance seems really low. 2198 * random chance seems really low.
2240 */ 2199 */
2241 case RUNE: 2200 case RUNE:
2242 if (rndm (0, 149) == 0) 2201 if (rndm (0, 149) == 0)
2243 { 2202 {
2244 head->stats.hp--; /* weaken the rune */ 2203 head->stats.hp--; /* weaken the rune */
2245 if (!head->stats.hp) 2204 if (!head->stats.hp)
2246 { 2205 head->destroy ();
2247 remove_ob (head);
2248 free_object (head);
2249 }
2250 } 2206 }
2251 break; 2207 break;
2252 } 2208 }
2253 } 2209 }
2254} 2210}
… …
2315{ 2271{
2316 object *weapon, *tmp; 2272 object *weapon, *tmp;
2317 char buf[MAX_BUF]; 2273 char buf[MAX_BUF];
2318 int a, i; 2274 int a, i;
2319 sint16 x, y; 2275 sint16 x, y;
2320 mapstruct *m; 2276 maptile *m;
2321 materialtype_t *mt; 2277 materialtype_t *mt;
2322 2278
2323 if (!spell->other_arch) 2279 if (!spell->other_arch)
2324 { 2280 {
2325 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 2281 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
2329 /* exit if it's not a player using this spell. */ 2285 /* exit if it's not a player using this spell. */
2330 if (op->type != PLAYER) 2286 if (op->type != PLAYER)
2331 return 0; 2287 return 0;
2332 2288
2333 /* if player already has a golem, abort */ 2289 /* if player already has a golem, abort */
2334 if (op->contr->ranges[range_golem] != NULL && op->contr->golem_count == op->contr->ranges[range_golem]->count) 2290 if (op->contr->ranges[range_golem])
2335 { 2291 {
2336 control_golem (op->contr->ranges[range_golem], dir); 2292 control_golem (op->contr->ranges[range_golem], dir);
2337 return 0; 2293 return 0;
2338 } 2294 }
2339 2295
… …
2391 CLEAR_FLAG (tmp, FLAG_MONSTER); 2347 CLEAR_FLAG (tmp, FLAG_MONSTER);
2392 SET_FLAG (tmp, FLAG_FRIENDLY); 2348 SET_FLAG (tmp, FLAG_FRIENDLY);
2393 tmp->stats.exp = 0; 2349 tmp->stats.exp = 0;
2394 add_friendly_object (tmp); 2350 add_friendly_object (tmp);
2395 tmp->type = GOLEM; 2351 tmp->type = GOLEM;
2396 set_owner (tmp, op); 2352 tmp->set_owner (op);
2397 set_spell_skill (op, caster, spell, tmp); 2353 set_spell_skill (op, caster, spell, tmp);
2398 op->contr->ranges[range_golem] = tmp; 2354 op->contr->ranges[range_golem] = tmp;
2399 op->contr->shoottype = range_golem; 2355 op->contr->shoottype = range_golem;
2400 op->contr->golem_count = tmp->count;
2401 2356
2402 /* Give the weapon to the golem now. A bit of a hack to check the 2357 /* Give the weapon to the golem now. A bit of a hack to check the
2403 * removed flag - it should only be set if get_split_object was 2358 * removed flag - it should only be set if get_split_object was
2404 * used above. 2359 * used above.
2405 */ 2360 */
2406 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2361 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2407 remove_ob (weapon); 2362 weapon->remove ();
2408 insert_ob_in_ob (weapon, tmp); 2363 insert_ob_in_ob (weapon, tmp);
2409 esrv_send_item (op, weapon); 2364 esrv_send_item (op, weapon);
2410 /* To do everything necessary to let a golem use the weapon is a pain, 2365 /* To do everything necessary to let a golem use the weapon is a pain,
2411 * so instead, just set it as equipped (otherwise, we need to update 2366 * so instead, just set it as equipped (otherwise, we need to update
2412 * body_info, skills, etc) 2367 * body_info, skills, etc)
2413 */ 2368 */
2414 SET_FLAG (tmp, FLAG_USE_WEAPON); 2369 SET_FLAG (tmp, FLAG_USE_WEAPON);
2415 SET_FLAG (weapon, FLAG_APPLIED); 2370 SET_FLAG (weapon, FLAG_APPLIED);
2416 fix_player (tmp); 2371 tmp->update_stats ();
2417 2372
2418 /* There used to be 'odd' code that basically seemed to take the absolute 2373 /* There used to be 'odd' code that basically seemed to take the absolute
2419 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2374 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2420 * if you're using a crappy weapon, it shouldn't be as good. 2375 * if you're using a crappy weapon, it shouldn't be as good.
2421 */ 2376 */
… …
2473 if (a > 14) 2428 if (a > 14)
2474 a = 14; 2429 a = 14;
2475 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2430 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2476 2431
2477 /* Determine golem's speed */ 2432 /* Determine golem's speed */
2478 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2433 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2479
2480 if (tmp->speed > 3.33)
2481 tmp->speed = 3.33;
2482 2434
2483 if (!spell->race) 2435 if (!spell->race)
2484 { 2436 {
2485 sprintf (buf, "animated %s", &weapon->name); 2437 sprintf (buf, "animated %s", &weapon->name);
2486 tmp->name = buf; 2438 tmp->name = buf;
… …
2488 tmp->face = weapon->face; 2440 tmp->face = weapon->face;
2489 tmp->animation_id = weapon->animation_id; 2441 tmp->animation_id = weapon->animation_id;
2490 tmp->anim_speed = weapon->anim_speed; 2442 tmp->anim_speed = weapon->anim_speed;
2491 tmp->last_anim = weapon->last_anim; 2443 tmp->last_anim = weapon->last_anim;
2492 tmp->state = weapon->state; 2444 tmp->state = weapon->state;
2493 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2445 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2494 {
2495 SET_FLAG (tmp, FLAG_ANIMATE);
2496 }
2497 else
2498 {
2499 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2500 }
2501 update_ob_speed (tmp);
2502 } 2446 }
2503 2447
2504 /* make experience increase in proportion to the strength of the summoned creature. */ 2448 /* make experience increase in proportion to the strength of the summoned creature. */
2505 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2449 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2506 2450
2507 tmp->speed_left = -1; 2451 tmp->speed_left = -1;
2508 tmp->x = x;
2509 tmp->y = y;
2510 tmp->direction = dir; 2452 tmp->direction = dir;
2511 insert_ob_in_map (tmp, m, op, 0); 2453
2454 m->insert (tmp, x, y, op);
2512 return 1; 2455 return 1;
2513} 2456}
2514 2457
2515/* cast_daylight() - changes the map darkness level *lower* */ 2458/* cast_daylight() - changes the map darkness level *lower* */
2516 2459
… …
2524 int success; 2467 int success;
2525 2468
2526 if (!op->map) 2469 if (!op->map)
2527 return 0; /* shouldnt happen */ 2470 return 0; /* shouldnt happen */
2528 2471
2529 success = change_map_light (op->map, spell->stats.dam); 2472 success = op->map->change_map_light (spell->stats.dam);
2473
2530 if (!success) 2474 if (!success)
2531 { 2475 {
2532 if (spell->stats.dam < 0) 2476 if (spell->stats.dam < 0)
2533 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2477 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2534 else 2478 else
… …
2559 2503
2560 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2504 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2561 2505
2562 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2506 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2563 2507
2564 set_owner (new_aura, op); 2508 new_aura->set_owner (op);
2565 set_spell_skill (op, caster, spell, new_aura); 2509 set_spell_skill (op, caster, spell, new_aura);
2566 new_aura->attacktype = spell->attacktype; 2510 new_aura->attacktype = spell->attacktype;
2567 2511
2568 new_aura->level = caster_level (caster, spell); 2512 new_aura->level = caster_level (caster, spell);
2569 if (refresh) 2513 if (refresh)
… …
2587void 2531void
2588move_aura (object *aura) 2532move_aura (object *aura)
2589{ 2533{
2590 int i, mflags; 2534 int i, mflags;
2591 object *env; 2535 object *env;
2592 mapstruct *m; 2536 maptile *m;
2593 2537
2594 /* auras belong in inventories */ 2538 /* auras belong in inventories */
2595 env = aura->env; 2539 env = aura->env;
2596 2540
2597 /* no matter what we've gotta remove the aura... 2541 /* no matter what we've gotta remove the aura...
2598 * we'll put it back if its time isn't up. 2542 * we'll put it back if its time isn't up.
2599 */ 2543 */
2600 remove_ob (aura); 2544 aura->remove ();
2601 2545
2602 /* exit if we're out of gas */ 2546 /* exit if we're out of gas */
2603 if (aura->duration-- < 0) 2547 if (aura->duration-- < 0)
2604 { 2548 {
2605 free_object (aura); 2549 aura->destroy ();
2606 return; 2550 return;
2607 } 2551 }
2608 2552
2609 /* auras only exist in inventories */ 2553 /* auras only exist in inventories */
2610 if (env == NULL || env->map == NULL) 2554 if (env == NULL || env->map == NULL)
2611 { 2555 {
2612 free_object (aura); 2556 aura->destroy ();
2613 return; 2557 return;
2614 } 2558 }
2615 aura->x = env->x;
2616 aura->y = env->y;
2617 2559
2618 /* we need to jump out of the inventory for a bit 2560 /* we need to jump out of the inventory for a bit
2619 * in order to hit the map conveniently. 2561 * in order to hit the map conveniently.
2620 */ 2562 */
2621 insert_ob_in_map (aura, env->map, aura, 0); 2563 aura->insert_at (env, aura);
2622 2564
2623 for (i = 1; i < 9; i++) 2565 for (i = 1; i < 9; i++)
2624 { 2566 {
2625 sint16 nx, ny; 2567 sint16 nx, ny;
2626 2568
… …
2635 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2577 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2636 { 2578 {
2637 hit_map (aura, i, aura->attacktype, 0); 2579 hit_map (aura, i, aura->attacktype, 0);
2638 2580
2639 if (aura->other_arch) 2581 if (aura->other_arch)
2640 { 2582 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2641 object *new_ob;
2642
2643 new_ob = arch_to_object (aura->other_arch);
2644 new_ob->x = nx;
2645 new_ob->y = ny;
2646 insert_ob_in_map (new_ob, m, aura, 0);
2647 } 2583 }
2648 }
2649 } 2584 }
2585
2650 /* put the aura back in the player's inventory */ 2586 /* put the aura back in the player's inventory */
2651 remove_ob (aura); 2587 aura->remove ();
2652 insert_ob_in_ob (aura, env); 2588 insert_ob_in_ob (aura, env);
2653} 2589}
2654 2590
2655/* moves the peacemaker spell. 2591/* moves the peacemaker spell.
2656 * op is the piece object. 2592 * op is the piece object.
… …
2659void 2595void
2660move_peacemaker (object *op) 2596move_peacemaker (object *op)
2661{ 2597{
2662 object *tmp; 2598 object *tmp;
2663 2599
2664 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2600 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2665 { 2601 {
2666 int atk_lev, def_lev; 2602 int atk_lev, def_lev;
2667 object *victim = tmp; 2603 object *victim = tmp;
2668 2604
2669 if (tmp->head) 2605 if (tmp->head)
… …
2680 2616
2681 if (rndm (0, atk_lev - 1) > def_lev) 2617 if (rndm (0, atk_lev - 1) > def_lev)
2682 { 2618 {
2683 /* make this sucker peaceful. */ 2619 /* make this sucker peaceful. */
2684 2620
2685 change_exp (get_owner (op), victim->stats.exp, op->skill, 0); 2621 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2686 victim->stats.exp = 0; 2622 victim->stats.exp = 0;
2687#if 0 2623#if 0
2688 /* No idea why these were all set to zero - if something 2624 /* No idea why these were all set to zero - if something
2689 * makes this creature agressive, he should still do damage. 2625 * makes this creature agressive, he should still do damage.
2690 */ 2626 */
… …
2730 return 0; 2666 return 0;
2731 } 2667 }
2732 if (!spell->other_arch) 2668 if (!spell->other_arch)
2733 return 0; 2669 return 0;
2734 tmp = arch_to_object (spell->other_arch); 2670 tmp = arch_to_object (spell->other_arch);
2735 strncpy (rune, msg, HUGE_BUF - 2); 2671
2736 rune[HUGE_BUF - 2] = 0; 2672 snprintf (rune, sizeof (rune), "%s\n", msg);
2737 strcat (rune, "\n"); 2673
2738 tmp->race = op->name; /*Save the owner of the rune */ 2674 tmp->race = op->name; /*Save the owner of the rune */
2739 tmp->msg = rune; 2675 tmp->msg = rune;
2740 tmp->x = op->x; 2676
2741 tmp->y = op->y; 2677 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2742 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2743 return 1; 2678 return 1;
2744} 2679}

Diff Legend

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