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.107 by elmex, Thu Sep 17 16:53:15 2009 UTC vs.
Revision 1.129 by root, Thu Apr 15 02:51:40 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
57} 58}
58 59
59int 60int
60recharge (object *op, object *caster, object *spell_ob) 61recharge (object *op, object *caster, object *spell_ob)
61{ 62{
62 object *wand, *tmp;
63 int ncharges; 63 int ncharges;
64 64
65 wand = find_marked_object (op); 65 object *wand = op->mark ();
66
66 if (!wand || wand->type != WAND) 67 if (!wand || wand->type != WAND)
67 { 68 {
68 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge."); 69 op->failmsg ("You need to mark the wand you want to recharge.");
69 return 0; 70 return 0;
70 } 71 }
72
71 if (!(random_roll (0, 3, op, PREFER_HIGH))) 73 if (!(random_roll (0, 3, op, PREFER_HIGH)))
72 { 74 {
73 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 75 op->failmsgf ("The %s vibrates violently, then explodes!", query_name (wand));
74 op->play_sound (sound_find ("ob_explode")); 76 op->play_sound (sound_find ("ob_explode"));
75 wand->destroy (); 77 wand->destroy ();
76 tmp = get_archetype ("fireball"); 78 object *tmp = get_archetype (shstr_fireball);
77 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;
78 80
79 if (!tmp->stats.dam) 81 if (!tmp->stats.dam)
80 tmp->stats.dam = 1; 82 tmp->stats.dam = 1;
81 83
… …
92 94
93 if (wand->inv && wand->inv->level) 95 if (wand->inv && wand->inv->level)
94 ncharges /= wand->inv->level; 96 ncharges /= wand->inv->level;
95 else 97 else
96 { 98 {
97 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 99 op->failmsgf ("Your %s is broken.", query_name (wand));
98 return 0; 100 return 0;
99 } 101 }
100 102
101 if (!ncharges) 103 if (!ncharges)
102 ncharges = 1; 104 ncharges = 1;
103 105
104 wand->stats.food += ncharges; 106 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
106 108
107 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE)) 109 if (wand->arch && wand->arch->flag [FLAG_ANIMATE])
108 { 110 {
109 SET_FLAG (wand, FLAG_ANIMATE); 111 wand->set_flag (FLAG_ANIMATE);
110 wand->set_speed (wand->arch->speed); 112 wand->set_speed (wand->arch->speed);
111 } 113 }
112 114
113 return 1; 115 return 1;
114} 116}
… …
128{ 130{
129 int bonus_plus = 0; 131 int bonus_plus = 0;
130 const char *missile_name = "arrow"; 132 const char *missile_name = "arrow";
131 133
132 for (object *tmp = op->inv; tmp; tmp = tmp->below) 134 for (object *tmp = op->inv; tmp; tmp = tmp->below)
133 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 135 if (tmp->type == BOW && tmp->flag [FLAG_APPLIED])
134 missile_name = tmp->race; 136 missile_name = tmp->race;
135 137
136 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 138 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
137 139
138 archetype *missile_arch = archetype::find (missile_name); 140 archetype *missile_arch = archetype::find (missile_name);
… …
157 break; 159 break;
158 160
159 if (!al) 161 if (!al)
160 { 162 {
161 missile->destroy (); 163 missile->destroy ();
162 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam); 164 op->failmsgf ("No such object %ss of %s", missile_name, spellparam);
163 return 0; 165 return 0;
164 } 166 }
165 167
166 if (al->item->slaying) 168 if (al->item->slaying)
167 { 169 {
168 missile->destroy (); 170 missile->destroy ();
169 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam); 171 op->failmsgf ("You are not allowed to create %ss of %s", missile_name, spellparam);
170 return 0; 172 return 0;
171 } 173 }
172 174
173 give_artifact_abilities (missile, al->item); 175 give_artifact_abilities (missile, al->item);
174 /* These special arrows cost something extra. Don't have them also be magical - 176 /* These special arrows cost something extra. Don't have them also be magical -
… …
192 194
193 missile->magic = missile_plus; 195 missile->magic = missile_plus;
194 /* Can't get any money for these objects */ 196 /* Can't get any money for these objects */
195 missile->value = 0; 197 missile->value = 0;
196 198
197 SET_FLAG (missile, FLAG_IDENTIFIED); 199 missile->set_flag (FLAG_IDENTIFIED);
198 200
199 if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ()) 201 if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())
200 pick_up (op, missile); 202 pick_up (op, missile);
201 203
202 return 1; 204 return 1;
… …
256 /* Pretty unlikely (there are some very low food items), but you never 258 /* Pretty unlikely (there are some very low food items), but you never
257 * know 259 * know
258 */ 260 */
259 if (!at) 261 if (!at)
260 { 262 {
261 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 263 op->failmsgf ("You don't have enough experience to create any food.");
262 return 0; 264 return 0;
263 } 265 }
264 266
265 food_value /= at->stats.food; 267 food_value /= at->stats.food;
266 new_op = arch_to_object (at); 268 new_op = at->instance ();
267 new_op->nrof = food_value; 269 new_op->nrof = food_value;
268 270
269 new_op->value = 0; 271 new_op->value = 0;
270 if (new_op->nrof < 1) 272 if (new_op->nrof < 1)
271 new_op->nrof = 1; 273 new_op->nrof = 1;
… …
296 mflags = get_map_flags (m, &m, x, y, &x, &y); 298 mflags = get_map_flags (m, &m, x, y, &x, &y);
297 299
298 if (mflags & P_OUT_OF_MAP) 300 if (mflags & P_OUT_OF_MAP)
299 break; 301 break;
300 302
301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 303 if (!op->flag [FLAG_WIZCAST] && (mflags & P_NO_MAGIC))
302 { 304 {
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 308
307 if (mflags & P_IS_ALIVE) 309 if (mflags & P_IS_ALIVE)
308 { 310 {
309 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 311 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
310 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 312 if (tmp->flag [FLAG_ALIVE] && (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
311 { 313 {
312 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 314 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
313 if (tmp->head != NULL) 315 if (tmp->head != NULL)
314 tmp = tmp->head; 316 tmp = tmp->head;
315 examine_monster (op, tmp); 317 examine_monster (op, tmp);
… …
338 if (pl->type == PLAYER) 340 if (pl->type == PLAYER)
339 { 341 {
340 /* If race isn't set, then invisible unless it is undead */ 342 /* If race isn't set, then invisible unless it is undead */
341 if (!pl->contr->invis_race) 343 if (!pl->contr->invis_race)
342 { 344 {
343 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 345 if (mon->flag [FLAG_UNDEAD])
344 return 0; 346 return 0;
345 347
346 return 1; 348 return 1;
347 } 349 }
348 350
… …
379int 381int
380cast_invisible (object *op, object *caster, object *spell_ob) 382cast_invisible (object *op, object *caster, object *spell_ob)
381{ 383{
382 if (op->invisible > 1000) 384 if (op->invisible > 1000)
383 { 385 {
384 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 386 op->failmsg ("You can not extend the duration of your invisibility any further");
385 return 0; 387 return 0;
386 } 388 }
387 389
388 /* Remove the switch with 90% duplicate code - just handle the differences with 390 /* Remove the switch with 90% duplicate code - just handle the differences with
389 * and if statement or two. 391 * and if statement or two.
… …
395 397
396 if (op->type == PLAYER) 398 if (op->type == PLAYER)
397 { 399 {
398 op->contr->invis_race = spell_ob->race; 400 op->contr->invis_race = spell_ob->race;
399 401
400 if (QUERY_FLAG (spell_ob, FLAG_MAKE_INVIS)) 402 if (spell_ob->flag [FLAG_MAKE_INVIS])
401 op->contr->tmp_invis = 0; 403 op->contr->tmp_invis = 0;
402 else 404 else
403 op->contr->tmp_invis = 1; 405 op->contr->tmp_invis = 1;
404 406
405 op->contr->hidden = 0; 407 op->contr->hidden = 0;
… …
447 // earth to dust tears down everything that can be torn down 449 // earth to dust tears down everything that can be torn down
448 for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next) 450 for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
449 { 451 {
450 next = tmp->above; 452 next = tmp->above;
451 453
452 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 454 if (tmp->flag [FLAG_TEAR_DOWN])
453 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 455 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
454 } 456 }
455 } 457 }
456 458
457 return 1; 459 return 1;
… …
460void 462void
461execute_word_of_recall (object *op) 463execute_word_of_recall (object *op)
462{ 464{
463 if (object *pl = op->in_player ()) 465 if (object *pl = op->in_player ())
464 { 466 {
465 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST)) 467 if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST])
466 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you."); 468 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 469 else
468 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp); 470 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
469 } 471 }
470 472
… …
564 566
565int 567int
566perceive_self (object *op) 568perceive_self (object *op)
567{ 569{
568 const char *cp = describe_item (op, op); 570 const char *cp = describe_item (op, op);
569 archetype *at = archetype::find (ARCH_DEPLETION); 571 archetype *at = archetype::find (shstr_depletion);
570 572
571 dynbuf_text &buf = msg_dynbuf; buf.clear (); 573 dynbuf_text &buf = msg_dynbuf; buf.clear ();
572 574
573 if (!op->is_player ()) 575 if (!op->is_player ())
574 return 0; 576 return 0;
… …
593 for (int i = 0; i < NUM_STATS; i++) 595 for (int i = 0; i < NUM_STATS; i++)
594 if (tmp->stats.stat (i) < 0) 596 if (tmp->stats.stat (i) < 0)
595 buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i)); 597 buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
596 } 598 }
597 599
598 if (is_dragon_pl (op)) 600 if (op->is_dragon ())
599 /* now grab the 'dragon_ability'-force from the player's inventory */ 601 /* now grab the 'dragon_ability'-force from the player's inventory */
600 for (tmp = op->inv; tmp; tmp = tmp->below) 602 for (tmp = op->inv; tmp; tmp = tmp->below)
601 { 603 {
602 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force) 604 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
603 { 605 {
… …
644 646
645 if ((spell_ob->move_block || x != op->x || y != op->y) && 647 if ((spell_ob->move_block || x != op->x || y != op->y) &&
646 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 648 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
647 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 649 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
648 { 650 {
649 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 651 op->failmsg ("Something is in the way.");
650 return 0; 652 return 0;
651 } 653 }
652 654
653 if (spell_ob->other_arch) 655 if (spell_ob->other_arch)
654 tmp = arch_to_object (spell_ob->other_arch); 656 tmp = spell_ob->other_arch->instance ();
655 else if (spell_ob->race) 657 else if (spell_ob->race)
656 { 658 {
657 char buf1[MAX_BUF]; 659 char buf1[MAX_BUF];
658 660
659 sprintf (buf1, spell_ob->race, dir); 661 sprintf (buf1, spell_ob->race, dir);
… …
663 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 665 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
664 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 666 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
665 return 0; 667 return 0;
666 } 668 }
667 669
668 tmp = arch_to_object (at); 670 tmp = at->instance ();
669 } 671 }
670 else 672 else
671 { 673 {
672 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 674 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
673 return 0; 675 return 0;
… …
678 tmp->attacktype = spell_ob->attacktype; 680 tmp->attacktype = spell_ob->attacktype;
679 tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 681 tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
680 tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 682 tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
681 tmp->range = 0; 683 tmp->range = 0;
682 } 684 }
683 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 685 else if (tmp->flag [FLAG_ALIVE])
684 { 686 {
685 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 687 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
686 tmp->stats.maxhp = tmp->stats.hp; 688 tmp->stats.maxhp = tmp->stats.hp;
687 } 689 }
688 690
689 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 691 if (spell_ob->flag [FLAG_IS_USED_UP] || tmp->flag [FLAG_IS_USED_UP])
690 { 692 {
691 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 693 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
692 SET_FLAG (tmp, FLAG_IS_USED_UP); 694 tmp->set_flag (FLAG_IS_USED_UP);
693 } 695 }
694 696
695 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 697 if (spell_ob->flag [FLAG_TEAR_DOWN])
696 { 698 {
697 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 699 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
698 tmp->stats.maxhp = tmp->stats.hp; 700 tmp->stats.maxhp = tmp->stats.hp;
699 SET_FLAG (tmp, FLAG_TEAR_DOWN); 701 tmp->set_flag (FLAG_TEAR_DOWN);
700 SET_FLAG (tmp, FLAG_ALIVE); 702 tmp->set_flag (FLAG_ALIVE);
701 } 703 }
702 704
703 /* This can't really hurt - if the object doesn't kill anything, 705 /* This can't really hurt - if the object doesn't kill anything,
704 * these fields just won't be used. Do not set the owner for 706 * these fields just won't be used. Do not set the owner for
705 * earthwalls, though, so they survive restarts. 707 * earthwalls, though, so they survive restarts.
… …
717 return 0; 719 return 0;
718 } 720 }
719 721
720 /* If this is a spellcasting wall, need to insert the spell object */ 722 /* If this is a spellcasting wall, need to insert the spell object */
721 if (tmp->other_arch && tmp->other_arch->type == SPELL) 723 if (tmp->other_arch && tmp->other_arch->type == SPELL)
722 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 724 insert_ob_in_ob (tmp->other_arch->instance (), tmp);
723 725
724 /* This code causes the wall to extend some distance in 726 /* This code causes the wall to extend some distance in
725 * each direction, or until an obstruction is encountered. 727 * each direction, or until an obstruction is encountered.
726 * posblocked and negblocked help determine how far the 728 * posblocked and negblocked help determine how far the
727 * created wall can extend, it won't go extend through 729 * created wall can extend, it won't go extend through
… …
747 object *tmp2 = tmp->clone (); 749 object *tmp2 = tmp->clone ();
748 m->insert (tmp2, x, y, op); 750 m->insert (tmp2, x, y, op);
749 751
750 /* If this is a spellcasting wall, need to insert the spell object */ 752 /* If this is a spellcasting wall, need to insert the spell object */
751 if (tmp2->other_arch && tmp2->other_arch->type == SPELL) 753 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
752 tmp2->insert (arch_to_object (tmp2->other_arch)); 754 tmp2->insert (tmp2->other_arch->instance ());
753 755
754 } 756 }
755 else 757 else
756 posblocked = 1; 758 posblocked = 1;
757 759
… …
764 { 766 {
765 object *tmp2 = tmp->clone (); 767 object *tmp2 = tmp->clone ();
766 m->insert (tmp2, x, y, op); 768 m->insert (tmp2, x, y, op);
767 769
768 if (tmp2->other_arch && tmp2->other_arch->type == SPELL) 770 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
769 tmp2->insert (arch_to_object (tmp2->other_arch)); 771 tmp2->insert (tmp2->other_arch->instance ());
770 } 772 }
771 else 773 else
772 negblocked = 1; 774 negblocked = 1;
773 } 775 }
774 776
775 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 777 if (tmp->flag [FLAG_BLOCKSVIEW])
776 update_all_los (op->map, op->x, op->y); 778 update_all_los (op->map, op->x, op->y);
777 779
778 return 1; 780 return 1;
779} 781}
780 782
… …
789 if (op->type != PLAYER) 791 if (op->type != PLAYER)
790 return 0; 792 return 0;
791 793
792 if (!dir) 794 if (!dir)
793 { 795 {
794 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?"); 796 op->failmsg ("In what direction?");
795 return 0; 797 return 0;
796 } 798 }
797 799
798 /* Given the new outdoor maps, can't let players dimension door for 800 /* Given the new outdoor maps, can't let players dimension door for
799 * ever, so put limits in. 801 * ever, so put limits in.
… …
804 { 806 {
805 int count = atoi (spellparam); 807 int count = atoi (spellparam);
806 808
807 if (count > maxdist) 809 if (count > maxdist)
808 { 810 {
809 new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!"); 811 op->failmsg ("You can't dimension door that far!");
810 return 0; 812 return 0;
811 } 813 }
812 814
813 for (dist = 0; dist < count; dist++) 815 for (dist = 0; dist < count; dist++)
814 { 816 {
… …
875 break; 877 break;
876 878
877 } 879 }
878 if (!dist) 880 if (!dist)
879 { 881 {
880 new_draw_info (NDI_UNIQUE, 0, op, "Your spell failed!\n"); 882 op->failmsg ("Your spell failed!\n");
881 return 0; 883 return 0;
882 } 884 }
883 } 885 }
884 886
885 /* Actually move the player now */ 887 /* Actually move the player now */
886 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op))) 888 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
887 return 1; 889 return 1;
888 890
889 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 891 op->speed_left = -5. * op->speed; /* Freeze them for a short while */
892
890 return 1; 893 return 1;
891} 894}
892 895
893/* cast_heal: Heals something. 896/* cast_heal: Heals something.
894 * op is the caster. 897 * op is the caster.
… …
949 if (cure_disease (tmp, op, spell)) 952 if (cure_disease (tmp, op, spell))
950 success = 1; 953 success = 1;
951 954
952 if (spell->attacktype & AT_POISON) 955 if (spell->attacktype & AT_POISON)
953 { 956 {
954 at = archetype::find ("poisoning"); 957 at = archetype::find (shstr_poisoning);
955 poison = present_arch_in_ob (at, tmp); 958 poison = present_arch_in_ob (at, tmp);
956 if (poison) 959 if (poison)
957 { 960 {
958 success = 1; 961 success = 1;
959 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 962 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
… …
961 } 964 }
962 } 965 }
963 966
964 if (spell->attacktype & AT_CONFUSION) 967 if (spell->attacktype & AT_CONFUSION)
965 { 968 {
966 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 969 poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
967 if (poison) 970 if (poison)
968 { 971 {
969 success = 1; 972 success = 1;
970 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 973 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
971 poison->duration = 1; 974 poison->duration = 1;
972 } 975 }
973 } 976 }
974 977
975 if (spell->attacktype & AT_BLIND) 978 if (spell->attacktype & AT_BLIND)
976 { 979 {
977 at = archetype::find ("blindness"); 980 at = archetype::find (shstr_blindness);
978 poison = present_arch_in_ob (at, tmp); 981 poison = present_arch_in_ob (at, tmp);
979 if (poison) 982 if (poison)
980 { 983 {
981 success = 1; 984 success = 1;
982 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 985 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
… …
1000 tmp->stats.grace = tmp->stats.maxgrace; 1003 tmp->stats.grace = tmp->stats.maxgrace;
1001 success = 1; 1004 success = 1;
1002 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1005 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1003 } 1006 }
1004 1007
1005 if (spell->stats.food && tmp->stats.food < 999) 1008 if (spell->stats.food && tmp->stats.food < MAX_FOOD)
1006 { 1009 {
1007 tmp->stats.food += spell->stats.food; 1010 tmp->stats.food += spell->stats.food;
1008 1011 min_it (tmp->stats.food, MAX_FOOD);
1009 if (tmp->stats.food > 999)
1010 tmp->stats.food = 999;
1011 1012
1012 success = 1; 1013 success = 1;
1013 /* We could do something a bit better like the messages for healing above */ 1014 /* We could do something a bit better like the messages for healing above */
1014 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 1015 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1015 } 1016 }
… …
1062 break; 1063 break;
1063 } 1064 }
1064 else if (spell_ob->race && spell_ob->race == tmp2->name) 1065 else if (spell_ob->race && spell_ob->race == tmp2->name)
1065 { 1066 {
1066 if (!silent) 1067 if (!silent)
1067 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl); 1068 op->failmsgf ("You can not cast %s while %s is in effect",
1069 &spell_ob->name, &tmp2->name_pl);
1068 1070
1069 return 0; 1071 return 0;
1070 } 1072 }
1071 } 1073 }
1072 } 1074 }
1073 1075
1074 if (!force)
1075 {
1076 force = get_archetype (FORCE_NAME);
1077 force->subtype = FORCE_CHANGE_ABILITY;
1078
1079 if (spell_ob->race)
1080 force->name = spell_ob->race;
1081 else
1082 force->name = spell_ob->name;
1083
1084 force->name_pl = spell_ob->name;
1085 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1086
1087 }
1088 else
1089 {
1090 int duration = change_ability_duration (spell_ob, caster); 1076 int duration = change_ability_duration (spell_ob, caster);
1091 1077
1078 if (force)
1079 {
1092 if (duration > force->duration) 1080 if (duration > force->duration)
1093 { 1081 {
1094 force->duration = duration; 1082 force->duration = duration;
1095 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1083 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1096 } 1084 }
… …
1098 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1086 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1099 1087
1100 return 1; 1088 return 1;
1101 } 1089 }
1102 1090
1103 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1091 new_draw_info_format (NDI_UNIQUE, 0, op,
1092 "You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
1093 TICK2TIME (duration));
1094
1095 force = get_archetype (FORCE_NAME);
1096 force->subtype = FORCE_CHANGE_ABILITY;
1097 force->duration = duration;
1098
1099 if (spell_ob->race)
1100 force->name = spell_ob->race;
1101 else
1102 force->name = spell_ob->name;
1103
1104 force->name_pl = spell_ob->name;
1105
1104 force->speed = 1.0; 1106 force->speed = 1.0;
1105 force->speed_left = -1.0; 1107 force->speed_left = -1.0;
1106 SET_FLAG (force, FLAG_APPLIED); 1108 force->set_flag (FLAG_APPLIED);
1107 1109
1108 /* Now start processing the effects. First, protections */ 1110 /* Now start processing the effects. First, protections */
1109 for (i = 0; i < NROFATTACKS; i++) 1111 for (i = 0; i < NROFATTACKS; i++)
1110 { 1112 {
1111 if (spell_ob->resist[i]) 1113 if (spell_ob->resist[i])
… …
1141 } 1143 }
1142 } 1144 }
1143 1145
1144 force->move_type = spell_ob->move_type; 1146 force->move_type = spell_ob->move_type;
1145 1147
1146 if (QUERY_FLAG (spell_ob, FLAG_SEE_IN_DARK)) 1148 if (spell_ob->flag [FLAG_SEE_IN_DARK])
1147 SET_FLAG (force, FLAG_SEE_IN_DARK); 1149 force->set_flag (FLAG_SEE_IN_DARK);
1148 1150
1149 if (QUERY_FLAG (spell_ob, FLAG_XRAYS)) 1151 if (spell_ob->flag [FLAG_XRAYS])
1150 SET_FLAG (force, FLAG_XRAYS); 1152 force->set_flag (FLAG_XRAYS);
1151 1153
1152 /* Haste/bonus speed */ 1154 /* Haste/bonus speed */
1153 if (spell_ob->stats.exp) 1155 if (spell_ob->stats.exp)
1154 { 1156 {
1155 if (op->speed > 0.5f) 1157 if (op->speed > 0.5f)
… …
1236 return 0; 1238 return 0;
1237 } 1239 }
1238 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1240 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1239 force->speed = 1.0; 1241 force->speed = 1.0;
1240 force->speed_left = -1.0; 1242 force->speed_left = -1.0;
1241 SET_FLAG (force, FLAG_APPLIED); 1243 force->set_flag (FLAG_APPLIED);
1242 1244
1243 if (!god) 1245 if (!god)
1244 { 1246 {
1245 new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty."); 1247 new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");
1246 } 1248 }
1247 else 1249 else
1248 { 1250 {
1249 /* Only give out good benefits, and put a max on it */ 1251 /* Only give out good benefits, and put a max on it */
1250 for (i = 0; i < NROFATTACKS; i++) 1252 for (i = 0; i < NROFATTACKS; i++)
1251 {
1252 if (god->resist[i] > 0) 1253 if (god->resist[i] > 0)
1253 {
1254 force->resist[i] = MIN (god->resist[i], spell_ob->resist[ATNR_GODPOWER]); 1254 force->resist[i] = min (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);
1255 } 1255
1256 }
1257 force->path_attuned |= god->path_attuned; 1256 force->path_attuned |= god->path_attuned;
1258 1257
1259 if (spell_ob->attacktype) 1258 if (spell_ob->attacktype)
1260 force->slaying = god->slaying; 1259 force->slaying = god->slaying;
1261 1260
… …
1303 * the nuggets, alchemy the gold from that, etc. 1302 * the nuggets, alchemy the gold from that, etc.
1304 * Otherwise, give 9 silver on the gold for other objects, 1303 * Otherwise, give 9 silver on the gold for other objects,
1305 * so that it would still be more affordable to haul 1304 * so that it would still be more affordable to haul
1306 * the stuff back to town. 1305 * the stuff back to town.
1307 */ 1306 */
1308 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1307 if (obj->flag [FLAG_UNPAID])
1309 value = 0; 1308 value = 0;
1310 else if (obj->type == MONEY || obj->type == GEM) 1309 else if (obj->type == MONEY || obj->type == GEM)
1311 value /= 3; 1310 value /= 3;
1312 else 1311 else
1313 value = value * 9 / 10; 1312 value = value * 9 / 10;
… …
1326 if (op->type != PLAYER) 1325 if (op->type != PLAYER)
1327 return 0; 1326 return 0;
1328 1327
1329 archetype *nugget[3]; 1328 archetype *nugget[3];
1330 1329
1331 nugget[0] = archetype::find ("pyrite3"); 1330 nugget[0] = archetype::find (shstr_pyrite3);
1332 nugget[1] = archetype::find ("pyrite2"); 1331 nugget[1] = archetype::find (shstr_pyrite2);
1333 nugget[2] = archetype::find ("pyrite"); 1332 nugget[2] = archetype::find (shstr_pyrite);
1334 1333
1335 /* Put a maximum weight of items that can be alchemised. Limits the power 1334 /* Put a maximum weight of items that can be alchemised. Limits the power
1336 * some, and also prevents people from alchemising every table/chair/clock 1335 * some, and also prevents people from alchemising every table/chair/clock
1337 * in sight 1336 * in sight
1338 */ 1337 */
… …
1367 1366
1368 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next) 1367 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1369 { 1368 {
1370 next = tmp->above; 1369 next = tmp->above;
1371 1370
1372 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1371 if (tmp->weight > 0 && !tmp->flag [FLAG_NO_PICK] &&
1373 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1372 !tmp->flag [FLAG_ALIVE] && !tmp->flag [FLAG_IS_CAULDRON])
1374 { 1373 {
1375 if (tmp->inv) 1374 if (tmp->inv)
1376 { 1375 {
1377 object *next1, *tmp1; 1376 object *next1, *tmp1;
1378 1377
1379 for (tmp1 = tmp->inv; tmp1; tmp1 = next1) 1378 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1380 { 1379 {
1381 next1 = tmp1->below; 1380 next1 = tmp1->below;
1382 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1381 if (tmp1->weight > 0 && !tmp1->flag [FLAG_NO_PICK] &&
1383 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1382 !tmp1->flag [FLAG_ALIVE] && !tmp1->flag [FLAG_IS_CAULDRON])
1384 alchemy_object (tmp1, value, weight); 1383 alchemy_object (tmp1, value, weight);
1385 } 1384 }
1386 } 1385 }
1387 1386
1388 alchemy_object (tmp, value, weight); 1387 alchemy_object (tmp, value, weight);
… …
1398 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i) 1397 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1399 if (int nrof = value / nugget [i]->value) 1398 if (int nrof = value / nugget [i]->value)
1400 { 1399 {
1401 value -= nrof * nugget[i]->value; 1400 value -= nrof * nugget[i]->value;
1402 1401
1403 object *tmp = arch_to_object (nugget[i]); 1402 object *tmp = nugget[i]->instance ();
1404 tmp->nrof = nrof; 1403 tmp->nrof = nrof;
1405 tmp->flag [FLAG_IDENTIFIED] = true; 1404 tmp->flag [FLAG_IDENTIFIED] = true;
1406 op->map->insert (tmp, x, y, op, 0); 1405 op->map->insert (tmp, x, y, op, 0);
1407 } 1406 }
1408 1407
… …
1422remove_curse (object *op, object *caster, object *spell) 1421remove_curse (object *op, object *caster, object *spell)
1423{ 1422{
1424 int success = 0, was_one = 0; 1423 int success = 0, was_one = 0;
1425 1424
1426 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1425 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1427 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1426 if (tmp->flag [FLAG_APPLIED] &&
1428 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1427 ((tmp->flag [FLAG_CURSED] && spell->flag [FLAG_CURSED]) ||
1429 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1428 (tmp->flag [FLAG_DAMNED] && spell->flag [FLAG_DAMNED])))
1430 { 1429 {
1431 was_one++; 1430 was_one++;
1432 1431
1433 if (tmp->level <= casting_level (caster, spell)) 1432 if (tmp->level <= casting_level (caster, spell))
1434 { 1433 {
1435 success++; 1434 success++;
1436 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1435 if (spell->flag [FLAG_DAMNED])
1437 CLEAR_FLAG (tmp, FLAG_DAMNED); 1436 tmp->clr_flag (FLAG_DAMNED);
1438 1437
1439 CLEAR_FLAG (tmp, FLAG_CURSED); 1438 tmp->clr_flag (FLAG_CURSED);
1440 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1439 tmp->clr_flag (FLAG_KNOWN_CURSED);
1441 tmp->value = 0; /* Still can't sell it */ 1440 tmp->value = 0; /* Still can't sell it */
1442 1441
1443 if (object *pl = tmp->visible_to ()) 1442 if (object *pl = tmp->visible_to ())
1444 esrv_update_item (UPD_FLAGS, pl, tmp); 1443 esrv_update_item (UPD_FLAGS, pl, tmp);
1445 } 1444 }
… …
1470 1469
1471 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell)); 1470 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1472 1471
1473 for (tmp = op->inv; tmp; tmp = tmp->below) 1472 for (tmp = op->inv; tmp; tmp = tmp->below)
1474 { 1473 {
1475 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1474 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1476 { 1475 {
1477 identify (tmp); 1476 identify (tmp);
1478 1477
1479 if (op->type == PLAYER) 1478 if (op->type == PLAYER)
1480 { 1479 {
… …
1494 * was not fully used. 1493 * was not fully used.
1495 */ 1494 */
1496 if (num_ident) 1495 if (num_ident)
1497 { 1496 {
1498 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1497 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1499 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1498 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1500 { 1499 {
1501 identify (tmp); 1500 identify (tmp);
1502 1501
1503 if (object *pl = tmp->visible_to ()) 1502 if (object *pl = tmp->visible_to ())
1504 { 1503 {
… …
1544 range = spell->range + SP_level_range_adjust (caster, spell); 1543 range = spell->range + SP_level_range_adjust (caster, spell);
1545 1544
1546 if (!skill) 1545 if (!skill)
1547 skill = caster; 1546 skill = caster;
1548 1547
1548 dynbuf buf;
1549 unordered_mapwalk (op, -range, -range, range, range) 1549 unordered_mapwalk (buf, op, -range, -range, range, range)
1550 { 1550 {
1551 /* For most of the detections, we only detect objects above the 1551 /* For most of the detections, we only detect objects above the
1552 * floor. But this is not true for show invisible. 1552 * floor. But this is not true for show invisible.
1553 * Basically, we just go and find the top object and work 1553 * Basically, we just go and find the top object and work
1554 * down - that is easier than working up. 1554 * down - that is easier than working up.
1555 */ 1555 */
1556 1556
1557 for (last = NULL, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above) 1557 for (last = 0, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1558 last = tmp; 1558 last = tmp;
1559 1559
1560 /* Shouldn't happen, but if there are no objects on a space, this 1560 /* Shouldn't happen, but if there are no objects on a space, this
1561 * would happen. 1561 * would happen.
1562 */ 1562 */
1563 if (!last) 1563 if (!last)
1564 continue; 1564 continue;
1565 1565
1566 done_one = 0; 1566 done_one = 0;
1567 floor = 0; 1567 floor = 0;
1568 detect = NULL; 1568 detect = 0;
1569 for (tmp = last; tmp; tmp = tmp->below) 1569 for (tmp = last; tmp; tmp = tmp->below)
1570 { 1570 {
1571 /* show invisible */ 1571 /* show invisible */
1572 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1572 if (spell->flag [FLAG_MAKE_INVIS]
1573 /* Might there be other objects that we can make visible? */ 1573 /* Might there be other objects that we can make visible? */
1574 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) 1574 && (tmp->invisible && (tmp->flag [FLAG_MONSTER]
1575 || (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) 1575 || (tmp->type == PLAYER && !tmp->flag [FLAG_WIZ])
1576 || tmp->type == CF_HANDLE 1576 || tmp->type == T_HANDLE
1577 || tmp->type == TRAPDOOR 1577 || tmp->type == TRAPDOOR
1578 || tmp->type == EXIT 1578 || tmp->type == EXIT
1579 || tmp->type == HOLE 1579 || tmp->type == HOLE
1580 || tmp->type == BUTTON 1580 || tmp->type == BUTTON
1581 || tmp->type == TELEPORTER 1581 || tmp->type == TELEPORTER
1582 || tmp->type == GATE 1582 || tmp->type == GATE
1583 || tmp->type == LOCKED_DOOR 1583 || tmp->type == LOCKED_DOOR
1584 || tmp->type == WEAPON 1584 || tmp->type == WEAPON
1585 || tmp->type == ALTAR 1585 || tmp->type == ALTAR
1586 || tmp->type == SIGN 1586 || (tmp->type == SIGN && tmp->face != magicmouth_face)
1587 || tmp->type == TRIGGER_PEDESTAL 1587 || tmp->type == TRIGGER_PEDESTAL
1588 || tmp->type == SPECIAL_KEY 1588 || tmp->type == SPECIAL_KEY
1589 || tmp->type == TREASURE 1589 || tmp->type == TREASURE
1590 || tmp->type == BOOK 1590 || tmp->type == BOOK
1591 || tmp->type == HOLY_ALTAR 1591 || tmp->type == HOLY_ALTAR
1592 || tmp->type == CONTAINER))) 1592 || tmp->type == CONTAINER)))
1593 { 1593 {
1594 printf ("show inv %s\n", tmp->debug_desc());//D
1594 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4) 1595 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1595 { 1596 {
1596 tmp->invisible = 0; 1597 tmp->invisible = 0;
1597 done_one = 1; 1598 done_one = 1;
1598 } 1599 }
1599 } 1600 }
1600 1601
1601 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1602 if (tmp->flag [FLAG_IS_FLOOR])
1602 floor = 1; 1603 floor = 1;
1603 1604
1604 /* All detections below this point don't descend beneath the floor, 1605 /* All detections below this point don't descend beneath the floor,
1605 * so just continue on. We could be clever and look at the type of 1606 * so just continue on. We could be clever and look at the type of
1606 * detection to completely break out if we don't care about objects beneath 1607 * detection to completely break out if we don't care about objects beneath
… …
1615 * difficult to see what object is magical/cursed, so the 1616 * difficult to see what object is magical/cursed, so the
1616 * effect wouldn't be as apparent. 1617 * effect wouldn't be as apparent.
1617 */ 1618 */
1618 1619
1619 /* detect magic */ 1620 /* detect magic */
1620 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && 1621 if (spell->flag [FLAG_KNOWN_MAGICAL] &&
1621 !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp)) 1622 !tmp->flag [FLAG_KNOWN_MAGICAL] && !tmp->flag [FLAG_IDENTIFIED] && is_magical (tmp))
1622 { 1623 {
1623 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1624 tmp->set_flag (FLAG_KNOWN_MAGICAL);
1624 /* make runes more visibile */ 1625 /* make runes more visible */
1625 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC) 1626 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1626 tmp->stats.Cha /= 4; 1627 tmp->stats.Cha /= 4;
1627 1628
1628 done_one = 1; 1629 done_one = 1;
1629 } 1630 }
1630 1631
1631 /* detect monster */ 1632 /* detect monster */
1632 if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER)) 1633 if (spell->flag [FLAG_MONSTER] && (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER))
1633 { 1634 {
1634 done_one = 2; 1635 done_one = 2;
1635 1636
1636 if (!detect) 1637 if (!detect)
1637 detect = tmp; 1638 detect = tmp;
… …
1639 1640
1640 /* Basically, if race is set in the spell, then the creatures race must 1641 /* Basically, if race is set in the spell, then the creatures race must
1641 * match that. if the spell race is set to GOD, then the gods opposing 1642 * match that. if the spell race is set to GOD, then the gods opposing
1642 * race must match. 1643 * race must match.
1643 */ 1644 */
1644 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && 1645 if (spell->race && tmp->flag [FLAG_MONSTER] && tmp->race &&
1645 ((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) || 1646 ((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
1646 spell->race.contains (tmp->race))) 1647 spell->race.contains (tmp->race)))
1647 { 1648 {
1648 done_one = 2; 1649 done_one = 2;
1649 1650
1650 if (!detect) 1651 if (!detect)
1651 detect = tmp; 1652 detect = tmp;
1652 } 1653 }
1653 1654
1654 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1655 if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
1655 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1656 (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1656 { 1657 {
1657 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1658 tmp->set_flag (FLAG_KNOWN_CURSED);
1658 done_one = 1; 1659 done_one = 1;
1660 }
1661
1662 // Do mining detection spell:
1663 if (spell->last_sp == 1) // 1 - detect any vein
1664 {
1665 if (tmp->type == VEIN)
1666 {
1667 if (tmp->other_arch)
1668 {
1669 if (!detect)
1670 detect = tmp->other_arch;
1671 done_one = 2;
1672 }
1673 else
1674 done_one = 1;
1675 }
1659 } 1676 }
1660 } /* for stack of objects on this space */ 1677 } /* for stack of objects on this space */
1661 1678
1662 /* Code here puts an effect of the spell on the space, so you can see 1679 /* Code here puts an effect of the spell on the space, so you can see
1663 * where the magic is. 1680 * where the magic is.
1664 */ 1681 */
1665 if (done_one) 1682 if (done_one)
1666 { 1683 {
1667 object *detect_ob = arch_to_object (spell->other_arch); 1684 object *detect_ob = spell->other_arch->instance ();
1668 1685
1669 /* if this is set, we want to copy the face */ 1686 /* if this is set, we want to copy the face */
1670 if (done_one == 2 && detect) 1687 if (done_one == 2 && detect)
1671 { 1688 {
1672 detect_ob->face = detect->face; 1689 detect_ob->face = detect->face;
1673 detect_ob->animation_id = detect->animation_id; 1690 detect_ob->animation_id = detect->animation_id;
1674 detect_ob->anim_speed = detect->anim_speed; 1691 detect_ob->anim_speed = detect->anim_speed;
1675 detect_ob->last_anim = 0; 1692 detect_ob->last_anim = 0;
1676 /* by default, the detect_ob is already animated */ 1693 /* by default, the detect_ob is already animated */
1677 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1694 if (!detect->flag [FLAG_ANIMATE])
1678 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1695 detect_ob->clr_flag (FLAG_ANIMATE);
1679 } 1696 }
1680 1697
1681 m->insert (detect_ob, nx, ny, op); 1698 m->insert (detect_ob, nx, ny, op, INS_ON_TOP);
1682 } 1699 }
1683 } /* for processing the surrounding spaces */ 1700 } /* for processing the surrounding spaces */
1684 1701
1685 1702
1686 /* Now process objects in the players inventory if detect curse or magic */ 1703 /* Now process objects in the players inventory if detect curse or magic */
1687 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1704 if (spell->flag [FLAG_KNOWN_CURSED] || spell->flag [FLAG_KNOWN_MAGICAL])
1688 { 1705 {
1689 done_one = 0; 1706 done_one = 0;
1690 1707
1691 for (tmp = op->inv; tmp; tmp = tmp->below) 1708 for (tmp = op->inv; tmp; tmp = tmp->below)
1692 { 1709 {
1693 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1710 if (!tmp->invisible && !tmp->flag [FLAG_IDENTIFIED])
1694 { 1711 {
1695 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1712 if (spell->flag [FLAG_KNOWN_MAGICAL] && is_magical (tmp) && !tmp->flag [FLAG_KNOWN_MAGICAL])
1696 { 1713 {
1697 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1714 tmp->set_flag (FLAG_KNOWN_MAGICAL);
1698 1715
1699 if (object *pl = tmp->visible_to ()) 1716 if (object *pl = tmp->visible_to ())
1700 esrv_update_item (UPD_FLAGS, pl, tmp); 1717 esrv_update_item (UPD_FLAGS, pl, tmp);
1701 } 1718 }
1702 1719
1703 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1720 if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
1704 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1721 (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1705 { 1722 {
1706 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1723 tmp->set_flag (FLAG_KNOWN_CURSED);
1707 1724
1708 if (object *pl = tmp->visible_to ()) 1725 if (object *pl = tmp->visible_to ())
1709 esrv_update_item (UPD_FLAGS, pl, tmp); 1726 esrv_update_item (UPD_FLAGS, pl, tmp);
1710 } 1727 }
1711 } /* if item is not identified */ 1728 } /* if item is not identified */
… …
1771 mflags = get_map_flags (m, &m, x, y, &x, &y); 1788 mflags = get_map_flags (m, &m, x, y, &x, &y);
1772 1789
1773 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 1790 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
1774 { 1791 {
1775 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above) 1792 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
1776 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1793 if (plyr != op && plyr->flag [FLAG_ALIVE])
1777 break; 1794 break;
1778 } 1795 }
1779 1796
1780 1797
1781 /* If we did not find a player in the specified direction, transfer 1798 /* If we did not find a player in the specified direction, transfer
1782 * to anyone on top of us. This is used for the rune of transference mostly. 1799 * to anyone on top of us. This is used for the rune of transference mostly.
1783 */ 1800 */
1784 if (plyr == NULL) 1801 if (plyr == NULL)
1785 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 1802 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
1786 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1803 if (plyr != op && plyr->flag [FLAG_ALIVE])
1787 break; 1804 break;
1788 1805
1789 if (!plyr) 1806 if (!plyr)
1790 { 1807 {
1791 new_draw_info (NDI_BLACK, 0, op, "There is no one there."); 1808 op->failmsg ("There is no one there.");
1792 return 0; 1809 return 0;
1793 } 1810 }
1794 /* give sp */ 1811 /* give sp */
1795 if (spell->stats.dam > 0) 1812 if (spell->stats.dam > 0)
1796 { 1813 {
… …
1808 if (rate > 95) 1825 if (rate > 95)
1809 rate = 95; 1826 rate = 95;
1810 1827
1811 sucked = (plyr->stats.sp * rate) / 100; 1828 sucked = (plyr->stats.sp * rate) / 100;
1812 plyr->stats.sp -= sucked; 1829 plyr->stats.sp -= sucked;
1813 if (QUERY_FLAG (op, FLAG_ALIVE)) 1830 if (op->flag [FLAG_ALIVE])
1814 { 1831 {
1815 /* Player doesn't get full credit */ 1832 /* Player doesn't get full credit */
1816 sucked = (sucked * rate) / 100; 1833 sucked = (sucked * rate) / 100;
1817 op->stats.sp += sucked; 1834 op->stats.sp += sucked;
1818 if (sucked > 0) 1835 if (sucked > 0)
… …
1869 * monsters either. 1886 * monsters either.
1870 */ 1887 */
1871 1888
1872 if (head->attacktype & AT_MAGIC 1889 if (head->attacktype & AT_MAGIC
1873 && !(head->attacktype & AT_COUNTERSPELL) 1890 && !(head->attacktype & AT_COUNTERSPELL)
1874 && !QUERY_FLAG (head, FLAG_MONSTER) 1891 && !head->flag [FLAG_MONSTER]
1875 && (op->level > head->level)) 1892 && (op->level > head->level))
1876 head->destroy (); 1893 head->destroy ();
1877 else 1894 else
1878 switch (head->type) 1895 switch (head->type)
1879 { 1896 {
1880 case SPELL_EFFECT: 1897 case SPELL_EFFECT:
1881 // XXX: Don't affect floor spelleffects. See also XXX comment 1898 // XXX: Don't affect floor spelleffects. See also XXX comment
1882 // about sanctuary in spell_util.C 1899 // about sanctuary in spell_util.C
1883 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1900 if (tmp->flag [FLAG_IS_FLOOR])
1884 continue; 1901 continue;
1885 1902
1886 if (op->level > head->level) 1903 if (op->level > head->level)
1887 head->destroy (); 1904 head->destroy ();
1888 1905
… …
1911 1928
1912 object *tmp, *god = find_god (determine_god (op)); 1929 object *tmp, *god = find_god (determine_god (op));
1913 1930
1914 if (!god) 1931 if (!god)
1915 { 1932 {
1916 new_draw_info (NDI_UNIQUE, 0, op, "You can't consecrate anything if you don't worship a god!"); 1933 op->failmsg ("You can't consecrate anything if you don't worship a god!");
1917 return 0; 1934 return 0;
1918 } 1935 }
1919 1936
1920 for (tmp = op->below; tmp; tmp = tmp->below) 1937 for (tmp = op->below; tmp; tmp = tmp->below)
1921 { 1938 {
1922 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1939 if (tmp->flag [FLAG_IS_FLOOR])
1923 break; 1940 break;
1924 if (tmp->type == HOLY_ALTAR) 1941 if (tmp->type == HOLY_ALTAR)
1925 { 1942 {
1926 1943
1927 if (tmp->level > casting_level (caster, spell)) 1944 if (tmp->level > casting_level (caster, spell))
1928 { 1945 {
1929 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name); 1946 op->failmsgf ("You are not powerful enough to reconsecrate the %s", &tmp->name);
1930 return 0; 1947 return 0;
1931 } 1948 }
1932 else 1949 else
1933 { 1950 {
1934 /* If we got here, we are consecrating an altar */ 1951 /* If we got here, we are consecrating an altar */
… …
1943 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1960 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1944 return 1; 1961 return 1;
1945 } 1962 }
1946 } 1963 }
1947 } 1964 }
1948 new_draw_info (NDI_UNIQUE, 0, op, "You are not standing over an altar!"); 1965
1966 op->failmsg ("You are not standing over an altar!");
1949 return 0; 1967 return 0;
1950} 1968}
1951 1969
1952/* animate_weapon - 1970/* animate_weapon -
1953 * Generalization of staff_to_snake. Makes a golem out of the caster's weapon. 1971 * Generalization of staff_to_snake. Makes a golem out of the caster's weapon.
… …
1960 * player checks. MSW 2003-01-06 1978 * player checks. MSW 2003-01-06
1961 */ 1979 */
1962int 1980int
1963animate_weapon (object *op, object *caster, object *spell, int dir) 1981animate_weapon (object *op, object *caster, object *spell, int dir)
1964{ 1982{
1965 object *weapon, *tmp;
1966 char buf[MAX_BUF]; 1983 char buf[MAX_BUF];
1967 int a, i; 1984 int a, i;
1968 sint16 x, y; 1985 sint16 x, y;
1969 maptile *m; 1986 maptile *m;
1970 1987
… …
1995 2012
1996 /* if there's no place to put the golem, abort */ 2013 /* if there's no place to put the golem, abort */
1997 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) 2014 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
1998 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type)) 2015 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
1999 { 2016 {
2000 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2017 op->failmsg ("There is something in the way.");
2001 return 0; 2018 return 0;
2002 } 2019 }
2003 2020
2004 /* Use the weapon marked by the player. */ 2021 /* Use the weapon marked by the player. */
2005 weapon = find_marked_object (op); 2022 object *weapon = op->mark ();
2006 2023
2007 if (!weapon) 2024 if (!weapon)
2008 { 2025 {
2009 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2026 op->failmsg ("You must mark a weapon to use with this spell!");
2010 return 0; 2027 return 0;
2011 } 2028 }
2012 2029
2013 if (spell->race && weapon->arch->archname != spell->race) 2030 if (spell->race && weapon->arch->archname != spell->race)
2014 { 2031 {
2015 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2032 op->failmsg ("The spell fails to transform your weapon.");
2016 return 0; 2033 return 0;
2017 } 2034 }
2018 2035
2019 if (weapon->type != WEAPON) 2036 if (weapon->type != WEAPON)
2020 { 2037 {
2021 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it."); 2038 op->failmsg ("You need to wield a weapon to animate it.");
2022 return 0; 2039 return 0;
2023 } 2040 }
2024 2041
2025 if (QUERY_FLAG (weapon, FLAG_APPLIED)) 2042 if (weapon->flag [FLAG_APPLIED])
2026 { 2043 {
2027 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2044 op->failmsgf ("You need to unequip %s before using it in this spell", query_name (weapon));
2028 return 0; 2045 return 0;
2029 } 2046 }
2030 2047
2031 weapon = weapon->split (); 2048 weapon = weapon->split ();
2032 2049
2033 /* create the golem object */ 2050 /* create the golem object */
2034 tmp = arch_to_object (spell->other_arch); 2051 object *tmp = spell->other_arch->instance ();
2035 2052
2036 /* if animated by a player, give the player control of the golem */ 2053 /* if animated by a player, give the player control of the golem */
2037 CLEAR_FLAG (tmp, FLAG_MONSTER); 2054 tmp->clr_flag (FLAG_MONSTER);
2038 tmp->stats.exp = 0; 2055 tmp->stats.exp = 0;
2039 add_friendly_object (tmp); 2056 add_friendly_object (tmp);
2040 tmp->type = GOLEM; 2057 tmp->type = GOLEM;
2041 tmp->set_owner (op); 2058 tmp->set_owner (op);
2042 op->contr->golem = tmp; 2059 op->contr->golem = tmp;
… …
2044 2061
2045 /* Give the weapon to the golem now. A bit of a hack to check the 2062 /* Give the weapon to the golem now. A bit of a hack to check the
2046 * removed flag - it should only be set if weapon->split was 2063 * removed flag - it should only be set if weapon->split was
2047 * used above. 2064 * used above.
2048 */ 2065 */
2049 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2066 if (!weapon->flag [FLAG_REMOVED])
2050 weapon->remove (); 2067 weapon->remove ();
2051 2068
2052 tmp->insert (weapon); 2069 tmp->insert (weapon);
2053 2070
2054 /* To do everything necessary to let a golem use the weapon is a pain, 2071 /* To do everything necessary to let a golem use the weapon is a pain,
2055 * so instead, just set it as equipped (otherwise, we need to update 2072 * so instead, just set it as equipped (otherwise, we need to update
2056 * body_info, skills, etc) 2073 * body_info, skills, etc)
2057 */ 2074 */
2058 SET_FLAG (tmp, FLAG_USE_WEAPON); 2075 tmp->set_flag (FLAG_USE_WEAPON);
2059 SET_FLAG (weapon, FLAG_APPLIED); 2076 weapon->set_flag (FLAG_APPLIED);
2060 tmp->update_stats (); 2077 tmp->update_stats ();
2061 2078
2062 /* There used to be 'odd' code that basically seemed to take the absolute 2079 /* There used to be 'odd' code that basically seemed to take the absolute
2063 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2080 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2064 * if you're using a crappy weapon, it shouldn't be as good. 2081 * if you're using a crappy weapon, it shouldn't be as good.
… …
2084 2101
2085 /* attacktype */ 2102 /* attacktype */
2086 if (!tmp->attacktype) 2103 if (!tmp->attacktype)
2087 tmp->attacktype = AT_PHYSICAL; 2104 tmp->attacktype = AT_PHYSICAL;
2088 2105
2089 if (materialtype_t *mt = name_to_material (op->materialname))
2090 {
2091 for (i = 0; i < NROFATTACKS; i++) 2106 for (i = 0; i < NROFATTACKS; i++)
2092 tmp->resist[i] = 50 - (mt->save[i] * 5); 2107 tmp->resist[i] = 50 - (op->material->save[i] * 5);
2093 a = mt->save[0]; 2108
2094 } 2109 a = op->material->save[0];
2095 else
2096 {
2097 for (i = 0; i < NROFATTACKS; i++)
2098 tmp->resist[i] = 5;
2099 a = 10;
2100 }
2101 2110
2102 /* Set weapon's immunity */ 2111 /* Set weapon's immunity */
2103 tmp->resist[ATNR_CONFUSION] = 100; 2112 tmp->resist[ATNR_CONFUSION] = 100;
2104 tmp->resist[ATNR_POISON] = 100; 2113 tmp->resist[ATNR_POISON] = 100;
2105 tmp->resist[ATNR_SLOW] = 100; 2114 tmp->resist[ATNR_SLOW] = 100;
… …
2132 tmp->state = weapon->state; 2141 tmp->state = weapon->state;
2133 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE]; 2142 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2134 } 2143 }
2135 2144
2136 /* make experience increase in proportion to the strength of the summoned creature. */ 2145 /* make experience increase in proportion to the strength of the summoned creature. */
2137 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell)); 2146 tmp->stats.exp *= 1 + (max (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2138 2147
2139 tmp->speed_left = -1; 2148 tmp->speed_left = -1;
2140 tmp->direction = dir; 2149 tmp->direction = dir;
2141 2150
2142 m->insert (tmp, x, y, op); 2151 m->insert (tmp, x, y, op);
… …
2159 success = op->map->change_map_light (spell->stats.dam); 2168 success = op->map->change_map_light (spell->stats.dam);
2160 2169
2161 if (!success) 2170 if (!success)
2162 { 2171 {
2163 if (spell->stats.dam < 0) 2172 if (spell->stats.dam < 0)
2164 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2173 op->failmsg ("It can be no brighter here.");
2165 else 2174 else
2166 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2175 op->failmsg ("It can be no darker here.");
2167 } 2176 }
2168 2177
2169 return success; 2178 return success;
2170} 2179}
2171 2180
… …
2181 2190
2182 new_aura = present_arch_in_ob (spell->other_arch, op); 2191 new_aura = present_arch_in_ob (spell->other_arch, op);
2183 if (new_aura) 2192 if (new_aura)
2184 refresh = 1; 2193 refresh = 1;
2185 else 2194 else
2186 new_aura = arch_to_object (spell->other_arch); 2195 new_aura = spell->other_arch->instance ();
2187 2196
2188 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2197 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2189 2198
2190 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2199 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2191 2200
… …
2256 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block))) 2265 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2257 { 2266 {
2258 hit_map (aura, i, aura->attacktype, 0); 2267 hit_map (aura, i, aura->attacktype, 0);
2259 2268
2260 if (aura->other_arch) 2269 if (aura->other_arch)
2261 pos.insert (arch_to_object (aura->other_arch), aura); 2270 pos.insert (aura->other_arch->instance (), aura);
2262 } 2271 }
2263 } 2272 }
2264 2273
2265 /* put the aura back in the player's inventory */ 2274 /* put the aura back in the player's inventory */
2266 env->insert (aura); 2275 env->insert (aura);
… …
2276 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 2285 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2277 { 2286 {
2278 int atk_lev, def_lev; 2287 int atk_lev, def_lev;
2279 object *victim = tmp->head_ (); 2288 object *victim = tmp->head_ ();
2280 2289
2281 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2290 if (!victim->flag [FLAG_MONSTER])
2282 continue; 2291 continue;
2283 2292
2284 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2293 if (victim->flag [FLAG_UNAGGRESSIVE])
2285 continue; 2294 continue;
2286 2295
2287 if (victim->stats.exp == 0) 2296 if (victim->stats.exp == 0)
2288 continue; 2297 continue;
2289 2298
2290 def_lev = MAX (1, victim->level); 2299 def_lev = max (1, victim->level);
2291 atk_lev = MAX (1, op->level); 2300 atk_lev = max (1, op->level);
2292 2301
2293 if (rndm (0, atk_lev - 1) > def_lev) 2302 if (rndm (0, atk_lev - 1) > def_lev)
2294 { 2303 {
2295 /* make this sucker peaceful. */ 2304 /* make this sucker peaceful. */
2296 2305
… …
2305 victim->stats.sp = 0; 2314 victim->stats.sp = 0;
2306 victim->stats.grace = 0; 2315 victim->stats.grace = 0;
2307 victim->stats.Pow = 0; 2316 victim->stats.Pow = 0;
2308#endif 2317#endif
2309 victim->attack_movement = RANDO2; 2318 victim->attack_movement = RANDO2;
2310 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2319 victim->set_flag (FLAG_UNAGGRESSIVE);
2311 SET_FLAG (victim, FLAG_RUN_AWAY); 2320 victim->set_flag (FLAG_RUN_AWAY);
2312 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2321 victim->set_flag (FLAG_RANDOM_MOVE);
2313 CLEAR_FLAG (victim, FLAG_MONSTER); 2322 victim->clr_flag (FLAG_MONSTER);
2314 2323
2315 if (victim->name) 2324 if (victim->name)
2316 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2325 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2317 } 2326 }
2318 } 2327 }
… …
2324int 2333int
2325write_mark (object *op, object *spell, const char *msg) 2334write_mark (object *op, object *spell, const char *msg)
2326{ 2335{
2327 if (!msg || msg[0] == 0) 2336 if (!msg || msg[0] == 0)
2328 { 2337 {
2329 new_draw_info (NDI_UNIQUE, 0, op, "Write what?"); 2338 op->failmsg ("Write what?");
2330 return 0; 2339 return 0;
2331 } 2340 }
2332 2341
2333 if (strcasestr_local (msg, "endmsg")) 2342 if (!msg_is_safe (msg))
2334 { 2343 {
2335 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?"); 2344 op->failmsg ("Trying to cheat are we? H<@-signs are not allowed in marking runes.>");
2336 LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg); 2345 LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2337 return 0; 2346 return 0;
2338 } 2347 }
2339 2348
2340 if (!spell->other_arch) 2349 if (!spell->other_arch)
2341 return 0; 2350 return 0;
2342 2351
2343 object *tmp = arch_to_object (spell->other_arch); 2352 object *tmp = spell->other_arch->instance ();
2344 2353
2345 tmp->race = op->name; /*Save the owner of the rune */ 2354 tmp->race = op->name; /*Save the owner of the rune */
2346 tmp->msg = msg; 2355 tmp->msg = msg;
2347 2356
2348 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR); 2357 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);

Diff Legend

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