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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.100 by root, Fri Apr 9 02:45:17 2010 UTC vs.
Revision 1.117 by root, Sat Nov 17 23:40:04 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* This file contains all the spell attack code. Grouping this code 26/* This file contains all the spell attack code. Grouping this code
26 * together should hopefully make it easier to find the relevent bits 27 * together should hopefully make it easier to find the relevent bits
… …
59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 60 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
60 { 61 {
61 int num_sections = 1; 62 int num_sections = 1;
62 63
63 /* don't move DM */ 64 /* don't move DM */
64 if (QUERY_FLAG (tmp, FLAG_WIZ)) 65 if (tmp->flag [FLAG_WIZ])
65 return; 66 return;
66 67
67 /* don't move parts of objects */ 68 /* don't move parts of objects */
68 if (tmp->head) 69 if (tmp->head)
69 continue; 70 continue;
70 71
71 /* don't move floors or immobile objects */ 72 /* don't move floors or immobile objects */
72 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 73 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
73 continue; 74 continue;
74 75
75 /* count the object's sections */ 76 /* count the object's sections */
76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more) 77 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
77 num_sections++; 78 num_sections++;
… …
86 if (tmp->move_type & MOVE_FLYING) 87 if (tmp->move_type & MOVE_FLYING)
87 frictionmod = 1; /* flying objects loose the friction modifier */ 88 frictionmod = 1; /* flying objects loose the friction modifier */
88 89
89 if (rndm (0, weight_move - 1) > ((tmp->weight / num_sections) * frictionmod)) 90 if (rndm (0, weight_move - 1) > ((tmp->weight / num_sections) * frictionmod))
90 { /* move it. */ 91 { /* move it. */
91 /* move_object is really for monsters, but looking at 92 /* move_object is really for monsters, but looking at
92 * the move_object function, it appears that it should 93 * the move_object function, it appears that it should
93 * also be safe for objects. 94 * also be safe for objects.
94 * This does return if successful or not, but 95 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 96 * I don't see us doing anything useful with that information
96 * right now. 97 * right now.
… …
129 new_dir = -1; 130 new_dir = -1;
130 131
131 /* check the new dir for a wall and in the map */ 132 /* check the new dir for a wall and in the map */
132 t_dir = absdir (tmp->direction + new_dir); 133 t_dir = absdir (tmp->direction + new_dir);
133 134
134 if (get_map_flags (tmp->map, &m, tmp->x + freearr_x[t_dir], tmp->y + freearr_y[t_dir], &sx, &sy) & P_OUT_OF_MAP) 135 if (get_map_flags (tmp->map, &m, tmp->x + DIRX (t_dir), tmp->y + DIRY (t_dir), &sx, &sy) & P_OUT_OF_MAP)
135 return; 136 return;
136 137
137 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 138 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
138 return; 139 return;
139 140
… …
179 180
180 if (--op->range < 0) 181 if (--op->range < 0)
181 op->range = 0; 182 op->range = 0;
182 else 183 else
183 { 184 {
184 x = op->x + DIRX (op); 185 x = op->x + DIRX (op->direction);
185 y = op->y + DIRY (op); 186 y = op->y + DIRY (op->direction);
186 m = op->map; 187 m = op->map;
187 mflags = get_map_flags (m, &m, x, y, &x, &y); 188 mflags = get_map_flags (m, &m, x, y, &x, &y);
188 189
189 if (mflags & P_OUT_OF_MAP) 190 if (mflags & P_OUT_OF_MAP)
190 return; 191 return;
… …
194 * on the space. So only call reflwall if we think the data it returns 195 * on the space. So only call reflwall if we think the data it returns
195 * will be useful. 196 * will be useful.
196 */ 197 */
197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 198 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
198 { 199 {
199 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 200 if (!op->flag [FLAG_REFLECTING])
200 return; 201 return;
201 202
202 /* Since walls don't run diagonal, if the bolt is in 203 /* Since walls don't run diagonal, if the bolt is in
203 * one of 4 main directions, it just reflects back in the 204 * one of 4 main directions, it just reflects back in the
204 * opposite direction. However, if the bolt is travelling 205 * opposite direction. However, if the bolt is travelling
… …
217 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling 218 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling
218 * over a corner in a tiled map, it is possible that 219 * over a corner in a tiled map, it is possible that
219 * op->direction is within an adjacent map but either 220 * op->direction is within an adjacent map but either
220 * op->direction-1 or op->direction+1 does not exist. 221 * op->direction-1 or op->direction+1 does not exist.
221 */ 222 */
222 mflags = get_map_flags (op->map, &m, op->x + freearr_x[absdir (op->direction - 1)], 223 mflags = get_map_flags (op->map, &m, op->x + DIRX (absdir (op->direction - 1)),
223 op->y + freearr_y[absdir (op->direction - 1)], &x, &y); 224 op->y + DIRY (absdir (op->direction - 1)), &x, &y);
224 225
225 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)); 226 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y));
226 227
227 mflags = get_map_flags (op->map, &m, op->x + freearr_x[absdir (op->direction + 1)], 228 mflags = get_map_flags (op->map, &m, op->x + DIRX (absdir (op->direction + 1)),
228 op->y + freearr_y[absdir (op->direction + 1)], &x, &y); 229 op->y + DIRY (absdir (op->direction + 1)), &x, &y);
229 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)); 230 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y));
230 231
231 if (left == right) 232 if (left == right)
232 op->direction = absdir (op->direction + 4); 233 op->direction = absdir (op->direction + 4);
233 else if (left) 234 else if (left)
… …
247 tmp->speed_left = -0.1f; 248 tmp->speed_left = -0.1f;
248 /* To make up for the decrease at the top of the function */ 249 /* To make up for the decrease at the top of the function */
249 tmp->duration++; 250 tmp->duration++;
250 251
251 /* New forking code. Possibly create forks of this object 252 /* New forking code. Possibly create forks of this object
252 * going off in other directions. 253 * going off in other directions.
253 */ 254 */
254 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex) 255 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
255 forklightning (op, tmp); /* stats.Dex % of forking */ 256 forklightning (op, tmp); /* stats.Dex % of forking */
256 257
257 /* In this way, the object left behind sticks on the space, but 258 /* In this way, the object left behind sticks on the space, but
… …
294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 295 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
295 tmp->stats.Dex = spob->stats.Dex; 296 tmp->stats.Dex = spob->stats.Dex;
296 tmp->stats.Con = spob->stats.Con; 297 tmp->stats.Con = spob->stats.Con;
297 298
298 tmp->direction = dir; 299 tmp->direction = dir;
299 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 300 if (tmp->flag [FLAG_IS_TURNABLE])
300 SET_ANIMATION (tmp, dir); 301 SET_ANIMATION (tmp, dir);
301 302
302 tmp->set_owner (op); 303 tmp->set_owner (op);
303 set_spell_skill (op, caster, spob, tmp); 304 set_spell_skill (op, caster, spob, tmp);
304 305
305 tmp->x = op->x + DIRX (tmp); 306 tmp->x = op->x + DIRX (tmp->direction);
306 tmp->y = op->y + DIRY (tmp); 307 tmp->y = op->y + DIRY (tmp->direction);
307 tmp->map = op->map; 308 tmp->map = op->map;
308 309
309 maptile *newmap; 310 maptile *newmap;
310 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 311 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
311 if (mflags & P_OUT_OF_MAP) 312 if (mflags & P_OUT_OF_MAP)
… …
316 317
317 tmp->map = newmap; 318 tmp->map = newmap;
318 319
319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 320 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
320 { 321 {
321 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 322 if (!tmp->flag [FLAG_REFLECTING])
322 { 323 {
323 tmp->drop_and_destroy (); 324 tmp->drop_and_destroy ();
324 return 0; 325 return 0;
325 } 326 }
326 327
… …
364 { 365 {
365 for (i = 1; i < 9; i++) 366 for (i = 1; i < 9; i++)
366 { 367 {
367 sint16 dx, dy; 368 sint16 dx, dy;
368 369
369 dx = op->x + freearr_x[i]; 370 dx = op->x + DIRX (i);
370 dy = op->y + freearr_y[i]; 371 dy = op->y + DIRY (i);
371 372
372 /* ok_to_put_more already does things like checks for walls, 373 /* ok_to_put_more already does things like checks for walls,
373 * out of map, etc. 374 * out of map, etc.
374 */ 375 */
375 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 376 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
376 { 377 {
377 object *tmp = op->clone (); 378 object *tmp = op->clone ();
… …
521 if (!(mflags & P_IS_ALIVE)) 522 if (!(mflags & P_IS_ALIVE))
522 return; 523 return;
523 524
524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 525 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
525 { 526 {
526 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 527 if (tmp->flag [FLAG_ALIVE])
527 { 528 {
528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 529 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529 530
530 // TODO: can't understand the following if's 531 // TODO: can't understand the following if's
531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 532 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
532 { 533 {
533 if (!QUERY_FLAG (op, FLAG_REMOVED)) 534 if (!op->flag [FLAG_REMOVED])
534 { 535 {
535 op->destroy (); 536 op->destroy ();
536 return; 537 return;
537 } 538 }
538 } 539 }
… …
549move_bullet (object *op) 550move_bullet (object *op)
550{ 551{
551#if 0 552#if 0
552 /* We need a better general purpose way to do this */ 553 /* We need a better general purpose way to do this */
553 554
554 /* peterm: added to make comet leave a trail of burnouts 555 /* peterm: added to make comet leave a trail of burnouts
555 it's an unadulterated hack, but the effect is cool. */ 556 it's an unadulterated hack, but the effect is cool. */
556 if (op->stats.sp == SP_METEOR) 557 if (op->stats.sp == SP_METEOR)
557 { 558 {
558 replace_insert_ob_in_map ("fire_trail", op); 559 replace_insert_ob_in_map ("fire_trail", op);
559 if (op->destroyed ()) 560 if (op->destroyed ())
… …
640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 641 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 642 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 643 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
643 644
644 tmp->direction = dir; 645 tmp->direction = dir;
645 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 646 if (tmp->flag [FLAG_IS_TURNABLE])
646 SET_ANIMATION (tmp, dir); 647 SET_ANIMATION (tmp, dir);
647 648
648 tmp->set_owner (op); 649 tmp->set_owner (op);
649 set_spell_skill (op, caster, spob, tmp); 650 set_spell_skill (op, caster, spob, tmp);
650 651
651 tmp->x = op->x + freearr_x[dir]; 652 tmp->x = op->x + DIRX (dir);
652 tmp->y = op->y + freearr_y[dir]; 653 tmp->y = op->y + DIRY (dir);
653 tmp->map = op->map; 654 tmp->map = op->map;
654 655
655 maptile *newmap; 656 maptile *newmap;
656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 657 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
657 if (mflags & P_OUT_OF_MAP) 658 if (mflags & P_OUT_OF_MAP)
… …
675 return 0; 676 return 0;
676 } 677 }
677 678
678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 679 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
679 { 680 {
680 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 681 if (!tmp->flag [FLAG_REFLECTING])
681 { 682 {
682 tmp->destroy (); 683 tmp->destroy ();
683 return 0; 684 return 0;
684 } 685 }
685 686
… …
729 op->set_speed (0); 730 op->set_speed (0);
730 return; 731 return;
731 } 732 }
732 733
733 /* lava saves it's life, but not yours :) */ 734 /* lava saves it's life, but not yours :) */
734 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 735 if (op->flag [FLAG_LIFESAVE])
735 { 736 {
736 hit_map (op, 0, op->attacktype, 0); 737 hit_map (op, 0, op->attacktype, 0);
737 return; 738 return;
738 } 739 }
739 740
… …
754 if (!op->is_on_map ()) 755 if (!op->is_on_map ())
755 return; 756 return;
756 757
757 /* Check to see if we should push anything. 758 /* Check to see if we should push anything.
758 * Spell objects with weight push whatever they encounter to some 759 * Spell objects with weight push whatever they encounter to some
759 * degree. 760 * degree.
760 */ 761 */
761 if (op->weight) 762 if (op->weight)
762 { 763 {
763 check_spell_knockback (op); 764 check_spell_knockback (op);
764 765
… …
781 return; 782 return;
782 } 783 }
783 784
784 for (int i = -1; i <= 1; i++) 785 for (int i = -1; i <= 1; i++)
785 { 786 {
786 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 787 sint16 x = op->x + DIRX (absdir (op->stats.sp + i)), y = op->y + DIRY (absdir (op->stats.sp + i));
787 788
788 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 789 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
789 { 790 {
790 object *tmp = op->clone (); 791 object *tmp = op->clone ();
791 792
… …
820 MoveType movetype; 821 MoveType movetype;
821 822
822 if (!spell->other_arch) 823 if (!spell->other_arch)
823 return 0; 824 return 0;
824 825
825 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 826 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
826 { 827 {
827 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 828 op->failmsg ("Your undead nature prevents you from turning undead!");
828 return 0; 829 return 0;
829 } 830 }
830 831
831 if (!dir) 832 if (!dir)
832 { 833 {
… …
864 d = 8; 865 d = 8;
865 else 866 else
866 continue; 867 continue;
867 } 868 }
868 869
869 x = op->x + freearr_x[d]; 870 x = op->x + DIRX (d);
870 y = op->y + freearr_y[d]; 871 y = op->y + DIRY (d);
871 872
872 if (get_map_flags (op->map, &m, x, y, &sx, &sy) & P_OUT_OF_MAP) 873 if (get_map_flags (op->map, &m, x, y, &sx, &sy) & P_OUT_OF_MAP)
873 continue; 874 continue;
874 875
875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 876 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
… …
983 */ 984 */
984 if (archetype *at = archetype::find (SPLINT)) 985 if (archetype *at = archetype::find (SPLINT))
985 { 986 {
986 for (int i = 1; i < 9; i++) 987 for (int i = 1; i < 9; i++)
987 { 988 {
988 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 989 if (out_of_map (op->map, op->x + DIRX (i), op->y + DIRX (i)))
989 continue; 990 continue;
990 991
991 object *tmp = at->instance (); 992 object *tmp = at->instance ();
992 tmp->direction = i; 993 tmp->direction = i;
993 tmp->range = op->range; 994 tmp->range = op->range;
… …
996 tmp->attacktype = op->attacktype; 997 tmp->attacktype = op->attacktype;
997 tmp->set_owner (op); 998 tmp->set_owner (op);
998 if (op->skill && op->skill != tmp->skill) 999 if (op->skill && op->skill != tmp->skill)
999 tmp->skill = op->skill; 1000 tmp->skill = op->skill;
1000 1001
1001 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1002 if (tmp->flag [FLAG_IS_TURNABLE])
1002 SET_ANIMATION (tmp, i); 1003 SET_ANIMATION (tmp, i);
1003 1004
1004 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1005 op->map->insert (tmp, op->x + DIRX (i), op->y + DIRX (i), op);
1005 move_bullet (tmp); 1006 move_bullet (tmp);
1006 } 1007 }
1007 } 1008 }
1008 1009
1009 explode_bullet (op); 1010 explode_bullet (op);
… …
1012int 1013int
1013create_bomb (object *op, object *caster, int dir, object *spell) 1014create_bomb (object *op, object *caster, int dir, object *spell)
1014{ 1015{
1015 object *tmp; 1016 object *tmp;
1016 int mflags; 1017 int mflags;
1017 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1018 sint16 dx = op->x + DIRX (dir), dy = op->y + DIRY (dir);
1018 maptile *m; 1019 maptile *m;
1019 1020
1020 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1021 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1021 1022
1022 // when creating a bomb below ourself it should always work, even 1023 // when creating a bomb below ourself it should always work, even
… …
1025 // to fix create bomb traps in doors, which cast with dir=0). 1026 // to fix create bomb traps in doors, which cast with dir=0).
1026 if (dir) 1027 if (dir)
1027 { 1028 {
1028 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1029 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1029 { 1030 {
1030 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1031 op->failmsg ("There is something in the way.");
1031 return 0; 1032 return 0;
1032 } 1033 }
1033 } 1034 }
1034 1035
1035 tmp = spell->other_arch->instance (); 1036 tmp = spell->other_arch->instance ();
… …
1073 if (dir == 0) 1074 if (dir == 0)
1074 return NULL; 1075 return NULL;
1075 1076
1076 for (dist = 1; dist < range; dist++) 1077 for (dist = 1; dist < range; dist++)
1077 { 1078 {
1078 x = op->x + freearr_x[dir] * dist; 1079 x = op->x + DIRX (dir) * dist;
1079 y = op->y + freearr_y[dir] * dist; 1080 y = op->y + DIRY (dir) * dist;
1080 mp = op->map; 1081 mp = op->map;
1081 mflags = get_map_flags (op->map, &mp, x, y, &x, &y); 1082 mflags = get_map_flags (op->map, &mp, x, y, &x, &y);
1082 1083
1083 if (mflags & P_OUT_OF_MAP) 1084 if (mflags & P_OUT_OF_MAP)
1084 return NULL; 1085 return NULL;
… …
1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1090 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1090 return NULL; 1091 return NULL;
1091 1092
1092 if (mflags & P_IS_ALIVE) 1093 if (mflags & P_IS_ALIVE)
1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1094 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1094 if (QUERY_FLAG (target, FLAG_MONSTER)) 1095 if (target->flag [FLAG_MONSTER])
1095 return target; 1096 return target;
1096 } 1097 }
1097 1098
1098 return NULL; 1099 return NULL;
1099} 1100}
1100 1101
1101/* cast_smite_arch() - the priest points to a creature and causes 1102/* cast_smite_spell() - the priest points to a creature and causes
1102 * a 'godly curse' to decend. 1103 * a 'godly curse' to decend.
1103 * usual params - 1104 * usual params -
1104 * op = player 1105 * op = player
1105 * caster = object casting the spell. 1106 * caster = object casting the spell.
1106 * dir = direction being cast 1107 * dir = direction being cast
1107 * spell = spell object 1108 * spell = spell object
… …
1109int 1110int
1110cast_smite_spell (object *op, object *caster, int dir, object *spell) 1111cast_smite_spell (object *op, object *caster, int dir, object *spell)
1111{ 1112{
1112 object *effect, *target; 1113 object *effect, *target;
1113 object *god = find_god (determine_god (op)); 1114 object *god = find_god (determine_god (op));
1114 int range;
1115 1115
1116 range = spell->range + SP_level_range_adjust (caster, spell);
1117 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); 1116 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1118 1117
1119 /* Bunch of conditions for casting this spell. Note that only 1118 /* Bunch of conditions for casting this spell. Note that only
1120 * require a god if this is a cleric spell (requires grace). 1119 * require a god if this is a cleric spell (requires grace).
1121 * This makes this spell much more general purpose - it can be used 1120 * This makes this spell much more general purpose - it can be used
1122 * by wizards also, which is good, because I think this is a very 1121 * by wizards also, which is good, because I think this is a very
1123 * interesting spell. 1122 * interesting spell.
1124 * if it is a cleric spell, you need a god, and the creature 1123 * if it is a cleric spell, you need a god, and the creature
… …
1129 || target->flag [FLAG_REFL_SPELL] 1128 || target->flag [FLAG_REFL_SPELL]
1130 || (!god && spell->stats.grace) 1129 || (!god && spell->stats.grace)
1131 || (god && target->title == god->name) 1130 || (god && target->title == god->name)
1132 || (god && target->race.contains (god->race))) 1131 || (god && target->race.contains (god->race)))
1133 { 1132 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1133 op->failmsg ("Your request is unheeded.");
1135 return 0; 1134 return 0;
1136 } 1135 }
1137 1136
1138 if (spell->other_arch) 1137 if (spell->other_arch)
1139 effect = spell->other_arch->instance (); 1138 effect = spell->other_arch->instance ();
… …
1147 { 1146 {
1148 if (tailor_god_spell (effect, op)) 1147 if (tailor_god_spell (effect, op))
1149 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op)); 1148 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1150 else 1149 else
1151 { 1150 {
1152 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1151 op->failmsg ("Your request is ignored.");
1153 return 0; 1152 return 0;
1154 } 1153 }
1155 } 1154 }
1156 1155
1157 /* size of the area of destruction */ 1156 /* size of the area of destruction */
… …
1161 if (effect->attacktype & AT_DEATH) 1160 if (effect->attacktype & AT_DEATH)
1162 { 1161 {
1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1162 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1164 1163
1165 /* casting death spells at undead isn't a good thing */ 1164 /* casting death spells at undead isn't a good thing */
1166 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1165 if (target->flag [FLAG_UNDEAD])
1167 { 1166 {
1168 if (random_roll (0, 2, op, PREFER_LOW)) 1167 if (random_roll (0, 2, op, PREFER_LOW))
1169 { 1168 {
1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1169 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1171 effect->x = op->x; 1170 effect->x = op->x;
… …
1252/**************************************************************************** 1251/****************************************************************************
1253 * Destruction 1252 * Destruction
1254 ****************************************************************************/ 1253 ****************************************************************************/
1255 1254
1256/* make_object_glow() - currently only makes living objects glow. 1255/* make_object_glow() - currently only makes living objects glow.
1257 * we do this by creating a force and inserting it in the 1256 * we do this by creating a force and inserting it in the
1258 * object. if time is 0, the object glows permanently. To truely 1257 * object. if time is 0, the object glows permanently. To truely
1259 * make this work for non-living objects, we would have to 1258 * make this work for non-living objects, we would have to
1260 * give them the capability to have an inventory. b.t. 1259 * give them the capability to have an inventory. b.t.
1261 */ 1260 */
1262static int 1261static int
1263make_object_glow (object *op, int radius, int time) 1262make_object_glow (object *op, int radius, int time)
1264{ 1263{
1265 /* some things are unaffected... */ 1264 /* some things are unaffected... */
1266 if (op->path_denied & PATH_LIGHT) 1265 if (op->path_denied & PATH_LIGHT)
1267 return 0; 1266 return 0;
1268 1267
1269 object *tmp = get_archetype (FORCE_NAME); 1268 object *tmp = archetype::get (FORCE_NAME);
1270 tmp->speed = 0.01; 1269 tmp->set_speed (0.01);
1271 tmp->stats.food = time; 1270 tmp->stats.food = time;
1272 SET_FLAG (tmp, FLAG_IS_USED_UP); 1271 tmp->set_flag (FLAG_IS_USED_UP);
1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1272 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1274 tmp = insert_ob_in_ob (tmp, op); 1273 tmp = insert_ob_in_ob (tmp, op);
1275 1274
1276 if (tmp->glow_radius > op->glow_radius) 1275 if (tmp->glow_radius > op->glow_radius)
1277 op->set_glow_radius (tmp->glow_radius); 1276 op->set_glow_radius (tmp->glow_radius);
… …
1285 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1284 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1286 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1285 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1287 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1286 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1288 1287
1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1288 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1290
1291 /* destruction doesn't use another spell object, so we need
1292 * update op's skill pointer so that exp is properly awarded.
1293 */
1294 const shstr skill = op->skill;
1295
1296 if (caster == op)
1297 op->skill = spell_ob->skill;
1298 else if (caster->skill)
1299 op->skill = caster->skill;
1300 else
1301 op->skill = 0;
1302
1303 op->change_skill (find_skill_by_name (op, op->skill));
1304 1289
1305 dynbuf buf; 1290 dynbuf buf;
1306 unordered_mapwalk (buf, op, -range, -range, range, range) 1291 unordered_mapwalk (buf, op, -range, -range, range, range)
1307 { 1292 {
1308 mapspace &ms = m->at (nx, ny); 1293 mapspace &ms = m->at (nx, ny);
… …
1334 } 1319 }
1335 } 1320 }
1336 } 1321 }
1337 } 1322 }
1338 1323
1339 op->skill = skill;
1340 return 1; 1324 return 1;
1341} 1325}
1342 1326
1343/*************************************************************************** 1327/***************************************************************************
1344 * 1328 *
… …
1352 object *tmp, *force; 1336 object *tmp, *force;
1353 1337
1354 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1338 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1355 if (!tmp) 1339 if (!tmp)
1356 { 1340 {
1357 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1341 op->failmsg ("There is no one in that direction to curse.");
1358 return 0; 1342 return 0;
1359 } 1343 }
1360 1344
1361 tmp = tmp->head_ (); 1345 tmp = tmp->head_ ();
1362 1346
… …
1377 } 1361 }
1378 } 1362 }
1379 1363
1380 if (!force) 1364 if (!force)
1381 { 1365 {
1382 force = get_archetype (FORCE_NAME); 1366 force = archetype::get (FORCE_NAME);
1383 force->subtype = FORCE_CHANGE_ABILITY; 1367 force->subtype = FORCE_CHANGE_ABILITY;
1384 1368
1385 if (spell_ob->race) 1369 if (spell_ob->race)
1386 force->name = spell_ob->race; 1370 force->name = spell_ob->race;
1387 else 1371 else
… …
1405 1389
1406 return 1; 1390 return 1;
1407 } 1391 }
1408 1392
1409 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1393 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1410 force->speed = 1.f;
1411 force->speed_left = -1.f; 1394 force->speed_left = -1.f;
1412 SET_FLAG (force, FLAG_APPLIED); 1395 force->set_speed (1.f);
1396 force->set_flag (FLAG_APPLIED);
1413 1397
1414 if (god) 1398 if (god)
1415 { 1399 {
1416 if (spell_ob->last_grace) 1400 if (spell_ob->last_grace)
1417 force->path_repelled = god->path_repelled; 1401 force->path_repelled = god->path_repelled;
… …
1476 unordered_mapwalk (buf, op, -range, -range, range, range) 1460 unordered_mapwalk (buf, op, -range, -range, range, range)
1477 { 1461 {
1478 mapspace &ms = m->at (nx, ny); 1462 mapspace &ms = m->at (nx, ny);
1479 1463
1480 /* If there is nothing living on this space, no need to go further */ 1464 /* If there is nothing living on this space, no need to go further */
1481 if (!ms.flags () & P_IS_ALIVE) 1465 if (!(ms.flags () & P_IS_ALIVE))
1482 continue; 1466 continue;
1483 1467
1484 // players can only affect spaces that they can actually see 1468 // players can only affect spaces that they can actually see
1485 if (caster 1469 if (caster
1486 && caster->contr 1470 && caster->contr
… …
1500 1484
1501 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1485 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1502 if (race && head->race && !strstr (race, head->race)) 1486 if (race && head->race && !strstr (race, head->race))
1503 continue; 1487 continue;
1504 1488
1505 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1489 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1506 continue; 1490 continue;
1507 1491
1508 /* Now do a bunch of stuff related to saving throws */ 1492 /* Now do a bunch of stuff related to saving throws */
1509 best_at = -1; 1493 best_at = -1;
1510 if (spell->attacktype) 1494 if (spell->attacktype)
… …
1552 1536
1553 /* Done with saving throw. Now start affecting the monster */ 1537 /* Done with saving throw. Now start affecting the monster */
1554 done_one = 0; 1538 done_one = 0;
1555 1539
1556 /* aggravation */ 1540 /* aggravation */
1557 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1541 if (spell->flag [FLAG_MONSTER])
1558 { 1542 {
1559 CLEAR_FLAG (head, FLAG_SLEEP); 1543 head->clr_flag (FLAG_SLEEP);
1560 remove_friendly_object (head); 1544 remove_friendly_object (head);
1561 done_one = 1; 1545 done_one = 1;
1562 head->enemy = op; 1546 head->enemy = op;
1563 } 1547 }
1564 1548
1565 /* calm monsters */ 1549 /* calm monsters */
1566 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1550 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1567 { 1551 {
1568 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1552 head->set_flag (FLAG_UNAGGRESSIVE);
1569 head->enemy = NULL; 1553 head->enemy = NULL;
1570 done_one = 1; 1554 done_one = 1;
1571 } 1555 }
1572 1556
1573 /* berserk monsters */ 1557 /* berserk monsters */
1574 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1558 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1575 { 1559 {
1576 SET_FLAG (head, FLAG_BERSERK); 1560 head->set_flag (FLAG_BERSERK);
1577 done_one = 1; 1561 done_one = 1;
1578 } 1562 }
1579 1563
1580 /* charm */ 1564 /* charm */
1581 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1565 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1582 { 1566 {
1583 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1567 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1584 1568
1585 /* Prevent uncontrolled outbreaks of self replicating monsters. 1569 /* Prevent uncontrolled outbreaks of self replicating monsters.
1586 Typical use case is charm, go somwhere, use aggravation to make hostile. 1570 Typical use case is charm, go somwhere, use aggravation to make hostile.
1587 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1571 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1588 CLEAR_FLAG (head, FLAG_GENERATOR); 1572 head->clr_flag (FLAG_GENERATOR);
1589 head->set_owner (op); 1573 head->set_owner (op);
1590 set_spell_skill (op, caster, spell, head); 1574 set_spell_skill (op, caster, spell, head);
1591 add_friendly_object (head); 1575 add_friendly_object (head);
1592 head->attack_movement = PETMOVE; 1576 head->attack_movement = PETMOVE;
1593 done_one = 1; 1577 done_one = 1;
… …
1638 * other bits (i / 2): absolute value of offset 1622 * other bits (i / 2): absolute value of offset
1639 */ 1623 */
1640 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1624 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1641 int tmpdir = absdir (op->direction + offset); 1625 int tmpdir = absdir (op->direction + offset);
1642 1626
1643 nx = op->x + freearr_x[tmpdir]; 1627 nx = op->x + DIRX (tmpdir);
1644 ny = op->y + freearr_y[tmpdir]; 1628 ny = op->y + DIRY (tmpdir);
1645 if (!(get_map_flags (op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 1629 if (!(get_map_flags (op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, nx, ny))))
1646 { 1630 {
1647 dir = tmpdir; 1631 dir = tmpdir;
1648 break; 1632 break;
1649 } 1633 }
… …
1656 m = op->map; 1640 m = op->map;
1657 } 1641 }
1658 1642
1659 m->insert (op, nx, ny, op); 1643 m->insert (op, nx, ny, op);
1660 1644
1661 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1645 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1662 surrounding squares */ 1646 surrounding squares */
1663 1647
1664 /* loop over current square and neighbors to hit. 1648 /* loop over current square and neighbors to hit.
1665 * if this has an other_arch field, we insert that in 1649 * if this has an other_arch field, we insert that in
1666 * the surround spaces. 1650 * the surround spaces.
1667 */ 1651 */
1668 for (j = 0; j < 9; j++) 1652 for (j = 0; j < 9; j++)
1669 { 1653 {
1670 hx = nx + freearr_x[j]; 1654 hx = nx + DIRX (j);
1671 hy = ny + freearr_y[j]; 1655 hy = ny + DIRY (j);
1672 1656
1673 m = op->map; 1657 m = op->map;
1674 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1658 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
1675 1659
1676 if (mflags & P_OUT_OF_MAP) 1660 if (mflags & P_OUT_OF_MAP)
… …
1699 i = spell_find_dir (op->map, op->x, op->y, op->owner); 1683 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1700 1684
1701 if (i >= 0) 1685 if (i >= 0)
1702 { /* we have a preferred direction! */ 1686 { /* we have a preferred direction! */
1703 /* pick another direction if the preferred dir is blocked. */ 1687 /* pick another direction if the preferred dir is blocked. */
1704 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1688 if (get_map_flags (op->map, &m, nx + DIRX (i), ny + DIRY (i), &hx, &hy) & P_OUT_OF_MAP ||
1705 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1689 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1706 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1690 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1707 1691
1708 op->direction = i; 1692 op->direction = i;
1709 } 1693 }
1710} 1694}
1711 1695
1712/* move_swarm_spell: peterm 1696/* move_swarm_spell: peterm
1713 * This is an implementation of the swarm spell. It was written for 1697 * This is an implementation of the swarm spell. It was written for
1714 * meteor swarm, but it could be used for any swarm. A swarm spell 1698 * meteor swarm, but it could be used for any swarm. A swarm spell
1715 * is a special type of object that casts swarms of other types 1699 * is a special type of object that casts swarms of other types
1716 * of spells. Which spell it casts is flexible. It fires the spells 1700 * of spells. Which spell it casts is flexible. It fires the spells
1717 * from a set of squares surrounding the caster, in a given direction. 1701 * from a set of squares surrounding the caster, in a given direction.
1718 */ 1702 */
1719void 1703void
1720move_swarm_spell (object *op) 1704move_swarm_spell (object *op)
1721{ 1705{
1722#if 0 1706#if 0
… …
1758 // space. 1742 // space.
1759 // should be fixed later, but correctness before features... 1743 // should be fixed later, but correctness before features...
1760 // (schmorp) 1744 // (schmorp)
1761 1745
1762 /* new offset calculation to make swarm element distribution 1746 /* new offset calculation to make swarm element distribution
1763 * more uniform 1747 * more uniform
1764 */ 1748 */
1765 if (op->duration) 1749 if (op->duration)
1766 { 1750 {
1767 if (basedir & 1) 1751 if (basedir & 1)
1768 { 1752 {
… …
1776 else 1760 else
1777 { 1761 {
1778 adjustdir = 0; /* fire the last one from forward. */ 1762 adjustdir = 0; /* fire the last one from forward. */
1779 } 1763 }
1780 1764
1781 target_x = op->x + freearr_x[absdir (basedir + adjustdir)]; 1765 target_x = op->x + DIRX (absdir (basedir + adjustdir));
1782 target_y = op->y + freearr_y[absdir (basedir + adjustdir)]; 1766 target_y = op->y + DIRY (absdir (basedir + adjustdir));
1783 1767
1784 /* back up one space so we can hit point-blank targets, but this 1768 /* back up one space so we can hit point-blank targets, but this
1785 * necessitates extra out_of_map check below 1769 * necessitates extra out_of_map check below
1786 */ 1770 */
1787 origin_x = target_x - freearr_x[basedir]; 1771 origin_x = target_x - DIRX (basedir);
1788 origin_y = target_y - freearr_y[basedir]; 1772 origin_y = target_y - DIRY (basedir);
1789 1773
1790 1774
1791 /* spell pointer is set up for the spell this casts. Since this 1775 /* spell pointer is set up for the spell this casts. Since this
1792 * should just be a pointer to the spell in some inventory, 1776 * should just be a pointer to the spell in some inventory,
1793 * it is unlikely to disappear by the time we need it. However, 1777 * it is unlikely to disappear by the time we need it. However,
… …
1824} 1808}
1825 1809
1826/* fire_swarm: 1810/* fire_swarm:
1827 * The following routine creates a swarm of objects. It actually 1811 * The following routine creates a swarm of objects. It actually
1828 * sets up a specific swarm object, which then fires off all 1812 * sets up a specific swarm object, which then fires off all
1829 * the parts of the swarm. 1813 * the parts of the swarm.
1830 * 1814 *
1831 * op: the owner 1815 * op: the owner
1832 * caster: the caster (owner, wand, rod, scroll) 1816 * caster: the caster (owner, wand, rod, scroll)
1833 * dir: the direction everything will be fired in 1817 * dir: the direction everything will be fired in
1834 * spell - the spell that is this spell. 1818 * spell - the spell that is this spell.
… …
1879 1863
1880 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1864 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1881 1865
1882 if (dir) 1866 if (dir)
1883 { 1867 {
1884 x = op->x + freearr_x[dir]; 1868 x = op->x + DIRX (dir);
1885 y = op->y + freearr_y[dir]; 1869 y = op->y + DIRY (dir);
1886 m = op->map; 1870 m = op->map;
1887 1871
1888 mflags = get_map_flags (m, &m, x, y, &x, &y); 1872 mflags = get_map_flags (m, &m, x, y, &x, &y);
1889 1873
1890 if (mflags & P_OUT_OF_MAP) 1874 if (mflags & P_OUT_OF_MAP)
1891 { 1875 {
1892 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1876 op->failmsg ("Nothing is there.");
1893 return 0; 1877 return 0;
1894 } 1878 }
1895 1879
1896 if (mflags & P_IS_ALIVE && spell->attacktype) 1880 if (mflags & P_IS_ALIVE && spell->attacktype)
1897 { 1881 {
1898 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1882 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1899 if (QUERY_FLAG (target, FLAG_MONSTER)) 1883 if (target->flag [FLAG_MONSTER])
1900 { 1884 {
1901 /* oky doky. got a target monster. Lets make a blinding attack */ 1885 /* oky doky. got a target monster. Lets make a blinding attack */
1902 if (target->head) 1886 if (target->head)
1903 target = target->head; 1887 target = target->head;
1904 1888
… …
1908 } 1892 }
1909 1893
1910 /* no live target, perhaps a wall is in the way? */ 1894 /* no live target, perhaps a wall is in the way? */
1911 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1895 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1912 { 1896 {
1913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1897 op->failmsg ("Something is in the way.");
1914 return 0; 1898 return 0;
1915 } 1899 }
1916 } 1900 }
1917 1901
1918 /* ok, looks groovy to just insert a new light on the map */ 1902 /* ok, looks groovy to just insert a new light on the map */
… …
1937 1921
1938 return 1; 1922 return 1;
1939} 1923}
1940 1924
1941/* cast_cause_disease: this spell looks along <dir> from the 1925/* cast_cause_disease: this spell looks along <dir> from the
1942 * player and infects someone. 1926 * player and infects someone.
1943 * op is the player/monster, caster is the object, dir is the direction 1927 * op is the player/monster, caster is the object, dir is the direction
1944 * to cast, disease_arch is the specific disease, and type is the spell number 1928 * to cast, disease_arch is the specific disease, and type is the spell number
1945 * perhaps this should actually be in disease.c? 1929 * perhaps this should actually be in disease.c?
1946 */ 1930 */
1947int 1931int
… …
1953 maptile *m; 1937 maptile *m;
1954 1938
1955 x = op->x; 1939 x = op->x;
1956 y = op->y; 1940 y = op->y;
1957 1941
1958 /* If casting from a scroll, no direction will be available, so refer to the 1942 /* If casting from a scroll, no direction will be available, so refer to the
1959 * direction the player is pointing. 1943 * direction the player is pointing.
1960 */ 1944 */
1961 if (!dir) 1945 if (!dir)
1962 dir = op->facing; 1946 dir = op->facing;
1963 1947
… …
1970 dur_mod = SP_level_duration_adjust (caster, spell); 1954 dur_mod = SP_level_duration_adjust (caster, spell);
1971 1955
1972 /* search in a line for a victim */ 1956 /* search in a line for a victim */
1973 for (i = 1; i < range; i++) 1957 for (i = 1; i < range; i++)
1974 { 1958 {
1975 x = op->x + i * freearr_x[dir]; 1959 x = op->x + i * DIRX (dir);
1976 y = op->y + i * freearr_y[dir]; 1960 y = op->y + i * DIRY (dir);
1977 m = op->map; 1961 m = op->map;
1978 1962
1979 mflags = get_map_flags (m, &m, x, y, &x, &y); 1963 mflags = get_map_flags (m, &m, x, y, &x, &y);
1980 1964
1981 if (mflags & P_OUT_OF_MAP) 1965 if (mflags & P_OUT_OF_MAP)
… …
1988 /* Only bother looking on this space if there is something living here */ 1972 /* Only bother looking on this space if there is something living here */
1989 if (mflags & P_IS_ALIVE) 1973 if (mflags & P_IS_ALIVE)
1990 { 1974 {
1991 /* search this square for a victim */ 1975 /* search this square for a victim */
1992 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1976 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1993 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1977 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1994 { /* found a victim */ 1978 { /* found a victim */
1995 object *disease = spell->other_arch->instance (); 1979 object *disease = spell->other_arch->instance ();
1996 1980
1997 disease->set_owner (op); 1981 disease->set_owner (op);
1998 set_spell_skill (op, caster, spell, disease); 1982 set_spell_skill (op, caster, spell, disease);
… …
2011 1995
2012 if (disease->last_sp < 1) 1996 if (disease->last_sp < 1)
2013 disease->last_sp = 1; 1997 disease->last_sp = 1;
2014 } 1998 }
2015 1999
2016 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod); 2000 if (disease->stats.dam ) disease->stats.dam += copysignl (disease->stats.dam , dam_mod);
2017 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod); 2001 if (disease->stats.maxsp) disease->stats.maxsp += copysignl (disease->stats.maxsp, dam_mod);
2018 if (disease->stats.ac ) disease->stats.ac += dam_mod; 2002 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2019 if (disease->last_eat ) disease->last_eat -= dam_mod; 2003 if (disease->last_eat ) disease->last_eat -= dam_mod;
2020 if (disease->stats.hp ) disease->stats.hp -= dam_mod; 2004 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2021 if (disease->stats.sp ) disease->stats.sp -= dam_mod; 2005 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2022 2006
2023 if (infect_object (walk, disease, 1)) 2007 if (infect_object (walk, disease, 1))
2024 { 2008 {
2025 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name)); 2009 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2026 2010
2027 disease->destroy (); /* don't need this one anymore */ 2011 disease->destroy (); /* don't need this one anymore */
2028 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2012 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2029 return 1; 2013 return 1;
2030 } 2014 }
2031 2015
2032 disease->destroy (); 2016 disease->destroy ();
2033 } 2017 }

Diff Legend

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