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.24 by root, Thu Jan 18 21:27:19 2007 UTC vs.
Revision 1.25 by elmex, Mon Apr 16 11:50:44 2007 UTC

446 } /* stand still */ 446 } /* stand still */
447 return 0; 447 return 0;
448 } /* no enemy */ 448 } /* no enemy */
449 449
450 /* We have an enemy. Block immediately below is for pets */ 450 /* We have an enemy. Block immediately below is for pets */
451 if ((op->attack_movement & HI4) == PETMOVE && (owner = op->owner) != NULL && !on_same_map (op, owner)) 451 if ((op->attack_movement & HI4) == PETMOVE
452 && (owner = op->owner) != NULL
453 && !on_same_map (op, owner)
454 && !owner->flag [FLAG_REMOVED])
452 return follow_owner (op, owner); 455 return follow_owner (op, owner);
453 456
454 /* doppleganger code to change monster facing to that of the nearest 457 /* doppleganger code to change monster facing to that of the nearest
455 * player. Hmm. The code is here, but no monster in the current 458 * player. Hmm. The code is here, but no monster in the current
456 * arch set uses it. 459 * arch set uses it.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines