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.28 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.112 by root, Mon Oct 29 23:55:57 2012 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 17 *
18 * 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 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
26 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
27 * of code 27 * of code
… …
37/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
38 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
39 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
40 * op is the spell object. 40 * op is the spell object.
41 */ 41 */
42 42static void
43void
44check_spell_knockback (object *op) 43check_spell_knockback (object *op)
45{ 44{
46 object *tmp, *tmp2; /* object on the map */
47 int weight_move; 45 int weight_move;
48 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 46 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
49 47
50 if (!op->weight) 48 if (!op->weight)
51 { /*shouldn't happen but if cone object has no weight drop out */ 49 { /*shouldn't happen but if cone object has no weight drop out */
… …
56 { 54 {
57 weight_move = op->weight + (op->weight * op->level) / 3; 55 weight_move = op->weight + (op->weight * op->level) / 3;
58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 56 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
59 } 57 }
60 58
61 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
62 { 60 {
63 int num_sections = 1; 61 int num_sections = 1;
64 62
65 /* don't move DM */ 63 /* don't move DM */
66 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (tmp->flag [FLAG_WIZ])
67 return; 65 return;
68 66
69 /* don't move parts of objects */ 67 /* don't move parts of objects */
70 if (tmp->head) 68 if (tmp->head)
71 continue; 69 continue;
72 70
73 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
74 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
75 continue; 73 continue;
76 74
77 /* count the object's sections */ 75 /* count the object's sections */
78 for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
79 num_sections++; 77 num_sections++;
80 78
81 /* I'm not sure if it makes sense to divide by num_sections - bigger 79 /* I'm not sure if it makes sense to divide by num_sections - bigger
82 * objects should be harder to move, and we are moving the entire 80 * objects should be harder to move, and we are moving the entire
83 * object, not just the head, so the total weight should be relevant. 81 * object, not just the head, so the total weight should be relevant.
… …
95 * also be safe for objects. 93 * also be safe for objects.
96 * This does return if successful or not, but 94 * This does return if successful or not, but
97 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
98 * right now. 96 * right now.
99 */ 97 */
100 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
101 } 99 }
102 100
103 } 101 }
104} 102}
105 103
… …
107 * 105 *
108 * BOLT CODE 106 * BOLT CODE
109 * 107 *
110 ***************************************************************************/ 108 ***************************************************************************/
111 109
112/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
113 * is the first piece of the fork. 111 * is the first piece of the fork.
114 */ 112 */
115 113static void
116void
117forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
118{ 115{
119 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
120 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
121 maptile *m; 118 maptile *m;
… …
145 142
146 /* reduce chances of subsequent forking */ 143 /* reduce chances of subsequent forking */
147 new_bolt->stats.Dex -= 10; 144 new_bolt->stats.Dex -= 10;
148 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 145 tmp->stats.Dex -= 10; /* less forks from main bolt too */
149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 146 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
150 new_bolt->speed_left = -0.1; 147 new_bolt->speed_left = -0.1f;
151 new_bolt->direction = t_dir; 148 new_bolt->direction = t_dir;
152 new_bolt->duration++; 149 new_bolt->duration++;
153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 150 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
154 new_bolt->stats.dam++; 151 new_bolt->stats.dam++;
155 tmp->stats.dam /= 2; /* reduce father bolt damage */ 152 tmp->stats.dam /= 2; /* reduce father bolt damage */
156 tmp->stats.dam++; 153 tmp->stats.dam++;
154
157 if ((new_bolt = m->insert (new_bolt, sx, sy, op))) 155 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
158 update_turn_face (new_bolt); 156 update_turn_face (new_bolt);
159} 157}
160 158
161/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 159/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
162 * and checks for various things that may stop it. 160 * and checks for various things that may stop it.
163 */ 161 */
164
165void 162void
166move_bolt (object *op) 163move_bolt (object *op)
167{ 164{
168 object *tmp;
169 int mflags; 165 int mflags;
170 sint16 x, y; 166 sint16 x, y;
171 maptile *m; 167 maptile *m;
172 168
173 if (--op->duration < 0) 169 if (--op->duration < 0)
174 { 170 {
175 op->destroy (); 171 op->drop_and_destroy ();
176 return; 172 return;
177 } 173 }
178 174
179 hit_map (op, 0, op->attacktype, 1); 175 hit_map (op, 0, op->attacktype, 1);
180 176
… …
198 * on the space. So only call reflwall if we think the data it returns 194 * on the space. So only call reflwall if we think the data it returns
199 * will be useful. 195 * will be useful.
200 */ 196 */
201 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
202 { 198 {
203 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!op->flag [FLAG_REFLECTING])
204 return; 200 return;
205 201
206 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
207 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
208 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
… …
246 else 242 else
247 { /* Create a copy of this object and put it ahead */ 243 { /* Create a copy of this object and put it ahead */
248 object *tmp = op->clone (); 244 object *tmp = op->clone ();
249 245
250 m->insert (tmp, x, y, op); 246 m->insert (tmp, x, y, op);
251 tmp->speed_left = -0.1; 247 tmp->speed_left = -0.1f;
252 /* To make up for the decrease at the top of the function */ 248 /* To make up for the decrease at the top of the function */
253 tmp->duration++; 249 tmp->duration++;
254 250
255 /* New forking code. Possibly create forks of this object 251 /* New forking code. Possibly create forks of this object
256 * going off in other directions. 252 * going off in other directions.
257 */ 253 */
258 if (rndm (0, 99) < tmp->stats.Dex) 254 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
259 { /* stats.Dex % of forking */ 255 forklightning (op, tmp); /* stats.Dex % of forking */
260 forklightning (op, tmp);
261 }
262 256
263 /* In this way, the object left behind sticks on the space, but 257 /* In this way, the object left behind sticks on the space, but
264 * doesn't create any bolts that continue to move onward. 258 * doesn't create any bolts that continue to move onward.
265 */ 259 */
266 op->range = 0; 260 op->range = 0;
… …
283 int mflags; 277 int mflags;
284 278
285 if (!spob->other_arch) 279 if (!spob->other_arch)
286 return 0; 280 return 0;
287 281
288 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
289 if (tmp == NULL) 283 if (tmp == NULL)
290 return 0; 284 return 0;
291 285
292 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
293 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
294 tmp->attacktype = spob->attacktype; 288 tmp->attacktype = spob->attacktype;
289
295 if (spob->slaying) 290 if (spob->slaying)
296 tmp->slaying = spob->slaying; 291 tmp->slaying = spob->slaying;
292
297 tmp->range = spob->range + SP_level_range_adjust (caster, spob); 293 tmp->range = spob->range + SP_level_range_adjust (caster, spob);
298 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
299 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
300 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
301 297
302 tmp->direction = dir; 298 tmp->direction = dir;
303 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 299 if (tmp->flag [FLAG_IS_TURNABLE])
304 SET_ANIMATION (tmp, dir); 300 SET_ANIMATION (tmp, dir);
305 301
306 tmp->set_owner (op); 302 tmp->set_owner (op);
307 set_spell_skill (op, caster, spob, tmp); 303 set_spell_skill (op, caster, spob, tmp);
308 304
… …
312 308
313 maptile *newmap; 309 maptile *newmap;
314 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 310 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
315 if (mflags & P_OUT_OF_MAP) 311 if (mflags & P_OUT_OF_MAP)
316 { 312 {
317 tmp->destroy (); 313 tmp->drop_and_destroy ();
318 return 0; 314 return 0;
319 } 315 }
320 316
321 tmp->map = newmap; 317 tmp->map = newmap;
322 318
323 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
324 { 320 {
325 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!tmp->flag [FLAG_REFLECTING])
326 { 322 {
327 tmp->destroy (); 323 tmp->drop_and_destroy ();
328 return 0; 324 return 0;
329 } 325 }
330 326
331 tmp->x = op->x; 327 tmp->x = op->x;
332 tmp->y = op->y; 328 tmp->y = op->y;
… …
337 if ((tmp = tmp->insert_at (tmp, op))) 333 if ((tmp = tmp->insert_at (tmp, op)))
338 move_bolt (tmp); 334 move_bolt (tmp);
339 335
340 return 1; 336 return 1;
341} 337}
342
343
344 338
345/*************************************************************************** 339/***************************************************************************
346 * 340 *
347 * BULLET/BALL CODE 341 * BULLET/BALL CODE
348 * 342 *
349 ***************************************************************************/ 343 ***************************************************************************/
350 344
351/* expands an explosion. op is a piece of the 345/* expands an explosion. op is a piece of the
352 * explosion - this expans it in the different directions. 346 * explosion - this expands it in the different directions.
353 * At least that is what I think this does. 347 * At least that is what I think this does.
354 */ 348 */
355void 349void
356explosion (object *op) 350explosion (object *op)
357{ 351{
… …
381 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 375 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
382 { 376 {
383 object *tmp = op->clone (); 377 object *tmp = op->clone ();
384 378
385 tmp->state = 0; 379 tmp->state = 0;
386 tmp->speed_left = -0.21; 380 tmp->speed_left = -0.21f;
387 tmp->range--; 381 tmp->range--;
388 tmp->value = 0; 382 tmp->value = 0;
389 383
390 m->insert (tmp, dx, dy, op); 384 m->insert (tmp, dx, dy, op);
391 } 385 }
392 } 386 }
393 } 387 }
394} 388}
395
396 389
397/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
398 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
399 * explode. 392 * explode.
400 */ 393 */
401void 394static void
402explode_bullet (object *op) 395explode_bullet (object *op)
403{ 396{
404 object *tmp, *owner; 397 object *tmp, *owner;
405 398
406 if (op->other_arch == NULL) 399 if (!op->other_arch)
407 { 400 {
408 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 401 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
409 op->destroy (); 402 op->destroy ();
410 return; 403 return;
411 } 404 }
412 405
413 if (op->env) 406 if (op->env)
414 { 407 {
415 object *env = object_get_env_recursive (op); 408 object *env = op->outer_env ();
409
416 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 410 if (!env->map || out_of_map (env->map, env->x, env->y))
417 { 411 {
418 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 412 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
419 op->destroy (); 413 op->destroy ();
420 return; 414 return;
421 } 415 }
… …
439 } 433 }
440 434
441 if (op->attacktype) 435 if (op->attacktype)
442 { 436 {
443 hit_map (op, 0, op->attacktype, 1); 437 hit_map (op, 0, op->attacktype, 1);
438
444 if (op->destroyed ()) 439 if (op->destroyed ())
445 return; 440 return;
446 } 441 }
447 442
448 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
449 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
450 445
451 tmp->set_owner (op); 446 tmp->set_owner (op);
452 tmp->skill = op->skill; 447 tmp->skill = op->skill;
453 448
454 owner = op->owner; 449 owner = op->owner;
455 450
456 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 451 if ((tmp->attacktype & AT_HOLYWORD
452 || tmp->attacktype & AT_GODPOWER)
453 && owner
454 && !tailor_god_spell (tmp, owner))
457 { 455 {
458 op->destroy (); 456 op->destroy ();
459 return; 457 return;
460 } 458 }
461 459
… …
488 486
489 /* Prevent recursion */ 487 /* Prevent recursion */
490 op->move_on = 0; 488 op->move_on = 0;
491 489
492 tmp->insert_at (op, op); 490 tmp->insert_at (op, op);
491 tmp->play_sound (tmp->sound);
492
493 /* remove the firebullet */ 493 /* remove the firebullet */
494 op->destroy (); 494 op->destroy ();
495} 495}
496 496
497/* checks to see what op should do, given the space it is on 497/* checks to see what op should do, given the space it is on
… …
519 519
520 /* If nothing alive on this space, no reason to do anything further */ 520 /* If nothing alive on this space, no reason to do anything further */
521 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
522 return; 522 return;
523 523
524 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
525 { 525 {
526 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (tmp->flag [FLAG_ALIVE])
527 { 527 {
528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529
530 // TODO: can't understand the following if's
529 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
530 { 532 {
531 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!op->flag [FLAG_REMOVED])
532 { 534 {
533 op->destroy (); 535 op->destroy ();
534 return; 536 return;
535 } 537 }
536 } 538 }
… …
544 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
545 */ 547 */
546void 548void
547move_bullet (object *op) 549move_bullet (object *op)
548{ 550{
549 sint16 new_x, new_y;
550 int mflags;
551 maptile *m;
552
553#if 0 551#if 0
554 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
555 553
556 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
557 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
572 op->destroy (); 570 op->destroy ();
573 571
574 return; 572 return;
575 } 573 }
576 574
577 new_x = op->x + DIRX (op); 575 mapxy pos (op);
578 new_y = op->y + DIRY (op); 576 pos.move (op->direction);
579 m = op->map;
580 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
581 577
582 if (mflags & P_OUT_OF_MAP) 578 if (!pos.normalise ())
583 { 579 {
584 op->destroy (); 580 op->destroy ();
585 return; 581 return;
586 } 582 }
587 583
588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 584 mapspace &ms = pos.ms ();
585
586 ms.update ();
587
588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
589 { 589 {
590 if (op->other_arch) 590 if (op->other_arch)
591 explode_bullet (op); 591 explode_bullet (op);
592 else 592 else
593 op->destroy (); 593 op->destroy ();
594 594
595 return; 595 return;
596 } 596 }
597 597
598 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
599 return; 599 return;
600 600
601 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
602 { 602 {
603 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
604 update_turn_face (op); 604 update_turn_face (op);
605 } 605 }
606 else 606 else
607 check_bullet (op); 607 check_bullet (op);
608} 608}
609
610
611
612 609
613/* fire_bullet 610/* fire_bullet
614 * object op (cast from caster) files a bolt in dir. 611 * object op (cast from caster) files a bolt in dir.
615 * spob is the spell object for the bolt. 612 * spob is the spell object for the bolt.
616 * we remove the magic flag - that can be derived from 613 * we remove the magic flag - that can be derived from
617 * spob->attacktype. 614 * spob->attacktype.
618 * This function sets up the appropriate owner and skill 615 * This function sets up the appropriate owner and skill
619 * pointers. 616 * pointers.
620 */ 617 */
621
622int 618int
623fire_bullet (object *op, object *caster, int dir, object *spob) 619fire_bullet (object *op, object *caster, int dir, object *spob)
624{ 620{
625 object *tmp = NULL; 621 object *tmp = NULL;
626 int mflags; 622 int mflags;
627 623
628 if (!spob->other_arch) 624 if (!spob->other_arch)
629 return 0; 625 return 0;
630 626
631 tmp = arch_to_object (spob->other_arch); 627 tmp = spob->other_arch->instance ();
632 if (tmp == NULL) 628 if (!tmp)
633 return 0; 629 return 0;
634 630
635 /* peterm: level dependency for bolts */ 631 /* peterm: level dependency for bolts */
636 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 632 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
637 tmp->attacktype = spob->attacktype; 633 tmp->attacktype = spob->attacktype;
638 if (spob->slaying) 634 if (spob->slaying)
639 tmp->slaying = spob->slaying; 635 tmp->slaying = spob->slaying;
640 636
… …
644 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
645 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
646 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
647 643
648 tmp->direction = dir; 644 tmp->direction = dir;
649 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
650 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
651 647
652 tmp->set_owner (op); 648 tmp->set_owner (op);
653 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
654 650
655 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + freearr_x[dir];
656 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + freearr_y[dir];
657 tmp->map = op->map; 653 tmp->map = op->map;
658 654
659 maptile *newmap; 655 maptile *newmap;
660 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
661 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
… …
664 return 0; 660 return 0;
665 } 661 }
666 662
667 tmp->map = newmap; 663 tmp->map = newmap;
668 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
669 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
670 { 679 {
671 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
672 { 681 {
673 tmp->destroy (); 682 tmp->destroy ();
674 return 0; 683 return 0;
675 } 684 }
676 685
… …
683 if ((tmp = tmp->insert_at (tmp, op))) 692 if ((tmp = tmp->insert_at (tmp, op)))
684 check_bullet (tmp); 693 check_bullet (tmp);
685 694
686 return 1; 695 return 1;
687} 696}
688
689
690
691 697
692/***************************************************************************** 698/*****************************************************************************
693 * 699 *
694 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
695 * 701 *
696 *****************************************************************************/ 702 *****************************************************************************/
697 703
698
699/* drops an object based on what is in the cone's "other_arch" */ 704/* drops an object based on what is in the cone's "other_arch" */
700void 705static void
701cone_drop (object *op) 706cone_drop (object *op)
702{ 707{
703 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
704 709
705 new_ob->level = op->level; 710 new_ob->level = op->level;
706 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
707 712
708 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
715/* move_cone: causes cone object 'op' to move a space/hit creatures */ 720/* move_cone: causes cone object 'op' to move a space/hit creatures */
716 721
717void 722void
718move_cone (object *op) 723move_cone (object *op)
719{ 724{
720 int i;
721
722 /* if no map then hit_map will crash so just ignore object */ 725 /* if no map then hit_map will crash so just ignore object */
723 if (!op->map) 726 if (!op->map)
724 { 727 {
725 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 728 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
726 op->set_speed (0); 729 op->set_speed (0);
727 return; 730 return;
728 } 731 }
729 732
730 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
731 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
732 { 735 {
733 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
734 return; 737 return;
735 } 738 }
736 739
… …
746 } 749 }
747#endif 750#endif
748 751
749 hit_map (op, 0, op->attacktype, 0); 752 hit_map (op, 0, op->attacktype, 0);
750 753
754 if (!op->is_on_map ())
755 return;
756
751 /* Check to see if we should push anything. 757 /* Check to see if we should push anything.
752 * Spell objects with weight push whatever they encounter to some 758 * Spell objects with weight push whatever they encounter to some
753 * degree. 759 * degree.
754 */ 760 */
755 if (op->weight) 761 if (op->weight)
762 {
756 check_spell_knockback (op); 763 check_spell_knockback (op);
757 764
758 if (op->destroyed ()) 765 if (!op->is_on_map ())
759 return; 766 return;
767 }
760 768
761 if ((op->duration--) < 0) 769 if (op->duration-- < 0)
762 { 770 {
763 op->destroy (); 771 op->destroy ();
764 return; 772 return;
765 } 773 }
766 /* Object has hit maximum range, so don't have it move 774 /* Object has hit maximum range, so don't have it move
… …
771 { 779 {
772 op->range = 0; /* just so it doesn't wrap */ 780 op->range = 0; /* just so it doesn't wrap */
773 return; 781 return;
774 } 782 }
775 783
776 for (i = -1; i < 2; i++) 784 for (int i = -1; i <= 1; i++)
777 { 785 {
778 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 786 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
779 787
780 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 788 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
781 { 789 {
… …
812 MoveType movetype; 820 MoveType movetype;
813 821
814 if (!spell->other_arch) 822 if (!spell->other_arch)
815 return 0; 823 return 0;
816 824
817 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 825 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
818 { 826 {
819 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 827 op->failmsg ("Your undead nature prevents you from turning undead!");
820 return 0; 828 return 0;
821 } 829 }
822 830
823 if (!dir) 831 if (!dir)
824 { 832 {
… …
828 836
829 /* Need to know what the movetype of the object we are about 837 /* Need to know what the movetype of the object we are about
830 * to create is, so we can know if the space we are about to 838 * to create is, so we can know if the space we are about to
831 * insert it into is blocked. 839 * insert it into is blocked.
832 */ 840 */
833 movetype = spell->other_arch->clone.move_type; 841 movetype = spell->other_arch->move_type;
834 842
835 for (i = range_min; i <= range_max; i++) 843 for (i = range_min; i <= range_max; i++)
836 { 844 {
837 sint16 x, y, d; 845 sint16 x, y;
838 846
839 /* We can't use absdir here, because it never returns 847 /* We can't use absdir here, because it never returns
840 * 0. If this is a rune, we want to hit the person on top 848 * 0. If this is a rune, we want to hit the person on top
841 * of the trap (d==0). If it is not a rune, then we don't want 849 * of the trap (d==0). If it is not a rune, then we don't want
842 * to hit that person. 850 * to hit that person.
843 */ 851 */
844 d = dir + i; 852 int d = dir ? absdir (dir + i) : i;
845 while (d < 0)
846 d += 8;
847 while (d > 8)
848 d -= 8;
849 853
850 /* If it's not a rune, we don't want to blast the caster. 854 /* If it's not a rune, we don't want to blast the caster.
851 * In that case, we have to see - if dir is specified, 855 * In that case, we have to see - if dir is specified,
852 * turn this into direction 8. If dir is not specified (all 856 * turn this into direction 8. If dir is not specified (all
853 * direction) skip - otherwise, one line would do more damage 857 * direction) skip - otherwise, one line would do more damage
… …
870 874
871 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
872 continue; 876 continue;
873 877
874 success = 1; 878 success = 1;
875 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
876 tmp->set_owner (op); 880 tmp->set_owner (op);
877 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
878 tmp->level = caster_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
879 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
880 884
881 /* holy word stuff */ 885 /* holy word stuff */
882 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 886 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
883 if (!tailor_god_spell (tmp, op)) 887 if (!tailor_god_spell (tmp, op))
… …
917 else 921 else
918 tmp->duration += caster->level / 3; 922 tmp->duration += caster->level / 3;
919 } 923 }
920 924
921 if (!(tmp->move_type & MOVE_FLY_LOW)) 925 if (!(tmp->move_type & MOVE_FLY_LOW))
922 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 926 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
923 927
924 if (!tmp->move_on && tmp->stats.dam) 928 if (!tmp->move_on && tmp->stats.dam)
925 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 929 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
926 930
927 m->insert (tmp, sx, sy, op); 931 m->insert (tmp, sx, sy, op);
928 932
929 /* This is used for tracking spells so that one effect doesn't hit 933 /* This is used for tracking spells so that one effect doesn't hit
930 * a single space too many times. 934 * a single space too many times.
… …
942 * 946 *
943 * BOMB related code 947 * BOMB related code
944 * 948 *
945 ****************************************************************************/ 949 ****************************************************************************/
946 950
947
948/* This handles an exploding bomb. 951/* This handles an exploding bomb.
949 * op is the original bomb object. 952 * op is the original bomb object.
950 */ 953 */
951void 954void
952animate_bomb (object *op) 955animate_bomb (object *op)
953{ 956{
954 int i;
955 object *env, *tmp;
956
957 if (op->state != NUM_ANIMATIONS (op) - 1) 957 if (op->state != NUM_ANIMATIONS (op) - 1)
958 return; 958 return;
959 959
960 env = object_get_env_recursive (op); 960 object *env = op->outer_env ();
961 961
962 if (op->env) 962 if (op->env)
963 { 963 {
964 if (env->map == NULL) 964 if (!env->map)
965 return; 965 return;
966
967 if (env->type == PLAYER)
968 esrv_del_item (env->contr, op->count);
969 966
970 if (!(op = op->insert_at (env, op))) 967 if (!(op = op->insert_at (env, op)))
971 return; 968 return;
972 } 969 }
973 970
974 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 971 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
975 // on a safe map. I don't like this special casing, but it seems to be neccessary 972 // on a safe map. I don't like this special casing, but it seems to be neccessary
976 // as bombs can be carried. 973 // as bombs can be carried.
977 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 974 if (op->ms ().flags () & P_SAFE)
978 { 975 {
979 op->destroy (); 976 op->destroy ();
980 return; 977 return;
981 } 978 }
982 979
… …
984 * but using the cast_bullet isn't really feasible, 981 * but using the cast_bullet isn't really feasible,
985 * so just set up the appropriate values. 982 * so just set up the appropriate values.
986 */ 983 */
987 if (archetype *at = archetype::find (SPLINT)) 984 if (archetype *at = archetype::find (SPLINT))
988 { 985 {
989 for (i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
990 { 987 {
991 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 988 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
992 continue; 989 continue;
993 990
994 tmp = arch_to_object (at); 991 object *tmp = at->instance ();
995 tmp->direction = i; 992 tmp->direction = i;
996 tmp->range = op->range; 993 tmp->range = op->range;
997 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
998 tmp->duration = op->duration; 995 tmp->duration = op->duration;
999 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
1000 tmp->set_owner (op); 997 tmp->set_owner (op);
1001 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
1002 tmp->skill = op->skill; 999 tmp->skill = op->skill;
1003 1000
1004 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
1005 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
1006 1003
1007 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1004 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1008 move_bullet (tmp); 1005 move_bullet (tmp);
1009 } 1006 }
… …
1013} 1010}
1014 1011
1015int 1012int
1016create_bomb (object *op, object *caster, int dir, object *spell) 1013create_bomb (object *op, object *caster, int dir, object *spell)
1017{ 1014{
1018
1019 object *tmp; 1015 object *tmp;
1020 int mflags; 1016 int mflags;
1021 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1017 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1022 maptile *m; 1018 maptile *m;
1023 1019
1024 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1020 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1021
1022 // when creating a bomb below ourself it should always work, even
1023 // when movement is blocked (somehow we got here, somehow we are here,
1024 // so we should also be able to make a bomb here). (originally added
1025 // to fix create bomb traps in doors, which cast with dir=0).
1026 if (dir)
1027 {
1025 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1028 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1026 { 1029 {
1027 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1028 return 0; 1031 return 0;
1032 }
1029 } 1033 }
1030 tmp = arch_to_object (spell->other_arch); 1034
1035 tmp = spell->other_arch->instance ();
1031 1036
1032 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1033 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1034 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1039 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1035 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1055 * dir is the direction to look in. 1060 * dir is the direction to look in.
1056 * range is how far out to look. 1061 * range is how far out to look.
1057 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1062 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1058 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1059 */ 1064 */
1060 1065static object *
1061object *
1062get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1063{ 1067{
1064 object *target; 1068 object *target;
1065 sint16 x, y; 1069 sint16 x, y;
1066 int dist, mflags; 1070 int dist, mflags;
… …
1084 return NULL; 1088 return NULL;
1085 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1086 return NULL; 1090 return NULL;
1087 1091
1088 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1089 {
1090 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1091 { 1094 if (target->flag [FLAG_MONSTER])
1092 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1093 {
1094 return target; 1095 return target;
1095 }
1096 }
1097 }
1098 } 1096 }
1097
1099 return NULL; 1098 return NULL;
1100} 1099}
1101 1100
1102
1103/* cast_smite_arch() - the priest points to a creature and causes 1101/* cast_smite_spell() - the priest points to a creature and causes
1104 * a 'godly curse' to decend. 1102 * a 'godly curse' to decend.
1105 * usual params - 1103 * usual params -
1106 * op = player 1104 * op = player
1107 * caster = object casting the spell. 1105 * caster = object casting the spell.
1108 * dir = direction being cast 1106 * dir = direction being cast
1109 * spell = spell object 1107 * spell = spell object
1110 */ 1108 */
1111
1112int 1109int
1113cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1114{ 1111{
1115 object *effect, *target; 1112 object *effect, *target;
1116 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1117 int range;
1118 1114
1119 range = spell->range + SP_level_range_adjust (caster, spell);
1120 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); 1115 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1121 1116
1122 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1123 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1124 * This makes this spell much more general purpose - it can be used 1119 * This makes this spell much more general purpose - it can be used
… …
1126 * interesting spell. 1121 * interesting spell.
1127 * if it is a cleric spell, you need a god, and the creature 1122 * if it is a cleric spell, you need a god, and the creature
1128 * can't be friendly to your god. 1123 * can't be friendly to your god.
1129 */ 1124 */
1130 1125
1131 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1126 if (!target
1127 || target->flag [FLAG_REFL_SPELL]
1132 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1133 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race))) 1129 || (god && target->title == god->name)
1130 || (god && target->race.contains (god->race)))
1134 { 1131 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1136 return 0; 1133 return 0;
1137 } 1134 }
1138 1135
1139 if (spell->other_arch) 1136 if (spell->other_arch)
1140 effect = arch_to_object (spell->other_arch); 1137 effect = spell->other_arch->instance ();
1141 else 1138 else
1142 return 0; 1139 return 0;
1143 1140
1144 /* tailor the effect by priest level and worshipped God */ 1141 /* tailor the effect by priest level and worshipped God */
1145 effect->level = caster_level (caster, spell); 1142 effect->level = casting_level (caster, spell);
1146 effect->attacktype = spell->attacktype; 1143 effect->attacktype = spell->attacktype;
1147 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1144 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1148 { 1145 {
1149 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1150 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1147 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1151 else 1148 else
1152 { 1149 {
1153 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1154 return 0; 1151 return 0;
1155 } 1152 }
1156 } 1153 }
1157 1154
1158 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1162 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1163 { 1160 {
1164 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1165 1162
1166 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1167 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1168 { 1165 {
1169 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1170 { 1167 {
1171 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1172 effect->x = op->x; 1169 effect->x = op->x;
… …
1194 effect->insert_at (target, op); 1191 effect->insert_at (target, op);
1195 1192
1196 return 1; 1193 return 1;
1197} 1194}
1198 1195
1199
1200/**************************************************************************** 1196/****************************************************************************
1201 * 1197 *
1202 * MAGIC MISSILE code. 1198 * MAGIC MISSILE code.
1203 * note that the fire_bullet is used to fire the missile. The 1199 * note that the fire_bullet is used to fire the missile. The
1204 * code here is just to move the missile. 1200 * code here is just to move the missile.
… …
1206 1202
1207/* op is a missile that needs to be moved */ 1203/* op is a missile that needs to be moved */
1208void 1204void
1209move_missile (object *op) 1205move_missile (object *op)
1210{ 1206{
1211 int i, mflags;
1212 object *owner;
1213 sint16 new_x, new_y;
1214 maptile *m;
1215
1216 if (op->range-- <= 0) 1207 if (op->range-- <= 0)
1217 { 1208 {
1209 op->drop_and_destroy ();
1210 return;
1211 }
1212
1213 mapxy pos (op);
1214 pos.move (op->direction);
1215
1216 if (!pos.normalise ())
1217 {
1218 op->destroy (); 1218 op->destroy ();
1219 return; 1219 return;
1220 } 1220 }
1221 1221
1222 owner = op->owner; 1222 mapspace &ms = pos.ms ();
1223#if 0
1224 /* It'd make things nastier if this wasn't here - spells cast by
1225 * monster that are then killed would continue to survive
1226 */
1227 if (owner == NULL)
1228 {
1229 op->destroy ();
1230 return;
1231 }
1232#endif
1233 1223
1234 new_x = op->x + DIRX (op); 1224 if (ms.flags () & P_IS_ALIVE || ms.blocks (op))
1235 new_y = op->y + DIRY (op);
1236
1237 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1238
1239 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1240 { 1225 {
1241 hit_map (op, op->direction, AT_MAGIC, 1); 1226 hit_map (op, op->direction, AT_MAGIC, 1);
1242 /* Basically, missile only hits one thing then goes away. 1227 /* Basically, missile only hits one thing then goes away.
1243 * we need to remove it if someone hasn't already done so. 1228 * we need to remove it if someone hasn't already done so.
1244 */ 1229 */
1245 if (!op->destroyed ())
1246 op->destroy ();
1247
1248 return;
1249 }
1250
1251 op->remove ();
1252
1253 if (!op->direction || (mflags & P_OUT_OF_MAP))
1254 {
1255 op->destroy (); 1230 op->destroy ();
1256 return; 1231 return;
1257 } 1232 }
1258 1233
1234 if (!op->direction)
1235 {
1236 op->destroy ();
1237 return;
1238 }
1239
1259 i = spell_find_dir (m, new_x, new_y, op->owner); 1240 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1260 if (i > 0 && i != op->direction) 1241 if (i > 0 && i != op->direction)
1261 { 1242 {
1262 op->direction = i; 1243 op->direction = i;
1263 SET_ANIMATION (op, op->direction); 1244 SET_ANIMATION (op, op->direction);
1264 } 1245 }
1265 1246
1266 m->insert (op, new_x, new_y, op); 1247 pos.insert (op, op);
1267} 1248}
1268 1249
1269/**************************************************************************** 1250/****************************************************************************
1270 * Destruction 1251 * Destruction
1271 ****************************************************************************/ 1252 ****************************************************************************/
… …
1274 * we do this by creating a force and inserting it in the 1255 * we do this by creating a force and inserting it in the
1275 * object. if time is 0, the object glows permanently. To truely 1256 * object. if time is 0, the object glows permanently. To truely
1276 * make this work for non-living objects, we would have to 1257 * make this work for non-living objects, we would have to
1277 * give them the capability to have an inventory. b.t. 1258 * give them the capability to have an inventory. b.t.
1278 */ 1259 */
1279 1260static int
1280int
1281make_object_glow (object *op, int radius, int time) 1261make_object_glow (object *op, int radius, int time)
1282{ 1262{
1283 object *tmp;
1284
1285 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1286 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1287 return 0; 1265 return 0;
1288 1266
1289 tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1290 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1291 tmp->stats.food = time; 1269 tmp->stats.food = time;
1292 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1293 tmp->glow_radius = radius; 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1294 if (tmp->glow_radius > MAX_LIGHT_RADII)
1295 tmp->glow_radius = MAX_LIGHT_RADII;
1296
1297 tmp->x = op->x;
1298 tmp->y = op->y;
1299 if (tmp->speed < MIN_ACTIVE_SPEED)
1300 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1301 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1273
1302 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1303 op->glow_radius = tmp->glow_radius; 1275 op->set_glow_radius (tmp->glow_radius);
1304 1276
1305 if (!tmp->env || op != tmp->env)
1306 {
1307 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1308 return 0;
1309 }
1310 return 1; 1277 return 1;
1311} 1278}
1312
1313
1314
1315 1279
1316int 1280int
1317cast_destruction (object *op, object *caster, object *spell_ob) 1281cast_destruction (object *op, object *caster, object *spell_ob)
1318{ 1282{
1319 int i, j, range, mflags, friendly = 0, dam, dur;
1320 sint16 sx, sy;
1321 maptile *m;
1322 object *tmp;
1323 const char *skill;
1324
1325 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1283 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1326 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1284 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1327 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1285 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1328 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER)
1329 friendly = 1;
1330 1286
1331 /* destruction doesn't use another spell object, so we need 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1332 * update op's skill pointer so that exp is properly awarded.
1333 * We do some shortcuts here - since this is just temporary
1334 * and we'll reset the values back, we don't need to go through
1335 * the full share string/free_string route.
1336 */
1337 skill = op->skill;
1338 if (caster == op)
1339 op->skill = spell_ob->skill;
1340 else if (caster->skill)
1341 op->skill = caster->skill;
1342 else
1343 op->skill = NULL;
1344 1288
1345 change_skill (op, find_skill_by_name (op, op->skill), 1); 1289 dynbuf buf;
1346 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1347 for (i = -range; i < range; i++)
1348 { 1291 {
1349 for (j = -range; j < range; j++) 1292 mapspace &ms = m->at (nx, ny);
1350 {
1351 m = op->map;
1352 sx = op->x + i;
1353 sy = op->y + j;
1354 1293
1355 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1356 if (mflags & P_OUT_OF_MAP)
1357 continue;
1358
1359 if (mflags & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1295 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1360 { 1296 {
1361 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1297 next = tmp->above;
1362 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1363 break;
1364 1298
1365 if (tmp) 1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1366 { 1300 {
1367 if (tmp->head)
1368 tmp = tmp->head; 1301 tmp = tmp->head_ ();
1369 1302
1370 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) || 1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1371 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER))) 1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1372 { 1305 {
1373 if (spell_ob->subtype == SP_DESTRUCTION) 1306 if (spell_ob->subtype == SP_DESTRUCTION)
1374 { 1307 {
1375 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1309
1376 if (spell_ob->other_arch) 1310 if (spell_ob->other_arch)
1377 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1311 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1378 } 1312 }
1379 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1313 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1380 { 1314 {
1381 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1382 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1316 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1383 } 1317 }
1384 } 1318 }
1385 } 1319 }
1386 } 1320 }
1387 }
1388 } 1321 }
1389 1322
1390 op->skill = skill;
1391 return 1; 1323 return 1;
1392} 1324}
1393 1325
1394/*************************************************************************** 1326/***************************************************************************
1395 * 1327 *
1396 * CURSE 1328 * CURSE
1397 * 1329 *
1398 ***************************************************************************/ 1330 ***************************************************************************/
1399
1400int 1331int
1401cast_curse (object *op, object *caster, object *spell_ob, int dir) 1332cast_curse (object *op, object *caster, object *spell_ob, int dir)
1402{ 1333{
1403 object *god = find_god (determine_god (op)); 1334 object *god = find_god (determine_god (op));
1404 object *tmp, *force; 1335 object *tmp, *force;
1405 1336
1406 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1337 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1407 if (!tmp) 1338 if (!tmp)
1408 { 1339 {
1409 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1340 op->failmsg ("There is no one in that direction to curse.");
1410 return 0; 1341 return 0;
1411 } 1342 }
1412 1343
1344 tmp = tmp->head_ ();
1345
1413 /* If we've already got a force of this type, don't add a new one. */ 1346 /* If we've already got a force of this type, don't add a new one. */
1414 for (force = tmp->inv; force != NULL; force = force->below) 1347 for (force = tmp->inv; force; force = force->below)
1415 { 1348 {
1416 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1349 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1417 { 1350 {
1418 if (force->name == spell_ob->name) 1351 if (force->name == spell_ob->name)
1419 { 1352 {
… …
1425 return 0; 1358 return 0;
1426 } 1359 }
1427 } 1360 }
1428 } 1361 }
1429 1362
1430 if (force == NULL) 1363 if (!force)
1431 { 1364 {
1432 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1433 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1367
1434 if (spell_ob->race) 1368 if (spell_ob->race)
1435 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1436 else 1370 else
1437 force->name = spell_ob->name; 1371 force->name = spell_ob->name;
1438 1372
… …
1448 { 1382 {
1449 force->duration = duration; 1383 force->duration = duration;
1450 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1384 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1451 } 1385 }
1452 else 1386 else
1453 {
1454 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1387 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1455 } 1388
1456 return 1; 1389 return 1;
1457 } 1390 }
1391
1458 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1392 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1459 force->speed = 1.0;
1460 force->speed_left = -1.0; 1393 force->speed_left = -1.f;
1461 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1462 1396
1463 if (god) 1397 if (god)
1464 { 1398 {
1465 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1466 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1479 force->stats.wc = spell_ob->stats.wc; 1413 force->stats.wc = spell_ob->stats.wc;
1480 1414
1481 change_abil (tmp, force); /* Mostly to display any messages */ 1415 change_abil (tmp, force); /* Mostly to display any messages */
1482 insert_ob_in_ob (force, tmp); 1416 insert_ob_in_ob (force, tmp);
1483 tmp->update_stats (); 1417 tmp->update_stats ();
1418
1484 return 1; 1419 return 1;
1485
1486} 1420}
1487
1488 1421
1489/********************************************************************** 1422/**********************************************************************
1490 * mood change 1423 * mood change
1491 * Arguably, this may or may not be an attack spell. But since it 1424 * Arguably, this may or may not be an attack spell. But since it
1492 * effects monsters, it seems best to put it into this file 1425 * effects monsters, it seems best to put it into this file
… …
1497 */ 1430 */
1498int 1431int
1499mood_change (object *op, object *caster, object *spell) 1432mood_change (object *op, object *caster, object *spell)
1500{ 1433{
1501 object *tmp, *god, *head; 1434 object *tmp, *god, *head;
1502 int done_one, range, mflags, level, at, best_at; 1435 int done_one, range, level, at, best_at;
1503 sint16 x, y, nx, ny;
1504 maptile *m;
1505 const char *race; 1436 const char *race;
1506 1437
1507 /* We precompute some values here so that we don't have to keep 1438 /* We precompute some values here so that we don't have to keep
1508 * doing it over and over again. 1439 * doing it over and over again.
1509 */ 1440 */
1510 god = find_god (determine_god (op)); 1441 god = find_god (determine_god (op));
1511 level = caster_level (caster, spell); 1442 level = casting_level (caster, spell);
1512 range = spell->range + SP_level_range_adjust (caster, spell); 1443 range = spell->range + SP_level_range_adjust (caster, spell);
1513 1444
1514 /* On the bright side, no monster should ever have a race of GOD_... 1445 /* On the bright side, no monster should ever have a race of GOD_...
1515 * so even if the player doesn't worship a god, if race=GOD_.., it 1446 * so even if the player doesn't worship a god, if race=GOD_.., it
1516 * won't ever match anything. 1447 * won't ever match anything.
1517 */ 1448 */
1518 if (!spell->race) 1449 if (!spell->race)
1519 race = NULL; 1450 race = NULL;
1520 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1451 else if (god && spell->race == shstr_GOD_SLAYING)
1521 race = god->slaying; 1452 race = god->slaying;
1522 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1523 race = god->race; 1454 race = god->race;
1524 else 1455 else
1525 race = spell->race; 1456 race = spell->race;
1526 1457
1527 1458 dynbuf buf;
1528 for (x = op->x - range; x <= op->x + range; x++) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1529 for (y = op->y - range; y <= op->y + range; y++)
1530 { 1460 {
1461 mapspace &ms = m->at (nx, ny);
1531 1462
1532 done_one = 0;
1533 m = op->map;
1534 nx = x;
1535 ny = y;
1536 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1537 if (mflags & P_OUT_OF_MAP)
1538 continue;
1539
1540 /* If there is nothing living on this space, no need to go further */ 1463 /* If there is nothing living on this space, no need to go further */
1541 if (!(mflags & P_IS_ALIVE)) 1464 if (!(ms.flags () & P_IS_ALIVE))
1542 continue; 1465 continue;
1543 1466
1544 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above) 1467 // players can only affect spaces that they can actually see
1545 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1468 if (caster
1469 && caster->contr
1470 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1471 continue;
1472
1473 for (tmp = ms.top; tmp; tmp = tmp->below)
1474 if (tmp->flag [FLAG_MONSTER])
1546 break; 1475 break;
1547 1476
1548 /* There can be living objects that are not monsters */ 1477 /* There can be living objects that are not monsters */
1549 if (!tmp || tmp->type == PLAYER) 1478 if (!tmp)
1550 continue; 1479 continue;
1551 1480
1552 /* Only the head has meaningful data, so resolve to that */ 1481 /* Only the head has meaningful data, so resolve to that */
1553 if (tmp->head)
1554 head = tmp->head; 1482 head = tmp->head_ ();
1555 else
1556 head = tmp;
1557 1483
1558 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1484 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1559 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1560 continue; 1486 continue;
1561 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1487
1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1562 continue; 1489 continue;
1563 1490
1564 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1565 best_at = -1; 1492 best_at = -1;
1566 if (spell->attacktype) 1493 if (spell->attacktype)
1567 { 1494 {
1568 for (at = 0; at < NROFATTACKS; at++) 1495 for (at = 0; at < NROFATTACKS; at++)
1569 if (spell->attacktype & (1 << at)) 1496 if (spell->attacktype & (1 << at))
1570 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1497 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1571 best_at = at; 1498 best_at = at;
1572 1499
1573 if (best_at == -1) 1500 if (best_at == -1)
1574 at = 0; 1501 at = 0;
1575 else 1502 else
1576 { 1503 {
1577 if (head->resist[best_at] == 100) 1504 if (head->resist[best_at] == 100)
1578 continue; 1505 continue;
1579 else 1506 else
1580 at = head->resist[best_at] / 5; 1507 at = head->resist[best_at] / 5;
1581 } 1508 }
1509
1582 at -= level / 5; 1510 at -= level / 5;
1583 if (did_make_save (head, head->level, at)) 1511 if (did_make_save (head, head->level, at))
1584 continue; 1512 continue;
1585 } 1513 }
1586 else /* spell->attacktype */ 1514 else /* spell->attacktype */
1515 {
1587 /* 1516 /*
1588 Spell has no attacktype (charm & such), so we'll have a specific saving: 1517 Spell has no attacktype (charm & such), so we'll have a specific saving:
1589 * if spell level < monster level, no go 1518 * if spell level < monster level, no go
1590 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1519 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1591 1520
… …
1593 1522
1594 This is required to fix the 'charm monster' abuse, where a player level 1 can 1523 This is required to fix the 'charm monster' abuse, where a player level 1 can
1595 charm a level 125 monster... 1524 charm a level 125 monster...
1596 1525
1597 Ryo, august 14th 1526 Ryo, august 14th
1598 */ 1527 */
1599 {
1600 if (head->level > level) 1528 if (head->level > level)
1601 continue; 1529 continue;
1530
1602 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1531 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1603 /* Failed, no effect */ 1532 /* Failed, no effect */
1604 continue; 1533 continue;
1605 } 1534 }
1606 1535
1607 /* Done with saving throw. Now start effecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1537 done_one = 0;
1608 1538
1609 /* aggravation */ 1539 /* aggravation */
1610 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1611 { 1541 {
1612 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1613 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1614 remove_friendly_object (head); 1543 remove_friendly_object (head);
1615
1616 done_one = 1; 1544 done_one = 1;
1617 head->enemy = op; 1545 head->enemy = op;
1618 } 1546 }
1619 1547
1620 /* calm monsters */ 1548 /* calm monsters */
1621 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1622 { 1550 {
1623 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1624 head->enemy = NULL; 1552 head->enemy = NULL;
1625 done_one = 1; 1553 done_one = 1;
1626 } 1554 }
1627 1555
1628 /* berserk monsters */ 1556 /* berserk monsters */
1629 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1630 { 1558 {
1631 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1632 done_one = 1; 1560 done_one = 1;
1633 } 1561 }
1634 1562
1635 /* charm */ 1563 /* charm */
1636 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1637 { 1565 {
1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1567
1638 /* Prevent uncontolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1639 Typical use case is charm, go somwhere, use aggravation to make hostile. 1569 Typical use case is charm, go somwhere, use aggravation to make hostile.
1640 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1570 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1641 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1642 head->set_owner (op); 1572 head->set_owner (op);
1643 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1644 add_friendly_object (head); 1574 add_friendly_object (head);
1645 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1646 done_one = 1; 1576 done_one = 1;
1647 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1577 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1648 head->stats.exp = 0; 1578 head->stats.exp = 0;
1649 } 1579 }
1650 1580
1651 /* If a monster was effected, put an effect in */ 1581 /* If a monster was effected, put an effect in */
1652 if (done_one && spell->other_arch) 1582 if (done_one && spell->other_arch)
1653 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1583 m->insert (spell->other_arch->instance (), nx, ny, op);
1654 } /* for y */ 1584 }
1655 1585
1656 return 1; 1586 return 1;
1657} 1587}
1658
1659 1588
1660/* Move_ball_spell: This handles ball type spells that just sort of wander 1589/* Move_ball_spell: This handles ball type spells that just sort of wander
1661 * about. was called move_ball_lightning, but since more than the ball 1590 * about. was called move_ball_lightning, but since more than the ball
1662 * lightning spell used it, that seemed misnamed. 1591 * lightning spell used it, that seemed misnamed.
1663 * op is the spell effect. 1592 * op is the spell effect.
1664 * note that duration is handled by process_object() in time.c 1593 * note that duration is handled by process_object() in time.c
1665 */ 1594 */
1666
1667void 1595void
1668move_ball_spell (object *op) 1596move_ball_spell (object *op)
1669{ 1597{
1670 int i, j, dam_save, dir, mflags; 1598 int i, j, dam_save, dir, mflags;
1671 sint16 nx, ny, hx, hy; 1599 sint16 nx, ny, hx, hy;
… …
1690 for (i = 1; i < 9; i++) 1618 for (i = 1; i < 9; i++)
1691 { 1619 {
1692 /* i bit 0: alters sign of offset 1620 /* i bit 0: alters sign of offset
1693 * other bits (i / 2): absolute value of offset 1621 * other bits (i / 2): absolute value of offset
1694 */ 1622 */
1695
1696 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1623 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1697 int tmpdir = absdir (op->direction + offset); 1624 int tmpdir = absdir (op->direction + offset);
1698 1625
1699 nx = op->x + freearr_x[tmpdir]; 1626 nx = op->x + freearr_x[tmpdir];
1700 ny = op->y + freearr_y[tmpdir]; 1627 ny = op->y + freearr_y[tmpdir];
… …
1702 { 1629 {
1703 dir = tmpdir; 1630 dir = tmpdir;
1704 break; 1631 break;
1705 } 1632 }
1706 } 1633 }
1634
1707 if (dir == 0) 1635 if (dir == 0)
1708 { 1636 {
1709 nx = op->x; 1637 nx = op->x;
1710 ny = op->y; 1638 ny = op->y;
1711 m = op->map; 1639 m = op->map;
… …
1720 * if this has an other_arch field, we insert that in 1648 * if this has an other_arch field, we insert that in
1721 * the surround spaces. 1649 * the surround spaces.
1722 */ 1650 */
1723 for (j = 0; j < 9; j++) 1651 for (j = 0; j < 9; j++)
1724 { 1652 {
1725 object *new_ob;
1726
1727 hx = nx + freearr_x[j]; 1653 hx = nx + freearr_x[j];
1728 hy = ny + freearr_y[j]; 1654 hy = ny + freearr_y[j];
1729 1655
1730 m = op->map; 1656 m = op->map;
1731 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1657 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1739 1665
1740 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op))) 1666 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1741 { 1667 {
1742 if (j) 1668 if (j)
1743 op->stats.dam = dam_save / 2; 1669 op->stats.dam = dam_save / 2;
1670
1744 hit_map (op, j, op->attacktype, 1); 1671 hit_map (op, j, op->attacktype, 1);
1745
1746 } 1672 }
1747 1673
1748 /* insert the other arch */ 1674 /* insert the other arch */
1749 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1750 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1676 m->insert (op->other_arch->instance (), hx, hy, op);
1751 } 1677 }
1752 1678
1753 /* restore to the center location and damage */ 1679 /* restore to the center location and damage */
1754 op->stats.dam = dam_save; 1680 op->stats.dam = dam_save;
1755 1681
… …
1764 1690
1765 op->direction = i; 1691 op->direction = i;
1766 } 1692 }
1767} 1693}
1768 1694
1769
1770/* move_swarm_spell: peterm 1695/* move_swarm_spell: peterm
1771 * This is an implementation of the swarm spell. It was written for 1696 * This is an implementation of the swarm spell. It was written for
1772 * meteor swarm, but it could be used for any swarm. A swarm spell 1697 * meteor swarm, but it could be used for any swarm. A swarm spell
1773 * is a special type of object that casts swarms of other types 1698 * is a special type of object that casts swarms of other types
1774 * of spells. Which spell it casts is flexible. It fires the spells 1699 * of spells. Which spell it casts is flexible. It fires the spells
1775 * from a set of squares surrounding the caster, in a given direction. 1700 * from a set of squares surrounding the caster, in a given direction.
1776 */ 1701 */
1777
1778void 1702void
1779move_swarm_spell (object *op) 1703move_swarm_spell (object *op)
1780{ 1704{
1781#if 0 1705#if 0
1782 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1706 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1783 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1707 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1784 sint16 target_x, target_y, origin_x, origin_y; 1708 sint16 target_x, target_y, origin_x, origin_y;
1785 int adjustdir; 1709 int adjustdir;
1786 maptile *m; 1710 maptile *m;
1787#endif 1711#endif
1788 int basedir;
1789 object *owner; 1712 object *owner = op->env;
1790 1713
1791 owner = op->owner; 1714 if (!owner) // MUST not happen, remove when true TODO
1792 if (op->duration == 0 || owner == NULL)
1793 { 1715 {
1716 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1794 op->destroy (); 1717 op->destroy ();
1795 return; 1718 return;
1796 } 1719 }
1797 1720
1721 if (!op->duration || !owner->is_on_map ())
1722 {
1723 op->drop_and_destroy ();
1724 return;
1725 }
1726
1798 op->duration--; 1727 op->duration--;
1799 1728
1800 basedir = op->direction; 1729 int basedir = op->direction;
1801 if (basedir == 0) 1730 if (!basedir)
1802 { 1731 {
1803 /* spray in all directions! 8) */ 1732 /* spray in all directions! 8) */
1804 basedir = rndm (1, 8); 1733 op->facing = (op->facing + op->state) & 7;
1734 basedir = op->facing + 1;
1805 } 1735 }
1806 1736
1807#if 0 1737#if 0
1808 // this is bogus: it causes wrong places to be checked below 1738 // this is bogus: it causes wrong places to be checked below
1809 // (a wall 2 cells away will block the effect...) and 1739 // (a wall 2 cells away will block the effect...) and
1810 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1740 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1811 // space. 1741 // space.
1812 // should be fixed later, but correctness before featurs... 1742 // should be fixed later, but correctness before features...
1813 // (schmorp) 1743 // (schmorp)
1814 1744
1815 /* new offset calculation to make swarm element distribution 1745 /* new offset calculation to make swarm element distribution
1816 * more uniform 1746 * more uniform
1817 */ 1747 */
… …
1870 { 1800 {
1871 /* Bullet spells have a bunch more customization that needs to be done */ 1801 /* Bullet spells have a bunch more customization that needs to be done */
1872 if (op->spell->subtype == SP_BULLET) 1802 if (op->spell->subtype == SP_BULLET)
1873 fire_bullet (owner, op, basedir, op->spell); 1803 fire_bullet (owner, op, basedir, op->spell);
1874 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1804 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1875 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1805 fire_arch_from_position (owner, op, owner->x, owner->y, basedir, op->spell);
1876 } 1806 }
1877} 1807}
1878
1879
1880
1881 1808
1882/* fire_swarm: 1809/* fire_swarm:
1883 * The following routine creates a swarm of objects. It actually 1810 * The following routine creates a swarm of objects. It actually
1884 * sets up a specific swarm object, which then fires off all 1811 * sets up a specific swarm object, which then fires off all
1885 * the parts of the swarm. 1812 * the parts of the swarm.
… …
1888 * caster: the caster (owner, wand, rod, scroll) 1815 * caster: the caster (owner, wand, rod, scroll)
1889 * dir: the direction everything will be fired in 1816 * dir: the direction everything will be fired in
1890 * spell - the spell that is this spell. 1817 * spell - the spell that is this spell.
1891 * n: the number to be fired. 1818 * n: the number to be fired.
1892 */ 1819 */
1893
1894int 1820int
1895fire_swarm (object *op, object *caster, object *spell, int dir) 1821fire_swarm (object *op, object *caster, object *spell, int dir)
1896{ 1822{
1897 object *tmp;
1898 int i;
1899
1900 if (!spell->other_arch) 1823 if (!spell->other_arch)
1901 return 0; 1824 return 0;
1902 1825
1903 tmp = get_archetype (SWARM_SPELL); 1826 object *tmp = archetype::get (SWARM_SPELL);
1904 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */ 1827
1905 set_spell_skill (op, caster, spell, tmp); 1828 set_spell_skill (op, caster, spell, tmp);
1906
1907 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1829 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1908 tmp->spell = arch_to_object (spell->other_arch); 1830 tmp->spell = spell->other_arch->instance ();
1909
1910 tmp->attacktype = tmp->spell->attacktype; 1831 tmp->attacktype = tmp->spell->attacktype;
1911 1832
1912 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1833 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1913 if (!tailor_god_spell (tmp, op)) 1834 if (!tailor_god_spell (tmp, op))
1914 return 1; 1835 return 1;
1915 1836
1916 tmp->duration = SP_level_duration_adjust (caster, spell); 1837 tmp->duration = SP_level_duration_adjust (caster, spell);
1917 for (i = 0; i < spell->duration; i++) 1838 for (int i = 0; i < spell->duration; i++)
1918 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1839 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1919 1840
1841 tmp->invisible = 1;
1842 tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
1920 tmp->direction = dir; 1843 tmp->direction = dir;
1921 tmp->invisible = 1; 1844 tmp->facing = rndm (1, 8); // initial firing direction
1845 tmp->state = rndm (4) * 2 + 1; // direction increment
1922 1846
1923 tmp->insert_at (op, op); 1847 op->insert (tmp);
1848
1924 return 1; 1849 return 1;
1925} 1850}
1926
1927 1851
1928/* See the spells documentation file for why this is its own 1852/* See the spells documentation file for why this is its own
1929 * function. 1853 * function.
1930 */ 1854 */
1931int 1855int
… …
1936 int dam, mflags; 1860 int dam, mflags;
1937 maptile *m; 1861 maptile *m;
1938 1862
1939 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1863 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1940 1864
1941 if (!dir) 1865 if (dir)
1942 {
1943 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1944 return 0;
1945 } 1866 {
1946
1947 x = op->x + freearr_x[dir]; 1867 x = op->x + freearr_x[dir];
1948 y = op->y + freearr_y[dir]; 1868 y = op->y + freearr_y[dir];
1949 m = op->map; 1869 m = op->map;
1950 1870
1951 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1952 1872
1953 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1954 { 1874 {
1955 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1956 return 0; 1876 return 0;
1957 } 1877 }
1958 1878
1959 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1960 { 1880 {
1961 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1881 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1962 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1963 { 1883 {
1964 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1965 if (target->head) 1885 if (target->head)
1966 target = target->head; 1886 target = target->head;
1887
1967 (void) hit_player (target, dam, op, spell->attacktype, 1); 1888 hit_player (target, dam, op, spell->attacktype, 1);
1968 return 1; /* one success only! */ 1889 return 1; /* one success only! */
1890 }
1969 } 1891 }
1970 }
1971 1892
1972 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1973 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1894 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1974 { 1895 {
1975 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1976 return 0; 1897 return 0;
1898 }
1977 } 1899 }
1978 1900
1979 /* ok, looks groovy to just insert a new light on the map */ 1901 /* ok, looks groovy to just insert a new light on the map */
1980 tmp = arch_to_object (spell->other_arch); 1902 tmp = spell->other_arch->instance ();
1981 if (!tmp) 1903 if (!tmp)
1982 { 1904 {
1983 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1984 return 0; 1906 return 0;
1985 } 1907 }
1908
1986 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1909 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1910
1987 if (tmp->glow_radius) 1911 if (tmp->glow_radius)
1988 { 1912 tmp->set_glow_radius (
1989 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1913 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
1990 if (tmp->glow_radius > MAX_LIGHT_RADII) 1914 );
1991 tmp->glow_radius = MAX_LIGHT_RADII;
1992 }
1993 1915
1916 if (dir)
1994 m->insert (tmp, x, y, op); 1917 m->insert (tmp, x, y, op);
1918 else
1919 caster->outer_env_or_self ()->insert (tmp);
1920
1995 return 1; 1921 return 1;
1996} 1922}
1997
1998
1999
2000 1923
2001/* cast_cause_disease: this spell looks along <dir> from the 1924/* cast_cause_disease: this spell looks along <dir> from the
2002 * player and infects someone. 1925 * player and infects someone.
2003 * op is the player/monster, caster is the object, dir is the direction 1926 * op is the player/monster, caster is the object, dir is the direction
2004 * to cast, disease_arch is the specific disease, and type is the spell number 1927 * to cast, disease_arch is the specific disease, and type is the spell number
2005 * perhaps this should actually be in disease.c? 1928 * perhaps this should actually be in disease.c?
2006 */ 1929 */
2007
2008int 1930int
2009cast_cause_disease (object *op, object *caster, object *spell, int dir) 1931cast_cause_disease (object *op, object *caster, object *spell, int dir)
2010{ 1932{
2011 sint16 x, y; 1933 sint16 x, y;
2012 int i, mflags, range, dam_mod, dur_mod; 1934 int i, mflags, range, dam_mod, dur_mod;
… …
2019 /* If casting from a scroll, no direction will be available, so refer to the 1941 /* If casting from a scroll, no direction will be available, so refer to the
2020 * direction the player is pointing. 1942 * direction the player is pointing.
2021 */ 1943 */
2022 if (!dir) 1944 if (!dir)
2023 dir = op->facing; 1945 dir = op->facing;
1946
2024 if (!dir) 1947 if (!dir)
2025 return 0; /* won't find anything if casting on ourself, so just return */ 1948 return 0; /* won't find anything if casting on ourself, so just return */
2026 1949
2027 /* Calculate these once here */ 1950 /* Calculate these once here */
2028 range = spell->range + SP_level_range_adjust (caster, spell); 1951 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2048 /* Only bother looking on this space if there is something living here */ 1971 /* Only bother looking on this space if there is something living here */
2049 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
2050 { 1973 {
2051 /* search this square for a victim */ 1974 /* search this square for a victim */
2052 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1975 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2053 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
2054 { /* found a victim */ 1977 { /* found a victim */
2055 object *disease = arch_to_object (spell->other_arch); 1978 object *disease = spell->other_arch->instance ();
2056 1979
2057 disease->set_owner (op); 1980 disease->set_owner (op);
2058 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
2059 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
2060 disease->level = caster_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
2061 1984
2062 /* do level adjustments */ 1985 /* do level adjustments */
2063 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
2064 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
2065 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
2066 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
2067 disease->magic += dur_mod / 4;
2068
2069 if (disease->stats.maxhp > 0)
2070 disease->stats.maxhp += dur_mod;
2071
2072 if (disease->stats.maxgrace > 0)
2073 disease->stats.maxgrace += dur_mod;
2074
2075 if (disease->stats.dam)
2076 {
2077 if (disease->stats.dam > 0)
2078 disease->stats.dam += dam_mod;
2079 else
2080 disease->stats.dam -= dam_mod;
2081 }
2082 1990
2083 if (disease->last_sp) 1991 if (disease->last_sp)
2084 { 1992 {
2085 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2086 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2087 disease->last_sp = 1; 1996 disease->last_sp = 1;
2088 } 1997 }
2089 1998
2090 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2091 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2092 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2093 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2094 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2095 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2096 }
2097
2098 if (disease->stats.ac)
2099 disease->stats.ac += dam_mod;
2100
2101 if (disease->last_eat)
2102 disease->last_eat -= dam_mod;
2103
2104 if (disease->stats.hp)
2105 disease->stats.hp -= dam_mod;
2106
2107 if (disease->stats.sp)
2108 disease->stats.sp -= dam_mod;
2109 2005
2110 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2111 { 2007 {
2112 object *flash; /* visual effect for inflicting disease */
2113
2114 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2008 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2115 2009
2116 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2117 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2118 return 1; 2012 return 1;
2119 } 2013 }
2120 2014
2121 disease->destroy (); 2015 disease->destroy ();
2122 } 2016 }

Diff Legend

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