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.13 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.14 by root, Tue Dec 12 21:39:57 2006 UTC

398 /* If we don't have an enemy, do special movement or the like */ 398 /* If we don't have an enemy, do special movement or the like */
399 if (!enemy) 399 if (!enemy)
400 { 400 {
401 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 401 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
402 { 402 {
403 op->remove ();
404 op->destroy (0); 403 op->destroy ();
405 return 1; 404 return 1;
406 } 405 }
407 406
408 /* Probably really a bug for a creature to have both 407 /* Probably really a bug for a creature to have both
409 * stand still and a movement type set. 408 * stand still and a movement type set.
668 return 1; 667 return 1;
669 668
670 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 669 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
671 { 670 {
672 op->remove (); 671 op->remove ();
673 op->destroy (0); 672 op->destroy ();
674 return 1; 673 return 1;
675 } 674 }
676 return 0; 675 return 0;
677} 676}
678 677

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines