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.9 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.22 by root, Fri Dec 22 16:34:00 2006 UTC

1
2/*
3 * static char *rcsid_spell_attack_c =
4 * "$Id: spell_attack.C,v 1.9 2006/09/10 15:59:57 root Exp $";
5 */
6
7
8/* 1/*
9 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
10 3
11 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
23 16
24 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
25 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27 20
28 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
29*/ 22*/
30 23
31/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
32 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
33 * of code 26 * of code
… …
64 { 57 {
65 weight_move = op->weight + (op->weight * op->level) / 3; 58 weight_move = op->weight + (op->weight * op->level) / 3;
66 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
67 } 60 }
68 61
69 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 62 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
70 { 63 {
71 int num_sections = 1; 64 int num_sections = 1;
72 65
73 /* don't move DM */ 66 /* don't move DM */
74 if (QUERY_FLAG (tmp, FLAG_WIZ)) 67 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
124void 117void
125forklightning (object *op, object *tmp) 118forklightning (object *op, object *tmp)
126{ 119{
127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 120 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
128 int t_dir; /* stores temporary dir calculation */ 121 int t_dir; /* stores temporary dir calculation */
129 mapstruct *m; 122 maptile *m;
130 sint16 sx, sy; 123 sint16 sx, sy;
131 object *new_bolt; 124 object *new_bolt;
132 125
133 /* pick a fork direction. tmp->stats.Con is the left bias 126 /* pick a fork direction. tmp->stats.Con is the left bias
134 * i.e., the chance in 100 of forking LEFT 127 * i.e., the chance in 100 of forking LEFT
… …
147 140
148 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
149 return; 142 return;
150 143
151 /* OK, we made a fork */ 144 /* OK, we made a fork */
152 new_bolt = get_object (); 145 new_bolt = tmp->clone ();
153 copy_object (tmp, new_bolt);
154 146
155 /* reduce chances of subsequent forking */ 147 /* reduce chances of subsequent forking */
156 new_bolt->stats.Dex -= 10; 148 new_bolt->stats.Dex -= 10;
157 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 149 tmp->stats.Dex -= 10; /* less forks from main bolt too */
158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
… …
177move_bolt (object *op) 169move_bolt (object *op)
178{ 170{
179 object *tmp; 171 object *tmp;
180 int mflags; 172 int mflags;
181 sint16 x, y; 173 sint16 x, y;
182 mapstruct *m; 174 maptile *m;
183 175
184 if (--(op->duration) < 0) 176 if (--(op->duration) < 0)
185 { 177 {
186 remove_ob (op); 178 op->destroy ();
187 free_object (op);
188 return; 179 return;
189 } 180 }
181
190 hit_map (op, 0, op->attacktype, 1); 182 hit_map (op, 0, op->attacktype, 1);
191 183
192 if (!op->direction) 184 if (!op->direction)
193 return; 185 return;
194 186
… …
256 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
257 return; 249 return;
258 } 250 }
259 else 251 else
260 { /* Create a copy of this object and put it ahead */ 252 { /* Create a copy of this object and put it ahead */
261 tmp = get_object (); 253 tmp = op->clone ();
262 copy_object (op, tmp); 254
263 tmp->speed_left = -0.1; 255 tmp->speed_left = -0.1;
264 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp); 256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
265 tmp = insert_ob_in_map (tmp, op->map, op, 0); 257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
266 /* To make up for the decrease at the top of the function */ 258 /* To make up for the decrease at the top of the function */
267 tmp->duration++; 259 tmp->duration++;
… …
316 308
317 tmp->direction = dir; 309 tmp->direction = dir;
318 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 310 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
319 SET_ANIMATION (tmp, dir); 311 SET_ANIMATION (tmp, dir);
320 312
321 set_owner (tmp, op); 313 tmp->set_owner (op);
322 set_spell_skill (op, caster, spob, tmp); 314 set_spell_skill (op, caster, spob, tmp);
323 315
324 tmp->x = op->x + DIRX (tmp); 316 tmp->x = op->x + DIRX (tmp);
325 tmp->y = op->y + DIRY (tmp); 317 tmp->y = op->y + DIRY (tmp);
326 tmp->map = op->map; 318 tmp->map = op->map;
327 319
328 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 320 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
329 if (mflags & P_OUT_OF_MAP) 321 if (mflags & P_OUT_OF_MAP)
330 { 322 {
331 free_object (tmp); 323 tmp->destroy ();
332 return 0; 324 return 0;
333 } 325 }
326
334 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 327 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
335 { 328 {
336 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 329 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
337 { 330 {
338 free_object (tmp); 331 tmp->destroy ();
339 return 0; 332 return 0;
340 } 333 }
334
341 tmp->x = op->x; 335 tmp->x = op->x;
342 tmp->y = op->y; 336 tmp->y = op->y;
343 tmp->direction = absdir (tmp->direction + 4); 337 tmp->direction = absdir (tmp->direction + 4);
344 tmp->map = op->map; 338 tmp->map = op->map;
345 } 339 }
340
346 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 341 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
347 move_bolt (tmp); 342 move_bolt (tmp);
343
348 return 1; 344 return 1;
349} 345}
350 346
351 347
352 348
… …
362 */ 358 */
363void 359void
364explosion (object *op) 360explosion (object *op)
365{ 361{
366 object *tmp; 362 object *tmp;
367 mapstruct *m = op->map; 363 maptile *m = op->map;
368 int i; 364 int i;
369 365
370 if (--(op->duration) < 0) 366 if (--(op->duration) < 0)
371 { 367 {
372 remove_ob (op); 368 op->destroy ();
373 free_object (op);
374 return; 369 return;
375 } 370 }
371
376 hit_map (op, 0, op->attacktype, 0); 372 hit_map (op, 0, op->attacktype, 0);
377 373
378 if (op->range > 0) 374 if (op->range > 0)
379 { 375 {
380 for (i = 1; i < 9; i++) 376 for (i = 1; i < 9; i++)
… …
386 /* ok_to_put_more already does things like checks for walls, 382 /* ok_to_put_more already does things like checks for walls,
387 * out of map, etc. 383 * out of map, etc.
388 */ 384 */
389 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 385 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
390 { 386 {
391 tmp = get_object (); 387 tmp = op->clone ();
392 copy_object (op, tmp);
393 tmp->state = 0; 388 tmp->state = 0;
394 tmp->speed_left = -0.21; 389 tmp->speed_left = -0.21;
395 tmp->range--; 390 tmp->range--;
396 tmp->value = 0; 391 tmp->value = 0;
397 tmp->x = dx; 392 tmp->x = dx;
… …
408 * explode. 403 * explode.
409 */ 404 */
410void 405void
411explode_bullet (object *op) 406explode_bullet (object *op)
412{ 407{
413 tag_t op_tag = op->count;
414 object *tmp, *owner; 408 object *tmp, *owner;
415 409
416 if (op->other_arch == NULL) 410 if (op->other_arch == NULL)
417 { 411 {
418 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 412 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
419 remove_ob (op); 413 op->destroy ();
420 free_object (op);
421 return; 414 return;
422 } 415 }
423 416
424 if (op->env) 417 if (op->env)
425 { 418 {
… …
427 420
428 env = object_get_env_recursive (op); 421 env = object_get_env_recursive (op);
429 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 422 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
430 { 423 {
431 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 424 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
432 remove_ob (op); 425 op->destroy ();
433 free_object (op);
434 return; 426 return;
435 } 427 }
428
436 remove_ob (op); 429 op->remove ();
437 op->x = env->x; 430 op->x = env->x;
438 op->y = env->y; 431 op->y = env->y;
439 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 432 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
440 } 433 }
441 else if (out_of_map (op->map, op->x, op->y)) 434 else if (out_of_map (op->map, op->x, op->y))
442 { 435 {
443 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 436 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
444 remove_ob (op); 437 op->destroy ();
445 free_object (op);
446 return; 438 return;
447 } 439 }
448 440
449 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 441 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
450 // NOTE: If this breaks something important: remove this. I can't think of anything 442 // NOTE: If this breaks something important: remove this. I can't think of anything
451 // bad at the moment that might happen from this. 443 // bad at the moment that might happen from this.
452 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 444 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
453 { 445 {
454 remove_ob (op); 446 op->destroy ();
455 free_object (op);
456 return; 447 return;
457 } 448 }
458 449
459 if (op->attacktype) 450 if (op->attacktype)
460 { 451 {
461 hit_map (op, 0, op->attacktype, 1); 452 hit_map (op, 0, op->attacktype, 1);
462 if (was_destroyed (op, op_tag)) 453 if (op->destroyed ())
463 return; 454 return;
464 } 455 }
465 456
466 /* other_arch contains what this explodes into */ 457 /* other_arch contains what this explodes into */
467 tmp = arch_to_object (op->other_arch); 458 tmp = arch_to_object (op->other_arch);
468 459
469 copy_owner (tmp, op); 460 tmp->set_owner (op);
470 tmp->skill = op->skill; 461 tmp->skill = op->skill;
471 462
472 owner = get_owner (op); 463 owner = op->owner;
464
473 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 465 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
474 { 466 {
475 remove_ob (op); 467 op->destroy ();
476 free_object (op);
477 return; 468 return;
478 } 469 }
470
479 tmp->x = op->x; 471 tmp->x = op->x;
480 tmp->y = op->y; 472 tmp->y = op->y;
481 473
482 /* special for bombs - it actually has sane values for these */ 474 /* special for bombs - it actually has sane values for these */
483 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 475 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
… …
508 /* Prevent recursion */ 500 /* Prevent recursion */
509 op->move_on = 0; 501 op->move_on = 0;
510 502
511 insert_ob_in_map (tmp, op->map, op, 0); 503 insert_ob_in_map (tmp, op->map, op, 0);
512 /* remove the firebullet */ 504 /* remove the firebullet */
513 if (!was_destroyed (op, op_tag)) 505 if (!op->destroyed ())
514 { 506 {
515 remove_ob (op); 507 op->destroy ();
516 free_object (op);
517 } 508 }
518} 509}
519 510
520 511
521 512
… …
524 */ 515 */
525 516
526void 517void
527check_bullet (object *op) 518check_bullet (object *op)
528{ 519{
529 tag_t op_tag = op->count, tmp_tag;
530 object *tmp; 520 object *tmp;
531 int dam, mflags; 521 int dam, mflags;
532 mapstruct *m; 522 maptile *m;
533 sint16 sx, sy; 523 sint16 sx, sy;
534 524
535 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 525 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
536 526
537 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 527 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
546 536
547 /* If nothing alive on this space, no reason to do anything further */ 537 /* If nothing alive on this space, no reason to do anything further */
548 if (!(mflags & P_IS_ALIVE)) 538 if (!(mflags & P_IS_ALIVE))
549 return; 539 return;
550 540
551 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 541 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
552 { 542 {
553 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 543 if (QUERY_FLAG (tmp, FLAG_ALIVE))
554 { 544 {
555 tmp_tag = tmp->count;
556 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 545 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
557 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0) 546 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
558 { 547 {
559 if (!QUERY_FLAG (op, FLAG_REMOVED)) 548 if (!QUERY_FLAG (op, FLAG_REMOVED))
560 { 549 {
561 remove_ob (op); 550 op->destroy ();
562 free_object (op);
563 return; 551 return;
564 } 552 }
565 } 553 }
566 } 554 }
567 } 555 }
… …
577void 565void
578move_bullet (object *op) 566move_bullet (object *op)
579{ 567{
580 sint16 new_x, new_y; 568 sint16 new_x, new_y;
581 int mflags; 569 int mflags;
582 mapstruct *m; 570 maptile *m;
583 571
584#if 0 572#if 0
585 /* We need a better general purpose way to do this */ 573 /* We need a better general purpose way to do this */
586 574
587 /* peterm: added to make comet leave a trail of burnouts 575 /* peterm: added to make comet leave a trail of burnouts
588 it's an unadulterated hack, but the effect is cool. */ 576 it's an unadulterated hack, but the effect is cool. */
589 if (op->stats.sp == SP_METEOR) 577 if (op->stats.sp == SP_METEOR)
590 { 578 {
591 replace_insert_ob_in_map ("fire_trail", op); 579 replace_insert_ob_in_map ("fire_trail", op);
592 if (was_destroyed (op, op_tag)) 580 if (op->destroyed ())
593 return; 581 return;
594 } /* end addition. */ 582 } /* end addition. */
595#endif 583#endif
596 584
597 /* Reached the end of its life - remove it */ 585 /* Reached the end of its life - remove it */
598 if (--op->range <= 0) 586 if (--op->range <= 0)
599 { 587 {
600 if (op->other_arch) 588 if (op->other_arch)
601 {
602 explode_bullet (op); 589 explode_bullet (op);
603 }
604 else 590 else
605 { 591 op->destroy ();
606 remove_ob (op); 592
607 free_object (op);
608 }
609 return; 593 return;
610 } 594 }
611 595
612 new_x = op->x + DIRX (op); 596 new_x = op->x + DIRX (op);
613 new_y = op->y + DIRY (op); 597 new_y = op->y + DIRY (op);
614 m = op->map; 598 m = op->map;
615 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 599 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
616 600
617 if (mflags & P_OUT_OF_MAP) 601 if (mflags & P_OUT_OF_MAP)
618 { 602 {
619 remove_ob (op); 603 op->destroy ();
620 free_object (op);
621 return; 604 return;
622 } 605 }
623 606
624 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 607 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
625 { 608 {
626 if (op->other_arch) 609 if (op->other_arch)
627 {
628 explode_bullet (op); 610 explode_bullet (op);
629 }
630 else 611 else
631 { 612 op->destroy ();
632 remove_ob (op); 613
633 free_object (op);
634 }
635 return; 614 return;
636 } 615 }
637 616
638 remove_ob (op); 617 op->remove ();
639 op->x = new_x; 618 op->x = new_x;
640 op->y = new_y; 619 op->y = new_y;
641 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL) 620 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
642 return; 621 return;
643 622
… …
692 671
693 tmp->direction = dir; 672 tmp->direction = dir;
694 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 673 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
695 SET_ANIMATION (tmp, dir); 674 SET_ANIMATION (tmp, dir);
696 675
697 set_owner (tmp, op); 676 tmp->set_owner (op);
698 set_spell_skill (op, caster, spob, tmp); 677 set_spell_skill (op, caster, spob, tmp);
699 678
700 tmp->x = op->x + freearr_x[dir]; 679 tmp->x = op->x + freearr_x[dir];
701 tmp->y = op->y + freearr_y[dir]; 680 tmp->y = op->y + freearr_y[dir];
702 tmp->map = op->map; 681 tmp->map = op->map;
703 682
704 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 683 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
705 if (mflags & P_OUT_OF_MAP) 684 if (mflags & P_OUT_OF_MAP)
706 { 685 {
707 free_object (tmp); 686 tmp->destroy ();
708 return 0; 687 return 0;
709 } 688 }
689
710 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 690 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
711 { 691 {
712 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 692 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
713 { 693 {
714 free_object (tmp); 694 tmp->destroy ();
715 return 0; 695 return 0;
716 } 696 }
697
717 tmp->x = op->x; 698 tmp->x = op->x;
718 tmp->y = op->y; 699 tmp->y = op->y;
719 tmp->direction = absdir (tmp->direction + 4); 700 tmp->direction = absdir (tmp->direction + 4);
720 tmp->map = op->map; 701 tmp->map = op->map;
721 } 702 }
703
722 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 704 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
723 {
724 check_bullet (tmp); 705 check_bullet (tmp);
725 } 706
726 return 1; 707 return 1;
727} 708}
728 709
729 710
730 711
… …
743 object *new_ob = arch_to_object (op->other_arch); 724 object *new_ob = arch_to_object (op->other_arch);
744 725
745 new_ob->x = op->x; 726 new_ob->x = op->x;
746 new_ob->y = op->y; 727 new_ob->y = op->y;
747 new_ob->level = op->level; 728 new_ob->level = op->level;
748 set_owner (new_ob, op->owner); 729 new_ob->set_owner (op->owner);
749 730
750 /* preserve skill ownership */ 731 /* preserve skill ownership */
751 if (op->skill && op->skill != new_ob->skill) 732 if (op->skill && op->skill != new_ob->skill)
752 { 733 {
753 new_ob->skill = op->skill; 734 new_ob->skill = op->skill;
… …
760 741
761void 742void
762move_cone (object *op) 743move_cone (object *op)
763{ 744{
764 int i; 745 int i;
765 tag_t tag;
766 746
767 /* if no map then hit_map will crash so just ignore object */ 747 /* if no map then hit_map will crash so just ignore object */
768 if (!op->map) 748 if (!op->map)
769 { 749 {
770 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 750 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
… …
783#if 0 763#if 0
784 /* Disable this - enabling it makes monsters easier, as 764 /* Disable this - enabling it makes monsters easier, as
785 * when their cone dies when they die. 765 * when their cone dies when they die.
786 */ 766 */
787 /* If no owner left, the spell dies out. */ 767 /* If no owner left, the spell dies out. */
788 if (get_owner (op) == NULL) 768 if (op->owner == NULL)
789 { 769 {
790 remove_ob (op); 770 op->destroy ();
791 free_object (op);
792 return; 771 return;
793 } 772 }
794#endif 773#endif
795 774
796 tag = op->count;
797 hit_map (op, 0, op->attacktype, 0); 775 hit_map (op, 0, op->attacktype, 0);
798 776
799 /* Check to see if we should push anything. 777 /* Check to see if we should push anything.
800 * Spell objects with weight push whatever they encounter to some 778 * Spell objects with weight push whatever they encounter to some
801 * degree. 779 * degree.
802 */ 780 */
803 if (op->weight) 781 if (op->weight)
804 check_spell_knockback (op); 782 check_spell_knockback (op);
805 783
806 if (was_destroyed (op, tag)) 784 if (op->destroyed ())
807 return; 785 return;
808 786
809 if ((op->duration--) < 0) 787 if ((op->duration--) < 0)
810 { 788 {
811 remove_ob (op); 789 op->destroy ();
812 free_object (op);
813 return; 790 return;
814 } 791 }
815 /* Object has hit maximum range, so don't have it move 792 /* Object has hit maximum range, so don't have it move
816 * any further. When the duration above expires, 793 * any further. When the duration above expires,
817 * then the object will get removed. 794 * then the object will get removed.
… …
826 { 803 {
827 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 804 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
828 805
829 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 806 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
830 { 807 {
831 object *tmp = get_object (); 808 object *tmp = op->clone ();
832 809
833 copy_object (op, tmp);
834 tmp->x = x; 810 tmp->x = x;
835 tmp->y = y; 811 tmp->y = y;
836 812
837 tmp->duration = op->duration + 1; 813 tmp->duration = op->duration + 1;
838 814
… …
856int 832int
857cast_cone (object *op, object *caster, int dir, object *spell) 833cast_cone (object *op, object *caster, int dir, object *spell)
858{ 834{
859 object *tmp; 835 object *tmp;
860 int i, success = 0, range_min = -1, range_max = 1; 836 int i, success = 0, range_min = -1, range_max = 1;
861 mapstruct *m; 837 maptile *m;
862 sint16 sx, sy; 838 sint16 sx, sy;
863 MoveType movetype; 839 MoveType movetype;
864 840
865 if (!spell->other_arch) 841 if (!spell->other_arch)
866 return 0; 842 return 0;
… …
922 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 898 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
923 continue; 899 continue;
924 900
925 success = 1; 901 success = 1;
926 tmp = arch_to_object (spell->other_arch); 902 tmp = arch_to_object (spell->other_arch);
927 set_owner (tmp, op); 903 tmp->set_owner (op);
928 set_spell_skill (op, caster, spell, tmp); 904 set_spell_skill (op, caster, spell, tmp);
929 tmp->level = caster_level (caster, spell); 905 tmp->level = caster_level (caster, spell);
930 tmp->x = sx; 906 tmp->x = sx;
931 tmp->y = sy; 907 tmp->y = sy;
932 tmp->attacktype = spell->attacktype; 908 tmp->attacktype = spell->attacktype;
933 909
934 /* holy word stuff */ 910 /* holy word stuff */
935 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 911 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
936 {
937 if (!tailor_god_spell (tmp, op)) 912 if (!tailor_god_spell (tmp, op))
938 return 0; 913 return 0;
939 }
940 914
941 if (dir) 915 if (dir)
942 tmp->stats.sp = dir; 916 tmp->stats.sp = dir;
943 else 917 else
944 tmp->stats.sp = i; 918 tmp->stats.sp = i;
… …
950 { 924 {
951 tmp->range /= 4; 925 tmp->range /= 4;
952 if (tmp->range < 2 && spell->range >= 2) 926 if (tmp->range < 2 && spell->range >= 2)
953 tmp->range = 2; 927 tmp->range = 2;
954 } 928 }
929
955 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 930 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
956 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 931 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
957 932
958 /* Special bonus for fear attacks */ 933 /* Special bonus for fear attacks */
959 if (tmp->attacktype & AT_FEAR) 934 if (tmp->attacktype & AT_FEAR)
… …
961 if (caster->type == PLAYER) 936 if (caster->type == PLAYER)
962 tmp->duration += fear_bonus[caster->stats.Cha]; 937 tmp->duration += fear_bonus[caster->stats.Cha];
963 else 938 else
964 tmp->duration += caster->level / 3; 939 tmp->duration += caster->level / 3;
965 } 940 }
941
966 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) 942 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD))
967 { 943 {
968 if (caster->type == PLAYER) 944 if (caster->type == PLAYER)
969 tmp->duration += turn_bonus[caster->stats.Wis] / 5; 945 tmp->duration += turn_bonus[caster->stats.Wis] / 5;
970 else 946 else
971 tmp->duration += caster->level / 3; 947 tmp->duration += caster->level / 3;
972 } 948 }
973 949
974
975 if (!(tmp->move_type & MOVE_FLY_LOW)) 950 if (!(tmp->move_type & MOVE_FLY_LOW))
976 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 951 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
977 952
978 if (!tmp->move_on && tmp->stats.dam) 953 if (!tmp->move_on && tmp->stats.dam)
979 { 954 {
980 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 955 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
981 } 956 }
957
982 insert_ob_in_map (tmp, m, op, 0); 958 insert_ob_in_map (tmp, m, op, 0);
983 959
984 /* This is used for tracking spells so that one effect doesn't hit 960 /* This is used for tracking spells so that one effect doesn't hit
985 * a single space too many times. 961 * a single space too many times.
986 */ 962 */
987 tmp->stats.maxhp = tmp->count; 963 tmp->stats.maxhp = tmp->count;
988 964
989 if (tmp->other_arch) 965 if (tmp->other_arch)
990 cone_drop (tmp); 966 cone_drop (tmp);
991 } 967 }
968
992 return success; 969 return success;
993} 970}
994 971
995/**************************************************************************** 972/****************************************************************************
996 * 973 *
… …
1010 archetype *at; 987 archetype *at;
1011 988
1012 if (op->state != NUM_ANIMATIONS (op) - 1) 989 if (op->state != NUM_ANIMATIONS (op) - 1)
1013 return; 990 return;
1014 991
1015
1016 env = object_get_env_recursive (op); 992 env = object_get_env_recursive (op);
1017 993
1018 if (op->env) 994 if (op->env)
1019 { 995 {
1020 if (env->map == NULL) 996 if (env->map == NULL)
1021 return; 997 return;
1022 998
1023 if (env->type == PLAYER) 999 if (env->type == PLAYER)
1024 esrv_del_item (env->contr, op->count); 1000 esrv_del_item (env->contr, op->count);
1025 1001
1026 remove_ob (op); 1002 op->remove ();
1027 op->x = env->x; 1003 op->x = env->x;
1028 op->y = env->y; 1004 op->y = env->y;
1029 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL) 1005 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1030 return; 1006 return;
1031 } 1007 }
… …
1033 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 1009 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1034 // on a safe map. I don't like this special casing, but it seems to be neccessary 1010 // on a safe map. I don't like this special casing, but it seems to be neccessary
1035 // as bombs can be carried. 1011 // as bombs can be carried.
1036 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 1012 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1037 { 1013 {
1038 remove_ob (op); 1014 op->destroy ();
1039 free_object (op);
1040 return; 1015 return;
1041 } 1016 }
1042 1017
1043 /* This copies a lot of the code from the fire bullet, 1018 /* This copies a lot of the code from the fire bullet,
1044 * but using the cast_bullet isn't really feasible, 1019 * but using the cast_bullet isn't really feasible,
1045 * so just set up the appropriate values. 1020 * so just set up the appropriate values.
1046 */ 1021 */
1047 at = find_archetype (SPLINT); 1022 at = archetype::find (SPLINT);
1048 if (at) 1023 if (at)
1049 { 1024 {
1050 for (i = 1; i < 9; i++) 1025 for (i = 1; i < 9; i++)
1051 { 1026 {
1052 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 1027 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
… …
1055 tmp->direction = i; 1030 tmp->direction = i;
1056 tmp->range = op->range; 1031 tmp->range = op->range;
1057 tmp->stats.dam = op->stats.dam; 1032 tmp->stats.dam = op->stats.dam;
1058 tmp->duration = op->duration; 1033 tmp->duration = op->duration;
1059 tmp->attacktype = op->attacktype; 1034 tmp->attacktype = op->attacktype;
1060 copy_owner (tmp, op); 1035 tmp->set_owner (op);
1061 if (op->skill && op->skill != tmp->skill) 1036 if (op->skill && op->skill != tmp->skill)
1062 { 1037 {
1063 tmp->skill = op->skill; 1038 tmp->skill = op->skill;
1064 } 1039 }
1065 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1040 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
… …
1079{ 1054{
1080 1055
1081 object *tmp; 1056 object *tmp;
1082 int mflags; 1057 int mflags;
1083 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1058 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1084 mapstruct *m; 1059 maptile *m;
1085 1060
1086 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1061 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1087 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1062 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1088 { 1063 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1064 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1095 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1070 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1096 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1071 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1097 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1072 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1098 tmp->attacktype = spell->attacktype; 1073 tmp->attacktype = spell->attacktype;
1099 1074
1100 set_owner (tmp, op); 1075 tmp->set_owner (op);
1101 set_spell_skill (op, caster, spell, tmp); 1076 set_spell_skill (op, caster, spell, tmp);
1102 tmp->x = dx; 1077 tmp->x = dx;
1103 tmp->y = dy; 1078 tmp->y = dy;
1104 insert_ob_in_map (tmp, m, op, 0); 1079 insert_ob_in_map (tmp, m, op, 0);
1105 return 1; 1080 return 1;
… …
1125get_pointed_target (object *op, int dir, int range, int type) 1100get_pointed_target (object *op, int dir, int range, int type)
1126{ 1101{
1127 object *target; 1102 object *target;
1128 sint16 x, y; 1103 sint16 x, y;
1129 int dist, mflags; 1104 int dist, mflags;
1130 mapstruct *mp; 1105 maptile *mp;
1131 1106
1132 if (dir == 0) 1107 if (dir == 0)
1133 return NULL; 1108 return NULL;
1134 1109
1135 for (dist = 1; dist < range; dist++) 1110 for (dist = 1; dist < range; dist++)
… …
1148 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1123 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1149 return NULL; 1124 return NULL;
1150 1125
1151 if (mflags & P_IS_ALIVE) 1126 if (mflags & P_IS_ALIVE)
1152 { 1127 {
1153 for (target = get_map_ob (mp, x, y); target; target = target->above) 1128 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1154 { 1129 {
1155 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1130 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1156 { 1131 {
1157 return target; 1132 return target;
1158 } 1133 }
… …
1225 if (effect->attacktype & AT_DEATH) 1200 if (effect->attacktype & AT_DEATH)
1226 { 1201 {
1227 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1202 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1228 1203
1229 /* casting death spells at undead isn't a good thing */ 1204 /* casting death spells at undead isn't a good thing */
1230 if QUERY_FLAG
1231 (target, FLAG_UNDEAD) 1205 if (QUERY_FLAG (target, FLAG_UNDEAD))
1232 { 1206 {
1233 if (random_roll (0, 2, op, PREFER_LOW)) 1207 if (random_roll (0, 2, op, PREFER_LOW))
1234 { 1208 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1209 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1236 effect->x = op->x; 1210 effect->x = op->x;
… …
1238 } 1212 }
1239 else 1213 else
1240 { 1214 {
1241 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1215 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1242 target->stats.hp = target->stats.maxhp * 2; 1216 target->stats.hp = target->stats.maxhp * 2;
1243 free_object (effect); 1217 effect->destroy ();
1244 return 0; 1218 return 0;
1245 } 1219 }
1246 } 1220 }
1247 } 1221 }
1248 else 1222 else
1249 { 1223 {
1250 /* how much woe to inflict :) */ 1224 /* how much woe to inflict :) */
1251 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1225 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1252 } 1226 }
1253 1227
1254 set_owner (effect, op); 1228 effect->set_owner (op);
1255 set_spell_skill (op, caster, spell, effect); 1229 set_spell_skill (op, caster, spell, effect);
1256 1230
1257 /* ok, tell it where to be, and insert! */ 1231 /* ok, tell it where to be, and insert! */
1258 effect->x = target->x; 1232 effect->x = target->x;
1259 effect->y = target->y; 1233 effect->y = target->y;
… …
1275move_missile (object *op) 1249move_missile (object *op)
1276{ 1250{
1277 int i, mflags; 1251 int i, mflags;
1278 object *owner; 1252 object *owner;
1279 sint16 new_x, new_y; 1253 sint16 new_x, new_y;
1280 mapstruct *m; 1254 maptile *m;
1281 1255
1282 if (op->range-- <= 0) 1256 if (op->range-- <= 0)
1283 { 1257 {
1284 remove_ob (op); 1258 op->destroy ();
1285 free_object (op);
1286 return; 1259 return;
1287 } 1260 }
1288 1261
1289 owner = get_owner (op); 1262 owner = op->owner;
1290#if 0 1263#if 0
1291 /* It'd make things nastier if this wasn't here - spells cast by 1264 /* It'd make things nastier if this wasn't here - spells cast by
1292 * monster that are then killed would continue to survive 1265 * monster that are then killed would continue to survive
1293 */ 1266 */
1294 if (owner == NULL) 1267 if (owner == NULL)
1295 { 1268 {
1296 remove_ob (op); 1269 op->destroy ();
1297 free_object (op);
1298 return; 1270 return;
1299 } 1271 }
1300#endif 1272#endif
1301 1273
1302 new_x = op->x + DIRX (op); 1274 new_x = op->x + DIRX (op);
… …
1304 1276
1305 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1277 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1306 1278
1307 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1279 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1308 { 1280 {
1309 tag_t tag = op->count;
1310
1311 hit_map (op, op->direction, AT_MAGIC, 1); 1281 hit_map (op, op->direction, AT_MAGIC, 1);
1312 /* Basically, missile only hits one thing then goes away. 1282 /* Basically, missile only hits one thing then goes away.
1313 * we need to remove it if someone hasn't already done so. 1283 * we need to remove it if someone hasn't already done so.
1314 */ 1284 */
1315 if (!was_destroyed (op, tag)) 1285 if (!op->destroyed ())
1316 { 1286 op->destroy ();
1317 remove_ob (op); 1287
1318 free_object (op);
1319 }
1320 return; 1288 return;
1321 } 1289 }
1322 1290
1323 remove_ob (op); 1291 op->remove ();
1292
1324 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1293 if (!op->direction || (mflags & P_OUT_OF_MAP))
1325 { 1294 {
1326 free_object (op); 1295 op->destroy ();
1327 return; 1296 return;
1328 } 1297 }
1298
1329 op->x = new_x; 1299 op->x = new_x;
1330 op->y = new_y; 1300 op->y = new_y;
1331 op->map = m; 1301 op->map = m;
1332 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1302 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1333 if (i > 0 && i != op->direction) 1303 if (i > 0 && i != op->direction)
1334 { 1304 {
1335 op->direction = i; 1305 op->direction = i;
1336 SET_ANIMATION (op, op->direction); 1306 SET_ANIMATION (op, op->direction);
1337 } 1307 }
1308
1338 insert_ob_in_map (op, op->map, op, 0); 1309 insert_ob_in_map (op, op->map, op, 0);
1339} 1310}
1340 1311
1341/**************************************************************************** 1312/****************************************************************************
1342 * Destruction 1313 * Destruction
… …
1388int 1359int
1389cast_destruction (object *op, object *caster, object *spell_ob) 1360cast_destruction (object *op, object *caster, object *spell_ob)
1390{ 1361{
1391 int i, j, range, mflags, friendly = 0, dam, dur; 1362 int i, j, range, mflags, friendly = 0, dam, dur;
1392 sint16 sx, sy; 1363 sint16 sx, sy;
1393 mapstruct *m; 1364 maptile *m;
1394 object *tmp; 1365 object *tmp;
1395 const char *skill; 1366 const char *skill;
1396 1367
1397 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1368 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1398 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1369 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1426 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1397 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1427 if (mflags & P_OUT_OF_MAP) 1398 if (mflags & P_OUT_OF_MAP)
1428 continue; 1399 continue;
1429 if (mflags & P_IS_ALIVE) 1400 if (mflags & P_IS_ALIVE)
1430 { 1401 {
1431 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1402 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1432 { 1403 {
1433 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1404 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1434 break; 1405 break;
1435 } 1406 }
1436 if (tmp) 1407 if (tmp)
… …
1559 force->stats.ac = spell_ob->stats.ac; 1530 force->stats.ac = spell_ob->stats.ac;
1560 force->stats.wc = spell_ob->stats.wc; 1531 force->stats.wc = spell_ob->stats.wc;
1561 1532
1562 change_abil (tmp, force); /* Mostly to display any messages */ 1533 change_abil (tmp, force); /* Mostly to display any messages */
1563 insert_ob_in_ob (force, tmp); 1534 insert_ob_in_ob (force, tmp);
1564 fix_player (tmp); 1535 tmp->update_stats ();
1565 return 1; 1536 return 1;
1566 1537
1567} 1538}
1568 1539
1569 1540
… …
1580mood_change (object *op, object *caster, object *spell) 1551mood_change (object *op, object *caster, object *spell)
1581{ 1552{
1582 object *tmp, *god, *head; 1553 object *tmp, *god, *head;
1583 int done_one, range, mflags, level, at, best_at; 1554 int done_one, range, mflags, level, at, best_at;
1584 sint16 x, y, nx, ny; 1555 sint16 x, y, nx, ny;
1585 mapstruct *m; 1556 maptile *m;
1586 const char *race; 1557 const char *race;
1587 1558
1588 /* We precompute some values here so that we don't have to keep 1559 /* We precompute some values here so that we don't have to keep
1589 * doing it over and over again. 1560 * doing it over and over again.
1590 */ 1561 */
… …
1620 1591
1621 /* If there is nothing living on this space, no need to go further */ 1592 /* If there is nothing living on this space, no need to go further */
1622 if (!(mflags & P_IS_ALIVE)) 1593 if (!(mflags & P_IS_ALIVE))
1623 continue; 1594 continue;
1624 1595
1625 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1596 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1626 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1597 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1627 break; 1598 break;
1628 1599
1629 /* There can be living objects that are not monsters */ 1600 /* There can be living objects that are not monsters */
1630 if (!tmp || tmp->type == PLAYER) 1601 if (!tmp || tmp->type == PLAYER)
… …
1718 SET_FLAG (head, FLAG_FRIENDLY); 1689 SET_FLAG (head, FLAG_FRIENDLY);
1719 /* Prevent uncontolled outbreaks of self replicating monsters. 1690 /* Prevent uncontolled outbreaks of self replicating monsters.
1720 Typical use case is charm, go somwhere, use aggravation to make hostile. 1691 Typical use case is charm, go somwhere, use aggravation to make hostile.
1721 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1692 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1722 CLEAR_FLAG (head, FLAG_GENERATOR); 1693 CLEAR_FLAG (head, FLAG_GENERATOR);
1723 set_owner (head, op); 1694 head->set_owner (op);
1724 set_spell_skill (op, caster, spell, head); 1695 set_spell_skill (op, caster, spell, head);
1725 add_friendly_object (head); 1696 add_friendly_object (head);
1726 head->attack_movement = PETMOVE; 1697 head->attack_movement = PETMOVE;
1727 done_one = 1; 1698 done_one = 1;
1728 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1699 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
… …
1754move_ball_spell (object *op) 1725move_ball_spell (object *op)
1755{ 1726{
1756 int i, j, dam_save, dir, mflags; 1727 int i, j, dam_save, dir, mflags;
1757 sint16 nx, ny, hx, hy; 1728 sint16 nx, ny, hx, hy;
1758 object *owner; 1729 object *owner;
1759 mapstruct *m; 1730 maptile *m;
1760 1731
1761 owner = get_owner (op); 1732 owner = op->owner;
1762 1733
1763 /* the following logic makes sure that the ball doesn't move into a wall, 1734 /* the following logic makes sure that the ball doesn't move into a wall,
1764 * and makes sure that it will move along a wall to try and get at it's 1735 * and makes sure that it will move along a wall to try and get at it's
1765 * victim. The block immediately below more or less chooses a random 1736 * victim. The block immediately below more or less chooses a random
1766 * offset to move the ball, eg, keep it mostly on course, with some 1737 * offset to move the ball, eg, keep it mostly on course, with some
… …
1795 nx = op->x; 1766 nx = op->x;
1796 ny = op->y; 1767 ny = op->y;
1797 m = op->map; 1768 m = op->map;
1798 } 1769 }
1799 1770
1800 remove_ob (op); 1771 op->remove ();
1801 op->y = ny; 1772 op->y = ny;
1802 op->x = nx; 1773 op->x = nx;
1803 insert_ob_in_map (op, m, op, 0); 1774 insert_ob_in_map (op, m, op, 0);
1804 1775
1805 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1776 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
… …
1845 } 1816 }
1846 1817
1847 /* restore to the center location and damage */ 1818 /* restore to the center location and damage */
1848 op->stats.dam = dam_save; 1819 op->stats.dam = dam_save;
1849 1820
1850 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1821 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1851 1822
1852 if (i >= 0) 1823 if (i >= 0)
1853 { /* we have a preferred direction! */ 1824 { /* we have a preferred direction! */
1854 /* pick another direction if the preferred dir is blocked. */ 1825 /* pick another direction if the preferred dir is blocked. */
1855 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1826 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
… …
1876#if 0 1847#if 0
1877 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1848 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1878 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1849 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1879 sint16 target_x, target_y, origin_x, origin_y; 1850 sint16 target_x, target_y, origin_x, origin_y;
1880 int adjustdir; 1851 int adjustdir;
1881 mapstruct *m; 1852 maptile *m;
1882#endif 1853#endif
1883 int basedir; 1854 int basedir;
1884 object *owner; 1855 object *owner;
1885 1856
1886 owner = get_owner (op); 1857 owner = op->owner;
1887 if (op->duration == 0 || owner == NULL) 1858 if (op->duration == 0 || owner == NULL)
1888 { 1859 {
1889 remove_ob (op); 1860 op->destroy ();
1890 free_object (op);
1891 return; 1861 return;
1892 } 1862 }
1863
1893 op->duration--; 1864 op->duration--;
1894 1865
1895 basedir = op->direction; 1866 basedir = op->direction;
1896 if (basedir == 0) 1867 if (basedir == 0)
1897 { 1868 {
… …
1996 return 0; 1967 return 0;
1997 1968
1998 tmp = get_archetype (SWARM_SPELL); 1969 tmp = get_archetype (SWARM_SPELL);
1999 tmp->x = op->x; 1970 tmp->x = op->x;
2000 tmp->y = op->y; 1971 tmp->y = op->y;
2001 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1972 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
2002 set_spell_skill (op, caster, spell, tmp); 1973 set_spell_skill (op, caster, spell, tmp);
2003 1974
2004 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1975 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2005 tmp->spell = arch_to_object (spell->other_arch); 1976 tmp->spell = arch_to_object (spell->other_arch);
2006 1977
… …
2029cast_light (object *op, object *caster, object *spell, int dir) 2000cast_light (object *op, object *caster, object *spell, int dir)
2030{ 2001{
2031 object *target = NULL, *tmp = NULL; 2002 object *target = NULL, *tmp = NULL;
2032 sint16 x, y; 2003 sint16 x, y;
2033 int dam, mflags; 2004 int dam, mflags;
2034 mapstruct *m; 2005 maptile *m;
2035 2006
2036 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2007 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2037 2008
2038 if (!dir) 2009 if (!dir)
2039 { 2010 {
… …
2053 return 0; 2024 return 0;
2054 } 2025 }
2055 2026
2056 if (mflags & P_IS_ALIVE && spell->attacktype) 2027 if (mflags & P_IS_ALIVE && spell->attacktype)
2057 { 2028 {
2058 for (target = get_map_ob (m, x, y); target; target = target->above) 2029 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2059 if (QUERY_FLAG (target, FLAG_MONSTER)) 2030 if (QUERY_FLAG (target, FLAG_MONSTER))
2060 { 2031 {
2061 /* oky doky. got a target monster. Lets make a blinding attack */ 2032 /* oky doky. got a target monster. Lets make a blinding attack */
2062 if (target->head) 2033 if (target->head)
2063 target = target->head; 2034 target = target->head;
… …
2107cast_cause_disease (object *op, object *caster, object *spell, int dir) 2078cast_cause_disease (object *op, object *caster, object *spell, int dir)
2108{ 2079{
2109 sint16 x, y; 2080 sint16 x, y;
2110 int i, mflags, range, dam_mod, dur_mod; 2081 int i, mflags, range, dam_mod, dur_mod;
2111 object *walk; 2082 object *walk;
2112 mapstruct *m; 2083 maptile *m;
2113 2084
2114 x = op->x; 2085 x = op->x;
2115 y = op->y; 2086 y = op->y;
2116 2087
2117 /* If casting from a scroll, no direction will be available, so refer to the 2088 /* If casting from a scroll, no direction will be available, so refer to the
… …
2145 2116
2146 /* Only bother looking on this space if there is something living here */ 2117 /* Only bother looking on this space if there is something living here */
2147 if (mflags & P_IS_ALIVE) 2118 if (mflags & P_IS_ALIVE)
2148 { 2119 {
2149 /* search this square for a victim */ 2120 /* search this square for a victim */
2150 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2121 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2151 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2122 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2152 { /* found a victim */ 2123 { /* found a victim */
2153 object *disease = arch_to_object (spell->other_arch); 2124 object *disease = arch_to_object (spell->other_arch);
2154 2125
2155 set_owner (disease, op); 2126 disease->set_owner (op);
2156 set_spell_skill (op, caster, spell, disease); 2127 set_spell_skill (op, caster, spell, disease);
2157 disease->stats.exp = 0; 2128 disease->stats.exp = 0;
2158 disease->level = caster_level (caster, spell); 2129 disease->level = caster_level (caster, spell);
2159 2130
2160 /* do level adjustments */ 2131 /* do level adjustments */
… …
2209 { 2180 {
2210 object *flash; /* visual effect for inflicting disease */ 2181 object *flash; /* visual effect for inflicting disease */
2211 2182
2212 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2183 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2213 2184
2214 free_object (disease); /* don't need this one anymore */ 2185 disease->destroy (); /* don't need this one anymore */
2215 flash = get_archetype (ARCH_DETECT_MAGIC); 2186 flash = get_archetype (ARCH_DETECT_MAGIC);
2216 flash->x = x; 2187 flash->x = x;
2217 flash->y = y; 2188 flash->y = y;
2218 flash->map = walk->map; 2189 flash->map = walk->map;
2219 insert_ob_in_map (flash, walk->map, op, 0); 2190 insert_ob_in_map (flash, walk->map, op, 0);
2220 return 1; 2191 return 1;
2221 } 2192 }
2222 free_object (disease); 2193
2194 disease->destroy ();
2223 } 2195 }
2224 } /* if living creature */ 2196 } /* if living creature */
2225 } /* for range of spaces */ 2197 } /* for range of spaces */
2226 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2198 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2227 return 1; 2199 return 1;

Diff Legend

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