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.66 by root, Mon Sep 29 10:31:32 2008 UTC vs.
Revision 1.67 by root, Mon Sep 29 10:32:50 2008 UTC

… …
351 maptile *m = op->map; 351 maptile *m = op->map;
352 int i; 352 int i;
353 353
354 if (--op->duration < 0) 354 if (--op->duration < 0)
355 { 355 {
356 op->destroy (true); 356 op->destroy ();
357 return; 357 return;
358 } 358 }
359 359
360 hit_map (op, 0, op->attacktype, 0); 360 hit_map (op, 0, op->attacktype, 0);
361 361
… …
396 object *tmp, *owner; 396 object *tmp, *owner;
397 397
398 if (!op->other_arch) 398 if (!op->other_arch)
399 { 399 {
400 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 400 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
401 op->destroy (true); 401 op->destroy ();
402 return; 402 return;
403 } 403 }
404 404
405 if (op->env) 405 if (op->env)
406 { 406 {
407 object *env = op->outer_env (); 407 object *env = op->outer_env ();
408 408
409 if (!env->map || out_of_map (env->map, env->x, env->y)) 409 if (!env->map || out_of_map (env->map, env->x, env->y))
410 { 410 {
411 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 411 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
412 op->destroy (true); 412 op->destroy ();
413 return; 413 return;
414 } 414 }
415 415
416 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON); 416 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
417 } 417 }
418 else if (out_of_map (op->map, op->x, op->y)) 418 else if (out_of_map (op->map, op->x, op->y))
419 { 419 {
420 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 420 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
421 op->destroy (true); 421 op->destroy ();
422 return; 422 return;
423 } 423 }
424 424
425 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 425 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
426 // NOTE: If this breaks something important: remove this. I can't think of anything 426 // NOTE: If this breaks something important: remove this. I can't think of anything
427 // bad at the moment that might happen from this. 427 // bad at the moment that might happen from this.
428 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 428 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
429 { 429 {
430 op->destroy (true); 430 op->destroy ();
431 return; 431 return;
432 } 432 }
433 433
434 if (op->attacktype) 434 if (op->attacktype)
435 { 435 {
… …
450 if ((tmp->attacktype & AT_HOLYWORD 450 if ((tmp->attacktype & AT_HOLYWORD
451 || tmp->attacktype & AT_GODPOWER) 451 || tmp->attacktype & AT_GODPOWER)
452 && owner 452 && owner
453 && !tailor_god_spell (tmp, owner)) 453 && !tailor_god_spell (tmp, owner))
454 { 454 {
455 op->destroy (true); 455 op->destroy ();
456 return; 456 return;
457 } 457 }
458 458
459 /* special for bombs - it actually has sane values for these */ 459 /* special for bombs - it actually has sane values for these */
460 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 460 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
… …
488 488
489 tmp->insert_at (op, op); 489 tmp->insert_at (op, op);
490 tmp->play_sound (tmp->sound); 490 tmp->play_sound (tmp->sound);
491 491
492 /* remove the firebullet */ 492 /* remove the firebullet */
493 op->destroy (true); 493 op->destroy ();
494} 494}
495 495
496/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
497 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
498 */ 498 */
… …
529 // TODO: can't understand the following if's 529 // TODO: can't understand the following if's
530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
531 { 531 {
532 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
533 { 533 {
534 op->destroy (true); 534 op->destroy ();
535 return; 535 return;
536 } 536 }
537 } 537 }
538 } 538 }
539 } 539 }
… …
568 if (--op->range <= 0) 568 if (--op->range <= 0)
569 { 569 {
570 if (op->other_arch) 570 if (op->other_arch)
571 explode_bullet (op); 571 explode_bullet (op);
572 else 572 else
573 op->destroy (true); 573 op->destroy ();
574 574
575 return; 575 return;
576 } 576 }
577 577
578 new_x = op->x + DIRX (op); 578 new_x = op->x + DIRX (op);
… …
580 m = op->map; 580 m = op->map;
581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
582 582
583 if (mflags & P_OUT_OF_MAP) 583 if (mflags & P_OUT_OF_MAP)
584 { 584 {
585 op->destroy (true); 585 op->destroy ();
586 return; 586 return;
587 } 587 }
588 588
589 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 589 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
590 { 590 {
591 if (op->other_arch) 591 if (op->other_arch)
592 explode_bullet (op); 592 explode_bullet (op);
593 else 593 else
594 op->destroy (true); 594 op->destroy ();
595 595
596 return; 596 return;
597 } 597 }
598 598
599 if (!(op = m->insert (op, new_x, new_y, op))) 599 if (!(op = m->insert (op, new_x, new_y, op)))
… …
655 655
656 maptile *newmap; 656 maptile *newmap;
657 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 657 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
658 if (mflags & P_OUT_OF_MAP) 658 if (mflags & P_OUT_OF_MAP)
659 { 659 {
660 tmp->destroy (true); 660 tmp->destroy ();
661 return 0; 661 return 0;
662 } 662 }
663 663
664 tmp->map = newmap; 664 tmp->map = newmap;
665 665
666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
667 { 667 {
668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
669 { 669 {
670 tmp->destroy (true); 670 tmp->destroy ();
671 return 0; 671 return 0;
672 } 672 }
673 673
674 tmp->x = op->x; 674 tmp->x = op->x;
675 tmp->y = op->y; 675 tmp->y = op->y;
… …
730 * when their cone dies when they die. 730 * when their cone dies when they die.
731 */ 731 */
732 /* If no owner left, the spell dies out. */ 732 /* If no owner left, the spell dies out. */
733 if (op->owner == NULL) 733 if (op->owner == NULL)
734 { 734 {
735 op->destroy (true); 735 op->destroy ();
736 return; 736 return;
737 } 737 }
738#endif 738#endif
739 739
740 hit_map (op, 0, op->attacktype, 0); 740 hit_map (op, 0, op->attacktype, 0);
… …
749 if (op->destroyed ()) 749 if (op->destroyed ())
750 return; 750 return;
751 751
752 if (op->duration-- < 0) 752 if (op->duration-- < 0)
753 { 753 {
754 op->destroy (true); 754 op->destroy ();
755 return; 755 return;
756 } 756 }
757 /* Object has hit maximum range, so don't have it move 757 /* Object has hit maximum range, so don't have it move
758 * any further. When the duration above expires, 758 * any further. When the duration above expires,
759 * then the object will get removed. 759 * then the object will get removed.
… …
958 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 958 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
959 // on a safe map. I don't like this special casing, but it seems to be neccessary 959 // on a safe map. I don't like this special casing, but it seems to be neccessary
960 // as bombs can be carried. 960 // as bombs can be carried.
961 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 961 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
962 { 962 {
963 op->destroy (true); 963 op->destroy ();
964 return; 964 return;
965 } 965 }
966 966
967 /* This copies a lot of the code from the fire bullet, 967 /* This copies a lot of the code from the fire bullet,
968 * but using the cast_bullet isn't really feasible, 968 * but using the cast_bullet isn't really feasible,
… …
1150 } 1150 }
1151 else 1151 else
1152 { 1152 {
1153 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1154 target->stats.hp = target->stats.maxhp * 2; 1154 target->stats.hp = target->stats.maxhp * 2;
1155 effect->destroy (true); 1155 effect->destroy ();
1156 return 0; 1156 return 0;
1157 } 1157 }
1158 } 1158 }
1159 } 1159 }
1160 else 1160 else
… …
1192 mapxy pos (op); 1192 mapxy pos (op);
1193 pos.move (op->direction); 1193 pos.move (op->direction);
1194 1194
1195 if (!pos.normalise ()) 1195 if (!pos.normalise ())
1196 { 1196 {
1197 op->destroy (true); 1197 op->destroy ();
1198 return; 1198 return;
1199 } 1199 }
1200 1200
1201 mapspace &ms = pos.ms (); 1201 mapspace &ms = pos.ms ();
1202 1202
… …
1204 { 1204 {
1205 hit_map (op, op->direction, AT_MAGIC, 1); 1205 hit_map (op, op->direction, AT_MAGIC, 1);
1206 /* Basically, missile only hits one thing then goes away. 1206 /* Basically, missile only hits one thing then goes away.
1207 * we need to remove it if someone hasn't already done so. 1207 * we need to remove it if someone hasn't already done so.
1208 */ 1208 */
1209 op->destroy (true); 1209 op->destroy ();
1210 return; 1210 return;
1211 } 1211 }
1212 1212
1213 if (!op->direction) 1213 if (!op->direction)
1214 { 1214 {
1215 op->destroy (true); 1215 op->destroy ();
1216 return; 1216 return;
1217 } 1217 }
1218 1218
1219 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner); 1219 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1220 if (i > 0 && i != op->direction) 1220 if (i > 0 && i != op->direction)
… …
1737 object *owner = op->env; 1737 object *owner = op->env;
1738 1738
1739 if (!owner) // MUST not happen, remove when true TODO 1739 if (!owner) // MUST not happen, remove when true TODO
1740 { 1740 {
1741 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ()); 1741 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1742 op->destroy (true); 1742 op->destroy ();
1743 return; 1743 return;
1744 } 1744 }
1745 1745
1746 if (!op->duration || !owner->is_on_map ()) 1746 if (!op->duration || !owner->is_on_map ())
1747 { 1747 {
… …
2056 2056
2057 if (infect_object (walk, disease, 1)) 2057 if (infect_object (walk, disease, 1))
2058 { 2058 {
2059 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2059 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2060 2060
2061 disease->destroy (true); /* don't need this one anymore */ 2061 disease->destroy (); /* don't need this one anymore */
2062 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2062 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2063 return 1; 2063 return 1;
2064 } 2064 }
2065 2065
2066 disease->destroy (true); 2066 disease->destroy ();
2067 } 2067 }
2068 } /* if living creature */ 2068 } /* if living creature */
2069 } /* for range of spaces */ 2069 } /* for range of spaces */
2070 2070
2071 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2071 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");

Diff Legend

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