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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.43 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.44 by root, Mon Sep 29 10:31:32 2008 UTC

386 /* If we don't have an enemy, do special movement or the like */ 386 /* If we don't have an enemy, do special movement or the like */
387 if (!enemy) 387 if (!enemy)
388 { 388 {
389 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 389 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
390 { 390 {
391 op->destroy_inv (true); // be explicit about dropping
392 op->destroy (true); 391 op->drop_and_destroy ();
393 return 1; 392 return 1;
394 } 393 }
395 394
396 /* Probably really a bug for a creature to have both 395 /* Probably really a bug for a creature to have both
397 * stand still and a movement type set. 396 * stand still and a movement type set.
651 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ 650 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */
652 return 1; 651 return 1;
653 652
654 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 653 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
655 { 654 {
656 op->destroy_inv (true); // be explicit about dropping
657 op->destroy (true); 655 op->drop_and_destroy ();
658 return 1; 656 return 1;
659 } 657 }
660 658
661 return 0; 659 return 0;
662} 660}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines