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.13 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.20 by root, Mon Dec 18 02:35:01 2006 UTC

… …
117void 117void
118forklightning (object *op, object *tmp) 118forklightning (object *op, object *tmp)
119{ 119{
120 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 */
121 int t_dir; /* stores temporary dir calculation */ 121 int t_dir; /* stores temporary dir calculation */
122 mapstruct *m; 122 maptile *m;
123 sint16 sx, sy; 123 sint16 sx, sy;
124 object *new_bolt; 124 object *new_bolt;
125 125
126 /* pick a fork direction. tmp->stats.Con is the left bias 126 /* pick a fork direction. tmp->stats.Con is the left bias
127 * i.e., the chance in 100 of forking LEFT 127 * i.e., the chance in 100 of forking LEFT
… …
140 140
141 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)))
142 return; 142 return;
143 143
144 /* OK, we made a fork */ 144 /* OK, we made a fork */
145 new_bolt = get_object (); 145 new_bolt = tmp->clone ();
146 copy_object (tmp, new_bolt);
147 146
148 /* reduce chances of subsequent forking */ 147 /* reduce chances of subsequent forking */
149 new_bolt->stats.Dex -= 10; 148 new_bolt->stats.Dex -= 10;
150 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 149 tmp->stats.Dex -= 10; /* less forks from main bolt too */
151 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
… …
170move_bolt (object *op) 169move_bolt (object *op)
171{ 170{
172 object *tmp; 171 object *tmp;
173 int mflags; 172 int mflags;
174 sint16 x, y; 173 sint16 x, y;
175 mapstruct *m; 174 maptile *m;
176 175
177 if (--(op->duration) < 0) 176 if (--(op->duration) < 0)
178 { 177 {
179 remove_ob (op); 178 op->destroy ();
180 free_object (op);
181 return; 179 return;
182 } 180 }
183 181
184 hit_map (op, 0, op->attacktype, 1); 182 hit_map (op, 0, op->attacktype, 1);
185 183
… …
250 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
251 return; 249 return;
252 } 250 }
253 else 251 else
254 { /* Create a copy of this object and put it ahead */ 252 { /* Create a copy of this object and put it ahead */
255 tmp = get_object (); 253 tmp = op->clone ();
256 copy_object (op, tmp); 254
257 tmp->speed_left = -0.1; 255 tmp->speed_left = -0.1;
258 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp); 256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
259 tmp = insert_ob_in_map (tmp, op->map, op, 0); 257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
260 /* 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 */
261 tmp->duration++; 259 tmp->duration++;
… …
310 308
311 tmp->direction = dir; 309 tmp->direction = dir;
312 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 310 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
313 SET_ANIMATION (tmp, dir); 311 SET_ANIMATION (tmp, dir);
314 312
315 set_owner (tmp, op); 313 tmp->set_owner (op);
316 set_spell_skill (op, caster, spob, tmp); 314 set_spell_skill (op, caster, spob, tmp);
317 315
318 tmp->x = op->x + DIRX (tmp); 316 tmp->x = op->x + DIRX (tmp);
319 tmp->y = op->y + DIRY (tmp); 317 tmp->y = op->y + DIRY (tmp);
320 tmp->map = op->map; 318 tmp->map = op->map;
321 319
322 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);
323 if (mflags & P_OUT_OF_MAP) 321 if (mflags & P_OUT_OF_MAP)
324 { 322 {
325 free_object (tmp); 323 tmp->destroy ();
326 return 0; 324 return 0;
327 } 325 }
326
328 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)))
329 { 328 {
330 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 329 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331 { 330 {
332 free_object (tmp); 331 tmp->destroy ();
333 return 0; 332 return 0;
334 } 333 }
334
335 tmp->x = op->x; 335 tmp->x = op->x;
336 tmp->y = op->y; 336 tmp->y = op->y;
337 tmp->direction = absdir (tmp->direction + 4); 337 tmp->direction = absdir (tmp->direction + 4);
338 tmp->map = op->map; 338 tmp->map = op->map;
339 } 339 }
340
340 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)
341 move_bolt (tmp); 342 move_bolt (tmp);
343
342 return 1; 344 return 1;
343} 345}
344 346
345 347
346 348
… …
356 */ 358 */
357void 359void
358explosion (object *op) 360explosion (object *op)
359{ 361{
360 object *tmp; 362 object *tmp;
361 mapstruct *m = op->map; 363 maptile *m = op->map;
362 int i; 364 int i;
363 365
364 if (--(op->duration) < 0) 366 if (--(op->duration) < 0)
365 { 367 {
366 remove_ob (op); 368 op->destroy ();
367 free_object (op);
368 return; 369 return;
369 } 370 }
371
370 hit_map (op, 0, op->attacktype, 0); 372 hit_map (op, 0, op->attacktype, 0);
371 373
372 if (op->range > 0) 374 if (op->range > 0)
373 { 375 {
374 for (i = 1; i < 9; i++) 376 for (i = 1; i < 9; i++)
… …
380 /* ok_to_put_more already does things like checks for walls, 382 /* ok_to_put_more already does things like checks for walls,
381 * out of map, etc. 383 * out of map, etc.
382 */ 384 */
383 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))
384 { 386 {
385 tmp = get_object (); 387 tmp = op->clone ();
386 copy_object (op, tmp);
387 tmp->state = 0; 388 tmp->state = 0;
388 tmp->speed_left = -0.21; 389 tmp->speed_left = -0.21;
389 tmp->range--; 390 tmp->range--;
390 tmp->value = 0; 391 tmp->value = 0;
391 tmp->x = dx; 392 tmp->x = dx;
… …
402 * explode. 403 * explode.
403 */ 404 */
404void 405void
405explode_bullet (object *op) 406explode_bullet (object *op)
406{ 407{
407 tag_t op_tag = op->count;
408 object *tmp, *owner; 408 object *tmp, *owner;
409 409
410 if (op->other_arch == NULL) 410 if (op->other_arch == NULL)
411 { 411 {
412 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 412 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
413 remove_ob (op); 413 op->destroy ();
414 free_object (op);
415 return; 414 return;
416 } 415 }
417 416
418 if (op->env) 417 if (op->env)
419 { 418 {
… …
421 420
422 env = object_get_env_recursive (op); 421 env = object_get_env_recursive (op);
423 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))
424 { 423 {
425 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 424 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
426 remove_ob (op); 425 op->destroy ();
427 free_object (op);
428 return; 426 return;
429 } 427 }
428
430 remove_ob (op); 429 op->remove ();
431 op->x = env->x; 430 op->x = env->x;
432 op->y = env->y; 431 op->y = env->y;
433 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);
434 } 433 }
435 else if (out_of_map (op->map, op->x, op->y)) 434 else if (out_of_map (op->map, op->x, op->y))
436 { 435 {
437 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 436 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
438 remove_ob (op); 437 op->destroy ();
439 free_object (op);
440 return; 438 return;
441 } 439 }
442 440
443 // 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
444 // 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
445 // bad at the moment that might happen from this. 443 // bad at the moment that might happen from this.
446 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)
447 { 445 {
448 remove_ob (op); 446 op->destroy ();
449 free_object (op);
450 return; 447 return;
451 } 448 }
452 449
453 if (op->attacktype) 450 if (op->attacktype)
454 { 451 {
455 hit_map (op, 0, op->attacktype, 1); 452 hit_map (op, 0, op->attacktype, 1);
456 if (was_destroyed (op, op_tag)) 453 if (op->destroyed ())
457 return; 454 return;
458 } 455 }
459 456
460 /* other_arch contains what this explodes into */ 457 /* other_arch contains what this explodes into */
461 tmp = arch_to_object (op->other_arch); 458 tmp = arch_to_object (op->other_arch);
462 459
463 copy_owner (tmp, op); 460 tmp->set_owner (op);
464 tmp->skill = op->skill; 461 tmp->skill = op->skill;
465 462
466 owner = get_owner (op); 463 owner = op->owner;
467 464
468 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))
469 { 466 {
470 remove_ob (op); 467 op->destroy ();
471 free_object (op);
472 return; 468 return;
473 } 469 }
474 470
475 tmp->x = op->x; 471 tmp->x = op->x;
476 tmp->y = op->y; 472 tmp->y = op->y;
… …
504 /* Prevent recursion */ 500 /* Prevent recursion */
505 op->move_on = 0; 501 op->move_on = 0;
506 502
507 insert_ob_in_map (tmp, op->map, op, 0); 503 insert_ob_in_map (tmp, op->map, op, 0);
508 /* remove the firebullet */ 504 /* remove the firebullet */
509 if (!was_destroyed (op, op_tag)) 505 if (!op->destroyed ())
510 { 506 {
511 remove_ob (op); 507 op->destroy ();
512 free_object (op);
513 } 508 }
514} 509}
515 510
516 511
517 512
… …
520 */ 515 */
521 516
522void 517void
523check_bullet (object *op) 518check_bullet (object *op)
524{ 519{
525 tag_t op_tag = op->count, tmp_tag;
526 object *tmp; 520 object *tmp;
527 int dam, mflags; 521 int dam, mflags;
528 mapstruct *m; 522 maptile *m;
529 sint16 sx, sy; 523 sint16 sx, sy;
530 524
531 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);
532 526
533 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 540
547 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)
548 { 542 {
549 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 543 if (QUERY_FLAG (tmp, FLAG_ALIVE))
550 { 544 {
551 tmp_tag = tmp->count;
552 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 545 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
553 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)
554 { 547 {
555 if (!QUERY_FLAG (op, FLAG_REMOVED)) 548 if (!QUERY_FLAG (op, FLAG_REMOVED))
556 { 549 {
557 remove_ob (op); 550 op->destroy ();
558 free_object (op);
559 return; 551 return;
560 } 552 }
561 } 553 }
562 } 554 }
563 } 555 }
… …
573void 565void
574move_bullet (object *op) 566move_bullet (object *op)
575{ 567{
576 sint16 new_x, new_y; 568 sint16 new_x, new_y;
577 int mflags; 569 int mflags;
578 mapstruct *m; 570 maptile *m;
579 571
580#if 0 572#if 0
581 /* We need a better general purpose way to do this */ 573 /* We need a better general purpose way to do this */
582 574
583 /* peterm: added to make comet leave a trail of burnouts 575 /* peterm: added to make comet leave a trail of burnouts
584 it's an unadulterated hack, but the effect is cool. */ 576 it's an unadulterated hack, but the effect is cool. */
585 if (op->stats.sp == SP_METEOR) 577 if (op->stats.sp == SP_METEOR)
586 { 578 {
587 replace_insert_ob_in_map ("fire_trail", op); 579 replace_insert_ob_in_map ("fire_trail", op);
588 if (was_destroyed (op, op_tag)) 580 if (op->destroyed ())
589 return; 581 return;
590 } /* end addition. */ 582 } /* end addition. */
591#endif 583#endif
592 584
593 /* Reached the end of its life - remove it */ 585 /* Reached the end of its life - remove it */
594 if (--op->range <= 0) 586 if (--op->range <= 0)
595 { 587 {
596 if (op->other_arch) 588 if (op->other_arch)
597 {
598 explode_bullet (op); 589 explode_bullet (op);
599 }
600 else 590 else
601 { 591 op->destroy ();
602 remove_ob (op); 592
603 free_object (op);
604 }
605 return; 593 return;
606 } 594 }
607 595
608 new_x = op->x + DIRX (op); 596 new_x = op->x + DIRX (op);
609 new_y = op->y + DIRY (op); 597 new_y = op->y + DIRY (op);
610 m = op->map; 598 m = op->map;
611 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);
612 600
613 if (mflags & P_OUT_OF_MAP) 601 if (mflags & P_OUT_OF_MAP)
614 { 602 {
615 remove_ob (op); 603 op->destroy ();
616 free_object (op);
617 return; 604 return;
618 } 605 }
619 606
620 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)))
621 { 608 {
622 if (op->other_arch) 609 if (op->other_arch)
623 {
624 explode_bullet (op); 610 explode_bullet (op);
625 }
626 else 611 else
627 { 612 op->destroy ();
628 remove_ob (op); 613
629 free_object (op);
630 }
631 return; 614 return;
632 } 615 }
633 616
634 remove_ob (op); 617 op->remove ();
635 op->x = new_x; 618 op->x = new_x;
636 op->y = new_y; 619 op->y = new_y;
637 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL) 620 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
638 return; 621 return;
639 622
… …
688 671
689 tmp->direction = dir; 672 tmp->direction = dir;
690 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 673 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
691 SET_ANIMATION (tmp, dir); 674 SET_ANIMATION (tmp, dir);
692 675
693 set_owner (tmp, op); 676 tmp->set_owner (op);
694 set_spell_skill (op, caster, spob, tmp); 677 set_spell_skill (op, caster, spob, tmp);
695 678
696 tmp->x = op->x + freearr_x[dir]; 679 tmp->x = op->x + freearr_x[dir];
697 tmp->y = op->y + freearr_y[dir]; 680 tmp->y = op->y + freearr_y[dir];
698 tmp->map = op->map; 681 tmp->map = op->map;
699 682
700 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);
701 if (mflags & P_OUT_OF_MAP) 684 if (mflags & P_OUT_OF_MAP)
702 { 685 {
703 free_object (tmp); 686 tmp->destroy ();
704 return 0; 687 return 0;
705 } 688 }
689
706 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)))
707 { 691 {
708 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 692 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
709 { 693 {
710 free_object (tmp); 694 tmp->destroy ();
711 return 0; 695 return 0;
712 } 696 }
697
713 tmp->x = op->x; 698 tmp->x = op->x;
714 tmp->y = op->y; 699 tmp->y = op->y;
715 tmp->direction = absdir (tmp->direction + 4); 700 tmp->direction = absdir (tmp->direction + 4);
716 tmp->map = op->map; 701 tmp->map = op->map;
717 } 702 }
703
718 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)
719 {
720 check_bullet (tmp); 705 check_bullet (tmp);
721 } 706
722 return 1; 707 return 1;
723} 708}
724 709
725 710
726 711
… …
739 object *new_ob = arch_to_object (op->other_arch); 724 object *new_ob = arch_to_object (op->other_arch);
740 725
741 new_ob->x = op->x; 726 new_ob->x = op->x;
742 new_ob->y = op->y; 727 new_ob->y = op->y;
743 new_ob->level = op->level; 728 new_ob->level = op->level;
744 set_owner (new_ob, op->owner); 729 new_ob->set_owner (op->owner);
745 730
746 /* preserve skill ownership */ 731 /* preserve skill ownership */
747 if (op->skill && op->skill != new_ob->skill) 732 if (op->skill && op->skill != new_ob->skill)
748 { 733 {
749 new_ob->skill = op->skill; 734 new_ob->skill = op->skill;
… …
756 741
757void 742void
758move_cone (object *op) 743move_cone (object *op)
759{ 744{
760 int i; 745 int i;
761 tag_t tag;
762 746
763 /* 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 */
764 if (!op->map) 748 if (!op->map)
765 { 749 {
766 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");
… …
779#if 0 763#if 0
780 /* Disable this - enabling it makes monsters easier, as 764 /* Disable this - enabling it makes monsters easier, as
781 * when their cone dies when they die. 765 * when their cone dies when they die.
782 */ 766 */
783 /* If no owner left, the spell dies out. */ 767 /* If no owner left, the spell dies out. */
784 if (get_owner (op) == NULL) 768 if (op->owner == NULL)
785 { 769 {
786 remove_ob (op); 770 op->destroy ();
787 free_object (op);
788 return; 771 return;
789 } 772 }
790#endif 773#endif
791 774
792 tag = op->count;
793 hit_map (op, 0, op->attacktype, 0); 775 hit_map (op, 0, op->attacktype, 0);
794 776
795 /* Check to see if we should push anything. 777 /* Check to see if we should push anything.
796 * Spell objects with weight push whatever they encounter to some 778 * Spell objects with weight push whatever they encounter to some
797 * degree. 779 * degree.
798 */ 780 */
799 if (op->weight) 781 if (op->weight)
800 check_spell_knockback (op); 782 check_spell_knockback (op);
801 783
802 if (was_destroyed (op, tag)) 784 if (op->destroyed ())
803 return; 785 return;
804 786
805 if ((op->duration--) < 0) 787 if ((op->duration--) < 0)
806 { 788 {
807 remove_ob (op); 789 op->destroy ();
808 free_object (op);
809 return; 790 return;
810 } 791 }
811 /* Object has hit maximum range, so don't have it move 792 /* Object has hit maximum range, so don't have it move
812 * any further. When the duration above expires, 793 * any further. When the duration above expires,
813 * then the object will get removed. 794 * then the object will get removed.
… …
822 { 803 {
823 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)];
824 805
825 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))
826 { 807 {
827 object *tmp = get_object (); 808 object *tmp = op->clone ();
828 809
829 copy_object (op, tmp);
830 tmp->x = x; 810 tmp->x = x;
831 tmp->y = y; 811 tmp->y = y;
832 812
833 tmp->duration = op->duration + 1; 813 tmp->duration = op->duration + 1;
834 814
… …
852int 832int
853cast_cone (object *op, object *caster, int dir, object *spell) 833cast_cone (object *op, object *caster, int dir, object *spell)
854{ 834{
855 object *tmp; 835 object *tmp;
856 int i, success = 0, range_min = -1, range_max = 1; 836 int i, success = 0, range_min = -1, range_max = 1;
857 mapstruct *m; 837 maptile *m;
858 sint16 sx, sy; 838 sint16 sx, sy;
859 MoveType movetype; 839 MoveType movetype;
860 840
861 if (!spell->other_arch) 841 if (!spell->other_arch)
862 return 0; 842 return 0;
… …
918 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 898 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
919 continue; 899 continue;
920 900
921 success = 1; 901 success = 1;
922 tmp = arch_to_object (spell->other_arch); 902 tmp = arch_to_object (spell->other_arch);
923 set_owner (tmp, op); 903 tmp->set_owner (op);
924 set_spell_skill (op, caster, spell, tmp); 904 set_spell_skill (op, caster, spell, tmp);
925 tmp->level = caster_level (caster, spell); 905 tmp->level = caster_level (caster, spell);
926 tmp->x = sx; 906 tmp->x = sx;
927 tmp->y = sy; 907 tmp->y = sy;
928 tmp->attacktype = spell->attacktype; 908 tmp->attacktype = spell->attacktype;
… …
1017 return; 997 return;
1018 998
1019 if (env->type == PLAYER) 999 if (env->type == PLAYER)
1020 esrv_del_item (env->contr, op->count); 1000 esrv_del_item (env->contr, op->count);
1021 1001
1022 remove_ob (op); 1002 op->remove ();
1023 op->x = env->x; 1003 op->x = env->x;
1024 op->y = env->y; 1004 op->y = env->y;
1025 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)
1026 return; 1006 return;
1027 } 1007 }
… …
1029 // 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
1030 // 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
1031 // as bombs can be carried. 1011 // as bombs can be carried.
1032 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)
1033 { 1013 {
1034 remove_ob (op); 1014 op->destroy ();
1035 free_object (op);
1036 return; 1015 return;
1037 } 1016 }
1038 1017
1039 /* This copies a lot of the code from the fire bullet, 1018 /* This copies a lot of the code from the fire bullet,
1040 * but using the cast_bullet isn't really feasible, 1019 * but using the cast_bullet isn't really feasible,
… …
1051 tmp->direction = i; 1030 tmp->direction = i;
1052 tmp->range = op->range; 1031 tmp->range = op->range;
1053 tmp->stats.dam = op->stats.dam; 1032 tmp->stats.dam = op->stats.dam;
1054 tmp->duration = op->duration; 1033 tmp->duration = op->duration;
1055 tmp->attacktype = op->attacktype; 1034 tmp->attacktype = op->attacktype;
1056 copy_owner (tmp, op); 1035 tmp->set_owner (op);
1057 if (op->skill && op->skill != tmp->skill) 1036 if (op->skill && op->skill != tmp->skill)
1058 { 1037 {
1059 tmp->skill = op->skill; 1038 tmp->skill = op->skill;
1060 } 1039 }
1061 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1040 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
… …
1075{ 1054{
1076 1055
1077 object *tmp; 1056 object *tmp;
1078 int mflags; 1057 int mflags;
1079 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];
1080 mapstruct *m; 1059 maptile *m;
1081 1060
1082 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1061 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1083 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))
1084 { 1063 {
1085 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.");
… …
1091 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1070 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1092 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);
1093 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1072 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1094 tmp->attacktype = spell->attacktype; 1073 tmp->attacktype = spell->attacktype;
1095 1074
1096 set_owner (tmp, op); 1075 tmp->set_owner (op);
1097 set_spell_skill (op, caster, spell, tmp); 1076 set_spell_skill (op, caster, spell, tmp);
1098 tmp->x = dx; 1077 tmp->x = dx;
1099 tmp->y = dy; 1078 tmp->y = dy;
1100 insert_ob_in_map (tmp, m, op, 0); 1079 insert_ob_in_map (tmp, m, op, 0);
1101 return 1; 1080 return 1;
… …
1121get_pointed_target (object *op, int dir, int range, int type) 1100get_pointed_target (object *op, int dir, int range, int type)
1122{ 1101{
1123 object *target; 1102 object *target;
1124 sint16 x, y; 1103 sint16 x, y;
1125 int dist, mflags; 1104 int dist, mflags;
1126 mapstruct *mp; 1105 maptile *mp;
1127 1106
1128 if (dir == 0) 1107 if (dir == 0)
1129 return NULL; 1108 return NULL;
1130 1109
1131 for (dist = 1; dist < range; dist++) 1110 for (dist = 1; dist < range; dist++)
… …
1221 if (effect->attacktype & AT_DEATH) 1200 if (effect->attacktype & AT_DEATH)
1222 { 1201 {
1223 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1202 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1224 1203
1225 /* casting death spells at undead isn't a good thing */ 1204 /* casting death spells at undead isn't a good thing */
1226 if QUERY_FLAG
1227 (target, FLAG_UNDEAD) 1205 if (QUERY_FLAG (target, FLAG_UNDEAD))
1228 { 1206 {
1229 if (random_roll (0, 2, op, PREFER_LOW)) 1207 if (random_roll (0, 2, op, PREFER_LOW))
1230 { 1208 {
1231 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1209 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1232 effect->x = op->x; 1210 effect->x = op->x;
… …
1234 } 1212 }
1235 else 1213 else
1236 { 1214 {
1237 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));
1238 target->stats.hp = target->stats.maxhp * 2; 1216 target->stats.hp = target->stats.maxhp * 2;
1239 free_object (effect); 1217 effect->destroy ();
1240 return 0; 1218 return 0;
1241 } 1219 }
1242 } 1220 }
1243 } 1221 }
1244 else 1222 else
1245 { 1223 {
1246 /* how much woe to inflict :) */ 1224 /* how much woe to inflict :) */
1247 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);
1248 } 1226 }
1249 1227
1250 set_owner (effect, op); 1228 effect->set_owner (op);
1251 set_spell_skill (op, caster, spell, effect); 1229 set_spell_skill (op, caster, spell, effect);
1252 1230
1253 /* ok, tell it where to be, and insert! */ 1231 /* ok, tell it where to be, and insert! */
1254 effect->x = target->x; 1232 effect->x = target->x;
1255 effect->y = target->y; 1233 effect->y = target->y;
… …
1271move_missile (object *op) 1249move_missile (object *op)
1272{ 1250{
1273 int i, mflags; 1251 int i, mflags;
1274 object *owner; 1252 object *owner;
1275 sint16 new_x, new_y; 1253 sint16 new_x, new_y;
1276 mapstruct *m; 1254 maptile *m;
1277 1255
1278 if (op->range-- <= 0) 1256 if (op->range-- <= 0)
1279 { 1257 {
1280 remove_ob (op); 1258 op->destroy ();
1281 free_object (op);
1282 return; 1259 return;
1283 } 1260 }
1284 1261
1285 owner = get_owner (op); 1262 owner = op->owner;
1286#if 0 1263#if 0
1287 /* 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
1288 * monster that are then killed would continue to survive 1265 * monster that are then killed would continue to survive
1289 */ 1266 */
1290 if (owner == NULL) 1267 if (owner == NULL)
1291 { 1268 {
1292 remove_ob (op); 1269 op->destroy ();
1293 free_object (op);
1294 return; 1270 return;
1295 } 1271 }
1296#endif 1272#endif
1297 1273
1298 new_x = op->x + DIRX (op); 1274 new_x = op->x + DIRX (op);
… …
1300 1276
1301 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);
1302 1278
1303 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))))
1304 { 1280 {
1305 tag_t tag = op->count;
1306
1307 hit_map (op, op->direction, AT_MAGIC, 1); 1281 hit_map (op, op->direction, AT_MAGIC, 1);
1308 /* Basically, missile only hits one thing then goes away. 1282 /* Basically, missile only hits one thing then goes away.
1309 * 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.
1310 */ 1284 */
1311 if (!was_destroyed (op, tag)) 1285 if (!op->destroyed ())
1312 { 1286 op->destroy ();
1313 remove_ob (op); 1287
1314 free_object (op);
1315 }
1316 return; 1288 return;
1317 } 1289 }
1318 1290
1319 remove_ob (op); 1291 op->remove ();
1292
1320 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1293 if (!op->direction || (mflags & P_OUT_OF_MAP))
1321 { 1294 {
1322 free_object (op); 1295 op->destroy ();
1323 return; 1296 return;
1324 } 1297 }
1298
1325 op->x = new_x; 1299 op->x = new_x;
1326 op->y = new_y; 1300 op->y = new_y;
1327 op->map = m; 1301 op->map = m;
1328 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);
1329 if (i > 0 && i != op->direction) 1303 if (i > 0 && i != op->direction)
1330 { 1304 {
1331 op->direction = i; 1305 op->direction = i;
1332 SET_ANIMATION (op, op->direction); 1306 SET_ANIMATION (op, op->direction);
1333 } 1307 }
1308
1334 insert_ob_in_map (op, op->map, op, 0); 1309 insert_ob_in_map (op, op->map, op, 0);
1335} 1310}
1336 1311
1337/**************************************************************************** 1312/****************************************************************************
1338 * Destruction 1313 * Destruction
… …
1384int 1359int
1385cast_destruction (object *op, object *caster, object *spell_ob) 1360cast_destruction (object *op, object *caster, object *spell_ob)
1386{ 1361{
1387 int i, j, range, mflags, friendly = 0, dam, dur; 1362 int i, j, range, mflags, friendly = 0, dam, dur;
1388 sint16 sx, sy; 1363 sint16 sx, sy;
1389 mapstruct *m; 1364 maptile *m;
1390 object *tmp; 1365 object *tmp;
1391 const char *skill; 1366 const char *skill;
1392 1367
1393 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1368 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1394 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);
… …
1576mood_change (object *op, object *caster, object *spell) 1551mood_change (object *op, object *caster, object *spell)
1577{ 1552{
1578 object *tmp, *god, *head; 1553 object *tmp, *god, *head;
1579 int done_one, range, mflags, level, at, best_at; 1554 int done_one, range, mflags, level, at, best_at;
1580 sint16 x, y, nx, ny; 1555 sint16 x, y, nx, ny;
1581 mapstruct *m; 1556 maptile *m;
1582 const char *race; 1557 const char *race;
1583 1558
1584 /* 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
1585 * doing it over and over again. 1560 * doing it over and over again.
1586 */ 1561 */
… …
1714 SET_FLAG (head, FLAG_FRIENDLY); 1689 SET_FLAG (head, FLAG_FRIENDLY);
1715 /* Prevent uncontolled outbreaks of self replicating monsters. 1690 /* Prevent uncontolled outbreaks of self replicating monsters.
1716 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.
1717 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. */
1718 CLEAR_FLAG (head, FLAG_GENERATOR); 1693 CLEAR_FLAG (head, FLAG_GENERATOR);
1719 set_owner (head, op); 1694 head->set_owner (op);
1720 set_spell_skill (op, caster, spell, head); 1695 set_spell_skill (op, caster, spell, head);
1721 add_friendly_object (head); 1696 add_friendly_object (head);
1722 head->attack_movement = PETMOVE; 1697 head->attack_movement = PETMOVE;
1723 done_one = 1; 1698 done_one = 1;
1724 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);
… …
1750move_ball_spell (object *op) 1725move_ball_spell (object *op)
1751{ 1726{
1752 int i, j, dam_save, dir, mflags; 1727 int i, j, dam_save, dir, mflags;
1753 sint16 nx, ny, hx, hy; 1728 sint16 nx, ny, hx, hy;
1754 object *owner; 1729 object *owner;
1755 mapstruct *m; 1730 maptile *m;
1756 1731
1757 owner = get_owner (op); 1732 owner = op->owner;
1758 1733
1759 /* 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,
1760 * 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
1761 * victim. The block immediately below more or less chooses a random 1736 * victim. The block immediately below more or less chooses a random
1762 * 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
… …
1791 nx = op->x; 1766 nx = op->x;
1792 ny = op->y; 1767 ny = op->y;
1793 m = op->map; 1768 m = op->map;
1794 } 1769 }
1795 1770
1796 remove_ob (op); 1771 op->remove ();
1797 op->y = ny; 1772 op->y = ny;
1798 op->x = nx; 1773 op->x = nx;
1799 insert_ob_in_map (op, m, op, 0); 1774 insert_ob_in_map (op, m, op, 0);
1800 1775
1801 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
… …
1841 } 1816 }
1842 1817
1843 /* restore to the center location and damage */ 1818 /* restore to the center location and damage */
1844 op->stats.dam = dam_save; 1819 op->stats.dam = dam_save;
1845 1820
1846 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);
1847 1822
1848 if (i >= 0) 1823 if (i >= 0)
1849 { /* we have a preferred direction! */ 1824 { /* we have a preferred direction! */
1850 /* pick another direction if the preferred dir is blocked. */ 1825 /* pick another direction if the preferred dir is blocked. */
1851 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 ||
… …
1872#if 0 1847#if 0
1873 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 };
1874 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 };
1875 sint16 target_x, target_y, origin_x, origin_y; 1850 sint16 target_x, target_y, origin_x, origin_y;
1876 int adjustdir; 1851 int adjustdir;
1877 mapstruct *m; 1852 maptile *m;
1878#endif 1853#endif
1879 int basedir; 1854 int basedir;
1880 object *owner; 1855 object *owner;
1881 1856
1882 owner = get_owner (op); 1857 owner = op->owner;
1883 if (op->duration == 0 || owner == NULL) 1858 if (op->duration == 0 || owner == NULL)
1884 { 1859 {
1885 remove_ob (op); 1860 op->destroy ();
1886 free_object (op);
1887 return; 1861 return;
1888 } 1862 }
1863
1889 op->duration--; 1864 op->duration--;
1890 1865
1891 basedir = op->direction; 1866 basedir = op->direction;
1892 if (basedir == 0) 1867 if (basedir == 0)
1893 { 1868 {
… …
1992 return 0; 1967 return 0;
1993 1968
1994 tmp = get_archetype (SWARM_SPELL); 1969 tmp = get_archetype (SWARM_SPELL);
1995 tmp->x = op->x; 1970 tmp->x = op->x;
1996 tmp->y = op->y; 1971 tmp->y = op->y;
1997 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. */
1998 set_spell_skill (op, caster, spell, tmp); 1973 set_spell_skill (op, caster, spell, tmp);
1999 1974
2000 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. */
2001 tmp->spell = arch_to_object (spell->other_arch); 1976 tmp->spell = arch_to_object (spell->other_arch);
2002 1977
… …
2025cast_light (object *op, object *caster, object *spell, int dir) 2000cast_light (object *op, object *caster, object *spell, int dir)
2026{ 2001{
2027 object *target = NULL, *tmp = NULL; 2002 object *target = NULL, *tmp = NULL;
2028 sint16 x, y; 2003 sint16 x, y;
2029 int dam, mflags; 2004 int dam, mflags;
2030 mapstruct *m; 2005 maptile *m;
2031 2006
2032 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2007 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2033 2008
2034 if (!dir) 2009 if (!dir)
2035 { 2010 {
… …
2103cast_cause_disease (object *op, object *caster, object *spell, int dir) 2078cast_cause_disease (object *op, object *caster, object *spell, int dir)
2104{ 2079{
2105 sint16 x, y; 2080 sint16 x, y;
2106 int i, mflags, range, dam_mod, dur_mod; 2081 int i, mflags, range, dam_mod, dur_mod;
2107 object *walk; 2082 object *walk;
2108 mapstruct *m; 2083 maptile *m;
2109 2084
2110 x = op->x; 2085 x = op->x;
2111 y = op->y; 2086 y = op->y;
2112 2087
2113 /* 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
… …
2146 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)
2147 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2122 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2148 { /* found a victim */ 2123 { /* found a victim */
2149 object *disease = arch_to_object (spell->other_arch); 2124 object *disease = arch_to_object (spell->other_arch);
2150 2125
2151 set_owner (disease, op); 2126 disease->set_owner (op);
2152 set_spell_skill (op, caster, spell, disease); 2127 set_spell_skill (op, caster, spell, disease);
2153 disease->stats.exp = 0; 2128 disease->stats.exp = 0;
2154 disease->level = caster_level (caster, spell); 2129 disease->level = caster_level (caster, spell);
2155 2130
2156 /* do level adjustments */ 2131 /* do level adjustments */
… …
2205 { 2180 {
2206 object *flash; /* visual effect for inflicting disease */ 2181 object *flash; /* visual effect for inflicting disease */
2207 2182
2208 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);
2209 2184
2210 free_object (disease); /* don't need this one anymore */ 2185 disease->destroy (); /* don't need this one anymore */
2211 flash = get_archetype (ARCH_DETECT_MAGIC); 2186 flash = get_archetype (ARCH_DETECT_MAGIC);
2212 flash->x = x; 2187 flash->x = x;
2213 flash->y = y; 2188 flash->y = y;
2214 flash->map = walk->map; 2189 flash->map = walk->map;
2215 insert_ob_in_map (flash, walk->map, op, 0); 2190 insert_ob_in_map (flash, walk->map, op, 0);
2216 return 1; 2191 return 1;
2217 } 2192 }
2218 free_object (disease); 2193
2194 disease->destroy ();
2219 } 2195 }
2220 } /* if living creature */ 2196 } /* if living creature */
2221 } /* for range of spaces */ 2197 } /* for range of spaces */
2222 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2198 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2223 return 1; 2199 return 1;

Diff Legend

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