ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_util.C
(Generate patch)

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.23 by elmex, Wed Dec 20 02:15:49 2006 UTC vs.
Revision 1.54 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23
24 23
25#include <global.h> 24#include <global.h>
26#include <spells.h> 25#include <spells.h>
27#include <object.h> 26#include <object.h>
28#include <errno.h> 27#include <errno.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 28#include <sproto.h>
31#endif
32#include <sounds.h> 29#include <sounds.h>
33 30
34extern char *spell_mapping[]; 31extern char *spell_mapping[];
35 32
36/* This returns a random spell from 'ob'. If skill is set, then 33/* This returns a random spell from 'ob'. If skill is set, then
… …
98 95
99 if (init_spells_done) 96 if (init_spells_done)
100 return; 97 return;
101 LOG (llevDebug, "Checking spells...\n"); 98 LOG (llevDebug, "Checking spells...\n");
102 99
103 for (at = first_archetype; at; at = at->next) 100 for_all_archetypes (at)
104 { 101 {
105 if (at->clone.type == SPELL) 102 if (at->type == SPELL)
106 { 103 {
107 if (at->clone.skill) 104 if (at->skill)
108 { 105 {
109 for (i = 1; i < NUM_SKILLS; i++) 106 for (i = 1; i < NUM_SKILLS; i++)
110 if (!strcmp (skill_names[i], at->clone.skill)) 107 if (!strcmp (skill_names[i], at->skill))
111 break; 108 break;
112 if (i == NUM_SKILLS) 109 if (i == NUM_SKILLS)
113 { 110 {
114 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill); 111 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->skill);
115 } 112 }
116 } 113 }
117 /* other_arch is already checked for in the loader */ 114 /* other_arch is already checked for in the loader */
118 } 115 }
119 } 116 }
… …
138void 135void
139dump_spells (void) 136dump_spells (void)
140{ 137{
141 archetype *at; 138 archetype *at;
142 139
143 for (at = first_archetype; at; at = at->next) 140 for_all_archetypes (at)
144 { 141 {
145 if (at->clone.type == SPELL) 142 if (at->type == SPELL)
146 { 143 {
147 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name, 144 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
148 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level); 145 &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
149 } 146 }
150 } 147 }
151} 148}
152 149
153/* pretty basic function - basically just takes 150/* pretty basic function - basically just takes
154 * an object, sets the x,y, and calls insert_ob_in_map 151 * an object, sets the x,y, and calls insert_ob_in_map
155 */ 152 */
156
157void 153void
158spell_effect (object *spob, int x, int y, maptile *map, object *originator) 154spell_effect (object *spob, int x, int y, maptile *map, object *originator)
159{ 155{
160
161 if (spob->other_arch != NULL) 156 if (spob->other_arch)
162 { 157 map->insert (arch_to_object (spob->other_arch), x, y, originator);
163 object *effect = arch_to_object (spob->other_arch);
164
165 effect->x = x;
166 effect->y = y;
167
168 insert_ob_in_map (effect, map, originator, 0);
169 }
170} 158}
171 159
172/* 160/*
173 * This function takes a caster and spell and presents the 161 * This function takes a caster and spell and presents the
174 * effective level the caster needs to be to cast the spell. 162 * effective level the caster needs to be to cast the spell.
175 * basically, it just adjusts the spell->level with attuned/repelled 163 * basically, it just adjusts the spell->level with attuned/repelled
176 * spellpaths. Was called path_level_mod 164 * spellpaths. Was called path_level_mod.
177 * 165 *
178 * caster is person casting hte spell. 166 * caster is person casting the spell.
179 * spell is the spell object. 167 * spell is the spell object.
180 * Returns modified level. 168 * Returns modified level.
181 */ 169 */
182int 170int
183min_casting_level (object *caster, object *spell) 171min_casting_level (object *caster, object *spell)
… …
186 174
187 if (caster->path_denied & spell->path_attuned) 175 if (caster->path_denied & spell->path_attuned)
188 return 1; 176 return 1;
189 177
190 new_level = spell->level 178 new_level = spell->level
191 + ((caster->path_repelled & spell->path_attuned) ? +2 : 0) + ((caster->path_attuned & spell->path_attuned) ? -2 : 0); 179 + (caster->path_repelled & spell->path_attuned ? +2 : 0)
180 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
192 181
193 return (new_level < 1) ? 1 : new_level; 182 return max (1, new_level);
194} 183}
195
196 184
197/* This function returns the effective level the spell 185/* This function returns the effective level the spell
198 * is being cast at. 186 * is being cast at.
199 * Note that I changed the repelled/attuned bonus to 2 from 5. 187 * Note that I changed the repelled/attuned bonus to 2 from 5.
200 * This is because the new code compares casting_level against 188 * This is because the new code compares casting_level against
201 * min_caster_level, so the difference is effectively 4 189 * min_caster_level, so the difference is effectively 4
202 */ 190 */
203
204int 191int
205caster_level (object *caster, object *spell) 192caster_level (object *caster, object *spell)
206{ 193{
207 int level = caster->level; 194 int level = caster->level;
208 195
… …
223 210
224 level = MIN (level, sk_level + level / 10 + 1); 211 level = MIN (level, sk_level + level / 10 + 1);
225 } 212 }
226 213
227 /* Got valid caster level. Now adjust for attunement */ 214 /* Got valid caster level. Now adjust for attunement */
228 level += ((caster->path_repelled & spell->path_attuned) ? -2 : 0) + ((caster->path_attuned & spell->path_attuned) ? 2 : 0); 215 level += caster->path_repelled & spell->path_attuned ? -2 : 0;
216 level += caster->path_attuned & spell->path_attuned ? +2 : 0;
229 217
230 /* Always make this at least 1. If this is zero, we get divide by zero 218 /* Always make this at least 1. If this is zero, we get divide by zero
231 * errors in various places. 219 * errors in various places.
232 */ 220 */
233 if (level < 1)
234 level = 1;
235
236 return level; 221 return max (level, 1);
237} 222}
238 223
239/* The following function scales the spellpoint cost of 224/* The following function scales the spellpoint cost of
240 * a spell by it's increased effectiveness. Some of the 225 * a spell by it's increased effectiveness. Some of the
241 * lower level spells become incredibly vicious at high 226 * lower level spells become incredibly vicious at high
… …
441{ 426{
442 object *op; 427 object *op;
443 428
444 if (OUT_OF_REAL_MAP (m, x, y)) 429 if (OUT_OF_REAL_MAP (m, x, y))
445 return 0; 430 return 0;
446 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 431 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
447 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 432 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
448 && (!QUERY_FLAG (op, FLAG_ALIVE) 433 && (!QUERY_FLAG (op, FLAG_ALIVE)
449 || sp_op->type == LIGHTNING // XXX: elmex: why is LIGHTNING special cased here?
450 // most spells use subtypes for bolts today...
451 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 434 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
452 return 1; 435 return 1;
453 436
454 return 0; 437 return 0;
455} 438}
… …
473 { 456 {
474 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 457 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
475 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 458 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
476 dir = 0; 459 dir = 0;
477 } 460 }
478 new_op->x = op->x + freearr_x[dir]; 461
479 new_op->y = op->y + freearr_y[dir]; 462 op->map->insert (new_op,
480 if (dir == 0) 463 op->x + freearr_x[dir], op->y + freearr_y[dir],
481 insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); 464 op,
482 else 465 dir ? 0 : INS_BELOW_ORIGINATOR);
483 insert_ob_in_map (new_op, op->map, op, 0); 466
484 return dir; 467 return dir;
485} 468}
486 469
487/* Returns true if it is ok to put spell *op on the space/may provided. 470/* Returns true if it is ok to put spell *op on the space/may provided.
488 * immune_stop is basically the attacktype of the spell (why 471 * immune_stop is basically the attacktype of the spell (why
… …
490 * has the AT_MAGIC bit set, and there is a counterwall 473 * has the AT_MAGIC bit set, and there is a counterwall
491 * on the space, the object doesn't get placed. if immune stop 474 * on the space, the object doesn't get placed. if immune stop
492 * does not have AT_MAGIC, then counterwalls do not effect the spell. 475 * does not have AT_MAGIC, then counterwalls do not effect the spell.
493 * 476 *
494 */ 477 */
495
496int 478int
497ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 479ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
498{ 480{
499 object *tmp; 481 if (!xy_normalise (m, x, y))
500 int mflags;
501 maptile *mp;
502
503 mp = m;
504 mflags = get_map_flags (m, &mp, x, y, &x, &y);
505
506 if (mflags & P_OUT_OF_MAP)
507 return 0; 482 return 0;
508 483
509 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y))) 484 mapspace &ms = m->at (x, y);
485
486 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
510 return 0; 487 return 0;
511 488
512 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) 489 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
513 { 490 {
514 /* If there is a counterspell on the space, and this 491 /* If there is a counterspell on the space, and this
515 * object is using magic, don't progress. I believe we could 492 * object is using magic, don't progress. I believe we could
516 * leave this out and let in progress, and other areas of the code 493 * leave this out and let in progress, and other areas of the code
517 * will then remove it, but that would seem to to use more 494 * will then remove it, but that would seem to to use more
518 * resources, and may not work as well if a player is standing 495 * resources, and may not work as well if a player is standing
519 * on top of a counterwall spell (may hit the player before being 496 * on top of a counterwall spell (may hit the player before being
520 * removed.) On the other hand, it may be more dramatic for the 497 * removed.) On the other hand, it may be more dramatic for the
521 * spell to actually hit the counterwall and be sucked up. 498 * spell to actually hit the counterwall and be sucked up.
522 */ 499 */
523 if ((tmp->attacktype & AT_COUNTERSPELL) && 500 if ((tmp->attacktype & AT_COUNTERSPELL)
524 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 501 && !QUERY_FLAG (tmp, FLAG_MONSTER)
525 (tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC)) 502 && (tmp->type != PLAYER)
503 && (tmp->type != WEAPON)
504 && (tmp->type != BOW)
505 && (tmp->type != ARROW)
506 && (tmp->type != GOLEM)
507 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
508 // we special case floor here because there
509 // are sometimes spell effect floors
510 // which are used to inflict damage
511 // (and those shouldn't go away from
512 // sanctuary) see also: permanent lava
513 && (immune_stop & AT_MAGIC))
526 return 0; 514 return 0;
527 515
528 /* This is to prevent 'out of control' spells. Basically, this 516 /* This is to prevent 'out of control' spells. Basically, this
529 * limits one spell effect per space per spell. This is definately 517 * limits one spell effect per space per spell. This is definately
530 * needed for performance reasons, and just for playability I believe. 518 * needed for performance reasons, and just for playability I believe.
… …
540 * playability reasons. 528 * playability reasons.
541 */ 529 */
542 if (tmp->arch == op->arch 530 if (tmp->arch == op->arch
543 && tmp->type == op->type 531 && tmp->type == op->type
544 && tmp->subtype == op->subtype 532 && tmp->subtype == op->subtype
533 && tmp->owner == op->owner
545 && tmp->owner == op->owner && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 534 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
546 { 535 {
547 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 536 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
548 tmp->range = MAX (tmp->range, op->range); 537 tmp->range = MAX (tmp->range, op->range);
549 tmp->duration = MAX (tmp->duration, op->duration); 538 tmp->duration = MAX (tmp->duration, op->duration);
550 return 0; 539 return 0;
… …
552 541
553 /* Perhaps we should also put checks in for no magic and unholy 542 /* Perhaps we should also put checks in for no magic and unholy
554 * ground to prevent it from moving along? 543 * ground to prevent it from moving along?
555 */ 544 */
556 } 545 }
546
557 /* If it passes the above tests, it must be OK */ 547 /* If it passes the above tests, it must be OK */
558 return 1; 548 return 1;
559} 549}
560 550
561/* fire_arch_from_position: fires an archetype. 551/* fire_arch_from_position: fires an archetype.
… …
621 return 0; 611 return 0;
622 } 612 }
623 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 613 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
624 SET_ANIMATION (tmp, dir); 614 SET_ANIMATION (tmp, dir);
625 615
626 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 616 if ((tmp = insert_ob_in_map (tmp, m, op, 0)))
627 return 1;
628
629 move_spell_effect (tmp); 617 move_spell_effect (tmp);
630 618
631 return 1; 619 return 1;
632} 620}
633
634
635 621
636/***************************************************************************** 622/*****************************************************************************
637 * 623 *
638 * Code related to rods - perhaps better located in another file? 624 * Code related to rods - perhaps better located in another file?
639 * 625 *
640 ****************************************************************************/ 626 ****************************************************************************/
641
642void 627void
643regenerate_rod (object *rod) 628regenerate_rod (object *rod)
644{ 629{
645 if (rod->stats.hp < rod->stats.maxhp) 630 if (rod->stats.hp < rod->stats.maxhp)
646 { 631 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
647 rod->stats.hp += 1 + rod->stats.maxhp / 10;
648
649 if (rod->stats.hp > rod->stats.maxhp)
650 rod->stats.hp = rod->stats.maxhp;
651 }
652} 632}
653
654 633
655void 634void
656drain_rod_charge (object *rod) 635drain_rod_charge (object *rod)
657{ 636{
658 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 637 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
659} 638}
660
661
662
663 639
664/* this function is commonly used to find a friendly target for 640/* this function is commonly used to find a friendly target for
665 * spells such as heal or protection or armour 641 * spells such as heal or protection or armour
666 * op is what is looking for the target (which can be a player), 642 * op is what is looking for the target (which can be a player),
667 * dir is the direction we are looking in. Return object found, or 643 * dir is the direction we are looking in. Return object found, or
668 * NULL if no good object. 644 * NULL if no good object.
669 */ 645 */
670
671object * 646object *
672find_target_for_friendly_spell (object *op, int dir) 647find_target_for_friendly_spell (object *op, int dir)
673{ 648{
674 object *tmp; 649 object *tmp;
675 maptile *m;
676 sint16 x, y;
677 int mflags;
678 650
679 /* I don't really get this block - if op isn't a player or rune, 651 /* I don't really get this block - if op isn't a player or rune,
680 * we then make the owner of this object the target. 652 * we then make the owner of this object the target.
681 * The owner could very well be no where near op. 653 * The owner could very well be no where near op.
682 */ 654 */
… …
689 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 661 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
690 tmp = op; 662 tmp = op;
691 } 663 }
692 else 664 else
693 { 665 {
694 m = op->map; 666 maptile *m = op->map;
695 x = op->x + freearr_x[dir]; 667 sint16 x = op->x + freearr_x[dir];
696 y = op->y + freearr_y[dir]; 668 sint16 y = op->y + freearr_y[dir];
697
698 mflags = get_map_flags (m, &m, x, y, &x, &y);
699
700 if (mflags & P_OUT_OF_MAP)
701 tmp = NULL;
702 else
703 { 669
704 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 670 tmp = xy_normalise (m, x, y)
705 if (tmp->type == PLAYER) 671 ? m->at (x, y).player ()
706 break; 672 : 0;
707 }
708 } 673 }
674
709 /* didn't find a player there, look in current square for a player */ 675 /* didn't find a player there, look in current square for a player */
710 if (tmp == NULL) 676 if (!tmp)
711 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 677 tmp = op->ms ().player ();
712 {
713 if (tmp->type == PLAYER)
714 break;
715 }
716 678
717 return tmp; 679 return tmp;
718} 680}
719 681
720 682
… …
752 mp = m; 714 mp = m;
753 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 715 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
754 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) 716 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
755 continue; 717 continue;
756 718
757 tmp = get_map_ob (mp, nx, ny); 719 tmp = GET_MAP_OB (mp, nx, ny);
758 720
759 while (tmp != NULL && (((owner_type == PLAYER && 721 while (tmp != NULL && (((owner_type == PLAYER &&
760 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 722 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) ||
761 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 723 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
762 tmp = tmp->above; 724 tmp = tmp->above;
… …
765 return freedir[i]; 727 return freedir[i];
766 } 728 }
767 return -1; /* flag for "keep going the way you were" */ 729 return -1; /* flag for "keep going the way you were" */
768} 730}
769 731
770
771
772/* put_a_monster: puts a monster named monstername near by 732/* put_a_monster: puts a monster named monstername near by
773 * op. This creates the treasures for the monsters, and 733 * op. This creates the treasures for the monsters, and
774 * also deals with multipart monsters properly. 734 * also deals with multipart monsters properly.
775 */ 735 */
776
777void 736void
778put_a_monster (object *op, const char *monstername) 737put_a_monster (object *op, const char *monstername)
779{ 738{
780 object *tmp, *head = NULL, *prev = NULL; 739 object *tmp, *head = NULL, *prev = NULL;
781 archetype *at; 740 archetype *at;
… …
788 747
789 /* find a free square nearby 748 /* find a free square nearby
790 * first we check the closest square for free squares 749 * first we check the closest square for free squares
791 */ 750 */
792 751
793 dir = find_first_free_spot (&at->clone, op->map, op->x, op->y); 752 dir = find_first_free_spot (at, op->map, op->x, op->y);
794 if (dir != -1) 753 if (dir != -1)
795 { 754 {
796 /* This is basically grabbed for generate monster. Fixed 971225 to 755 /* This is basically grabbed for generate monster. Fixed 971225 to
797 * insert multipart monsters properly 756 * insert multipart monsters properly
798 */ 757 */
758 //TODO: use expand_tail + ...
799 while (at != NULL) 759 while (at != NULL)
800 { 760 {
801 tmp = arch_to_object (at); 761 tmp = arch_to_object (at);
802 tmp->x = op->x + freearr_x[dir] + at->clone.x; 762 tmp->x = op->x + freearr_x[dir] + at->x;
803 tmp->y = op->y + freearr_y[dir] + at->clone.y; 763 tmp->y = op->y + freearr_y[dir] + at->y;
804 tmp->map = op->map; 764 tmp->map = op->map;
805 if (head) 765 if (head)
806 { 766 {
807 tmp->head = head; 767 tmp->head = head;
808 prev->more = tmp; 768 prev->more = tmp;
809 } 769 }
770
810 if (!head) 771 if (!head)
811 head = tmp; 772 head = tmp;
773
812 prev = tmp; 774 prev = tmp;
775
813 at = at->more; 776 at = (archetype *)at->more;
814 } 777 }
815 778
816 if (head->randomitems) 779 if (head->randomitems)
817 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 780 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
818 781
819 insert_ob_in_map (head, op->map, op, 0); 782 insert_ob_in_map (head, op->map, op, 0);
820 783
821 /* thought it'd be cool to insert a burnout, too. */ 784 /* thought it'd be cool to insert a burnout, too. */
822 tmp = get_archetype ("burnout"); 785 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
823 tmp->map = op->map;
824 tmp->x = op->x + freearr_x[dir];
825 tmp->y = op->y + freearr_y[dir];
826 insert_ob_in_map (tmp, op->map, op, 0);
827 } 786 }
828} 787}
829 788
830/* peterm: function which summons hostile monsters and 789/* peterm: function which summons hostile monsters and
831 * places them in nearby squares. 790 * places them in nearby squares.
… …
858{ 817{
859 int attacktype; 818 int attacktype;
860 int face; 819 int face;
861} ATTACKS[22] = 820} ATTACKS[22] =
862{ 821{
863 {
864 AT_PHYSICAL, 0}, 822 { AT_PHYSICAL, 0},
865 {
866 AT_PHYSICAL, 0}, /*face = explosion */ 823 { AT_PHYSICAL, 0}, /*face = explosion */
867 {
868 AT_PHYSICAL, 0}, 824 { AT_PHYSICAL, 0},
869 {
870 AT_MAGIC, 1}, 825 { AT_MAGIC, 1},
871 {
872 AT_MAGIC, 1}, /* face = last-burnout */ 826 { AT_MAGIC, 1}, /* face = last-burnout */
873 {
874 AT_MAGIC, 1}, 827 { AT_MAGIC, 1},
875 {
876 AT_FIRE, 2}, 828 { AT_FIRE, 2},
877 {
878 AT_FIRE, 2}, /* face = fire.... */ 829 { AT_FIRE, 2}, /* face = fire.... */
879 {
880 AT_FIRE, 2}, 830 { AT_FIRE, 2},
881 {
882 AT_ELECTRICITY, 3}, 831 { AT_ELECTRICITY, 3},
883 {
884 AT_ELECTRICITY, 3}, /* ball_lightning */ 832 { AT_ELECTRICITY, 3}, /* ball_lightning */
885 {
886 AT_ELECTRICITY, 3}, 833 { AT_ELECTRICITY, 3},
887 {
888 AT_COLD, 4}, 834 { AT_COLD, 4},
889 {
890 AT_COLD, 4}, /* face=icestorm */ 835 { AT_COLD, 4}, /* face=icestorm */
891 {
892 AT_COLD, 4}, 836 { AT_COLD, 4},
893 {
894 AT_CONFUSION, 5}, 837 { AT_CONFUSION, 5},
895 {
896 AT_POISON, 7}, 838 { AT_POISON, 7},
897 {
898 AT_POISON, 7}, /* face = acid sphere. generator */ 839 { AT_POISON, 7}, /* face = acid sphere. generator */
899 {
900 AT_POISON, 7}, /* poisoncloud face */ 840 { AT_POISON, 7}, /* poisoncloud face */
901 {
902 AT_SLOW, 8}, 841 { AT_SLOW, 8},
903 {
904 AT_PARALYZE, 9}, 842 { AT_PARALYZE, 9},
905 {
906AT_FEAR, 10}}; 843 { AT_FEAR, 10},
907 844};
908
909 845
910/* shuffle_attack: peterm 846/* shuffle_attack: peterm
911 * This routine shuffles the attack of op to one of the 847 * This routine shuffles the attack of op to one of the
912 * ones in the list. It does this at random. It also 848 * ones in the list. It does this at random. It also
913 * chooses a face appropriate to the attack that is 849 * chooses a face appropriate to the attack that is
… …
1031 else 967 else
1032 { 968 {
1033 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 969 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");
1034 tmp = get_archetype (LOOSE_MANA); 970 tmp = get_archetype (LOOSE_MANA);
1035 tmp->level = skill->level; 971 tmp->level = skill->level;
1036 tmp->x = op->x;
1037 tmp->y = op->y;
1038 972
1039 /* increase the area of destruction a little for more powerful spells */ 973 /* increase the area of destruction a little for more powerful spells */
1040 tmp->range += isqrt (power); 974 tmp->range += isqrt (power);
1041 975
1042 if (power > 25) 976 if (power > 25)
1043 tmp->stats.dam = 25 + isqrt (power); 977 tmp->stats.dam = 25 + isqrt (power);
1044 else 978 else
1045 tmp->stats.dam = power; /* nasty recoils! */ 979 tmp->stats.dam = power; /* nasty recoils! */
1046 980
1047 tmp->stats.maxhp = tmp->count; 981 tmp->stats.maxhp = tmp->count;
1048 insert_ob_in_map (tmp, op->map, NULL, 0); 982
983 tmp->insert_at (op);
1049 } 984 }
1050 } 985 }
1051} 986}
1052 987
1053int 988int
1054cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 989cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1055{ 990{
1056 int success; 991 int success;
1057 player *pl;
1058 object *spell; 992 object *spell;
1059 993
1060 if (!spell_ob->other_arch) 994 if (!spell_ob->other_arch)
1061 { 995 {
1062 LOG (llevError, "cast_party_spell: empty other arch\n"); 996 LOG (llevError, "cast_party_spell: empty other arch\n");
… …
1070 if (caster->contr->party == NULL) 1004 if (caster->contr->party == NULL)
1071 { 1005 {
1072 spell->remove (); 1006 spell->remove ();
1073 return success; 1007 return success;
1074 } 1008 }
1075 for (pl = first_player; pl != NULL; pl = pl->next) 1009 for_all_players (pl)
1076 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 1010 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1077 { 1011 {
1078 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 1012 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1079 } 1013 }
1080 spell->remove (); 1014 spell->remove ();
… …
1106 * 1040 *
1107 * if it is a player casting the spell (op->type == PLAYER, op == caster), 1041 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1108 * this function will decrease the mana/grace appropriately. For other 1042 * this function will decrease the mana/grace appropriately. For other
1109 * objects, the caller should do what it considers appropriate. 1043 * objects, the caller should do what it considers appropriate.
1110 */ 1044 */
1111
1112int 1045int
1113cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 1046cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1114{ 1047{
1115 const char *godname; 1048 const char *godname;
1116 int success = 0, mflags, cast_level = 0, old_shoottype; 1049 int success = 0, mflags, cast_level = 0;
1117 object *skill = NULL; 1050 object *skill = NULL;
1118
1119 old_shoottype = op->contr ? op->contr->shoottype : 0;
1120 1051
1121 if (!spell_ob) 1052 if (!spell_ob)
1122 { 1053 {
1123 LOG (llevError, "cast_spell: null spell object passed\n"); 1054 LOG (llevError, "cast_spell: null spell object passed\n");
1124 return 0; 1055 return 0;
… …
1153 * at least process that code. 1084 * at least process that code.
1154 */ 1085 */
1155 if (op->type == PLAYER && op == caster) 1086 if (op->type == PLAYER && op == caster)
1156 { 1087 {
1157 cast_level = caster_level (caster, spell_ob); 1088 cast_level = caster_level (caster, spell_ob);
1089
1158 if (spell_ob->skill) 1090 if (spell_ob->skill)
1159 { 1091 {
1160 skill = find_skill_by_name (op, spell_ob->skill); 1092 skill = find_skill_by_name (op, spell_ob->skill);
1093
1161 if (!skill) 1094 if (!skill)
1162 { 1095 {
1163 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 1096 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name);
1164 return 0; 1097 return 0;
1165 } 1098 }
1099
1166 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1100 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
1167 { 1101 {
1168 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1102 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell.");
1169 return 0; 1103 return 0;
1170 } 1104 }
1171 } 1105 }
1106
1172 /* If the caster is the wiz, they don't ever fail, and don't have 1107 /* If the caster is the wiz, they don't ever fail, and don't have
1173 * to have sufficient grace/mana. 1108 * to have sufficient grace/mana.
1174 */ 1109 */
1175 if (!QUERY_FLAG (op, FLAG_WIZ)) 1110 if (!QUERY_FLAG (op, FLAG_WIZ))
1176 { 1111 {
… …
1178 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1113 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1179 { 1114 {
1180 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1115 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");
1181 return 0; 1116 return 0;
1182 } 1117 }
1118
1183 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1119 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1184 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1120 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1185 { 1121 {
1186 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1122 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1187 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1123 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
… …
1199 /* player/monster is trying to cast the spell. might fumble it */ 1135 /* player/monster is trying to cast the spell. might fumble it */
1200 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1136 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1201 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1137 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1202 { 1138 {
1203 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1139 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
1204 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1140 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the prayer.");
1205 if (settings.casting_time == TRUE) 1141
1206 {
1207 op->casting_time = -1;
1208 }
1209 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1142 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1210 return 0; 1143 return 0;
1211 } 1144 }
1212 else if (spell_ob->stats.sp) 1145 else if (spell_ob->stats.sp)
1213 { 1146 {
… …
1216 if (failure < 0) 1149 if (failure < 0)
1217 { 1150 {
1218 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1151 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use.");
1219 if (settings.spell_failure_effects == TRUE) 1152 if (settings.spell_failure_effects == TRUE)
1220 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1153 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1221 op->contr->shoottype = (rangetype) old_shoottype; 1154
1222 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1155 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1223 return 0; 1156 return 0;
1224 } 1157 }
1225 } 1158 }
1226 } 1159 }
… …
1249 { 1182 {
1250 if (op->type != PLAYER) 1183 if (op->type != PLAYER)
1251 return 0; 1184 return 0;
1252 1185
1253 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1186 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1254 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1187 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname);
1255 else 1188 else if (object *item = op->contr->ranged_ob)
1256 switch (op->contr->shoottype)
1257 { 1189 {
1258 case range_magic: 1190 if (item->type == SPELL)
1259 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1191 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting.");
1260 break; 1192 else if (item->type == SCROLL)
1261 case range_misc:
1262 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1263 break;
1264 case range_golem:
1265 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1266 break;
1267 default:
1268 break;
1269 }
1270 return 0;
1271 }
1272
1273 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1274 {
1275 if (op->casting_time == -1)
1276 { /* begin the casting */
1277 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1278 op->spell = spell_ob;
1279 /* put the stringarg into the object struct so that when the
1280 * spell is actually cast, it knows about the stringarg.
1281 * necessary for the invoke command spells.
1282 */
1283 if (stringarg)
1284 {
1285 op->spellarg = strdup (stringarg);
1286 }
1287 else 1194 else
1288 op->spellarg = NULL; 1195 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1289 return 0;
1290 }
1291 else if (op->casting_time != 0)
1292 {
1293 if (op->type == PLAYER)
1294 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1295 return 0;
1296 } 1196 }
1297 else 1197 else
1298 { /* casting_time == 0 */ 1198 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");
1299 op->casting_time = -1; 1199
1300 spell_ob = op->spell; 1200 return 0;
1301 stringarg = op->spellarg;
1302 }
1303 }
1304 else
1305 { 1201 }
1202
1306 /* Take into account how long it takes to cast the spell. 1203 /* Take into account how long it takes to cast the spell.
1307 * if the player is casting it, then we use the time in 1204 * if the player is casting it, then we use the time in
1308 * the spell object. If it is a spell object, have it 1205 * the spell object. If it is a spell object, have it
1309 * take two ticks. Things that cast spells on the players 1206 * take two ticks. Things that cast spells on the players
1310 * behalf (eg, altars, and whatever else) shouldn't cost 1207 * behalf (eg, altars, and whatever else) shouldn't cost
1311 * the player any time. 1208 * the player any time.
1312 * Ignore casting time for firewalls 1209 * Ignore casting time for firewalls
1210 */
1211 if (caster == op && caster->type != FIREWALL)
1212 {
1213 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1214 /* Other portions of the code may also decrement the speed of the player, so
1215 * put a lower limit so that the player isn't stuck here too long
1313 */ 1216 */
1314 if (caster == op && caster->type != FIREWALL)
1315 {
1316 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1317 /* Other portions of the code may also decrement the speed of the player, so
1318 * put a lower limit so that the player isn't stuck here too long
1319 */
1320 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1217 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1321 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1218 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1322 } 1219 }
1323 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1220 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1324 {
1325 op->speed_left -= 2 * FABS (op->speed); 1221 op->speed_left -= 2 * FABS (op->speed);
1326 }
1327 }
1328 1222
1329 if (op->type == PLAYER && op == caster) 1223 if (op->type == PLAYER && op == caster)
1330 { 1224 {
1331 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1225 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1332 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1226 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1342 if (!skill) 1236 if (!skill)
1343 { 1237 {
1344 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1238 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));
1345 return 0; 1239 return 0;
1346 } 1240 }
1241
1347 change_skill (op, skill, 0); /* needed for proper exp credit */ 1242 op->change_skill (skill); /* needed for proper exp credit */
1348 } 1243 }
1244
1245 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1246 return RESULT_INT (0);
1349 1247
1350 switch (spell_ob->subtype) 1248 switch (spell_ob->subtype)
1351 { 1249 {
1352 /* The order of case statements is same as the order they show up 1250 /* The order of case statements is same as the order they show up
1353 * in in spells.h. 1251 * in in spells.h.
1354 */ 1252 */
1355 case SP_RAISE_DEAD: 1253 case SP_RAISE_DEAD:
1356 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1254 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1357 break; 1255 break;
1358 1256
1359 case SP_RUNE: 1257 case SP_RUNE:
… …
1392 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1290 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);
1393 break; 1291 break;
1394 1292
1395 case SP_SUMMON_GOLEM: 1293 case SP_SUMMON_GOLEM:
1396 success = summon_golem (op, caster, dir, spell_ob); 1294 success = summon_golem (op, caster, dir, spell_ob);
1397 old_shoottype = range_golem;
1398 break; 1295 break;
1399 1296
1400 case SP_DIMENSION_DOOR: 1297 case SP_DIMENSION_DOOR:
1401 /* dimension door needs the actual caster, because that is what is 1298 /* dimension door needs the actual caster, because that is what is
1402 * moved. 1299 * moved.
… …
1535 success = cast_consecrate (op, caster, spell_ob); 1432 success = cast_consecrate (op, caster, spell_ob);
1536 break; 1433 break;
1537 1434
1538 case SP_ANIMATE_WEAPON: 1435 case SP_ANIMATE_WEAPON:
1539 success = animate_weapon (op, caster, spell_ob, dir); 1436 success = animate_weapon (op, caster, spell_ob, dir);
1540 old_shoottype = range_golem;
1541 break; 1437 break;
1542 1438
1543 case SP_LIGHT: 1439 case SP_LIGHT:
1544 success = cast_light (op, caster, spell_ob, dir); 1440 success = cast_light (op, caster, spell_ob, dir);
1545 break; 1441 break;
… …
1558 1454
1559 case SP_AURA: 1455 case SP_AURA:
1560 success = create_aura (op, caster, spell_ob); 1456 success = create_aura (op, caster, spell_ob);
1561 break; 1457 break;
1562 1458
1563 case SP_TOWN_PORTAL:
1564 success = cast_create_town_portal (op, caster, spell_ob, dir);
1565 break;
1566
1567 case SP_PARTY_SPELL: 1459 case SP_PARTY_SPELL:
1568 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1460 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1569 break; 1461 break;
1570 1462
1571 default: 1463 default:
1572 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1573 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1464 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1574 } 1465 }
1575 1466
1576 /* FIXME - we need some better sound suppport */ 1467 /* FIXME - we need some better sound suppport */
1577 // yes, for example, augment map info with the spell effect 1468 // yes, for example, augment map info with the spell effect
1578 // so clients can calculate the sounds themselves 1469 // so clients can calculate the sounds themselves
1579 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype); 1470 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1580 1471
1581 /* free the spell arg */
1582 if (settings.casting_time == TRUE && stringarg)
1583 {
1584 free (stringarg);
1585 stringarg = NULL;
1586 }
1587 /* perhaps a bit of a hack, but if using a wand, it has to change the skill
1588 * to something like use_magic_item, but you really want to be able to fire
1589 * it again.
1590 */
1591 if (op->contr)
1592 op->contr->shoottype = (rangetype) old_shoottype;
1593
1594 return success; 1472 return success;
1595} 1473}
1596 1474
1597 1475
1598/* This is called from time.c/process_object(). That function 1476/* This is called from time.c/process_object(). That function
… …
1690 break; 1568 break;
1691 1569
1692 case SP_MOVING_BALL: 1570 case SP_MOVING_BALL:
1693 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1571 if (QUERY_FLAG (victim, FLAG_ALIVE))
1694 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1572 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1695 else if (victim->material || victim->materialname) 1573 else if (victim->materialname)
1696 save_throw_object (victim, spell->attacktype, spell); 1574 save_throw_object (victim, spell->attacktype, spell);
1697 break; 1575 break;
1698 } 1576 }
1699} 1577}

Diff Legend

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