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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.20 by root, Fri Sep 8 18:26:22 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.19 2006/09/08 17:14:07 root Exp $"; 3 * "$Id: object.C,v 1.20 2006/09/08 18:26:22 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
816 update_now=1; 816 update_now=1;
817 817
818 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) 818 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
819 update_now=1; 819 update_now=1;
820 820
821 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
822 update_now=1;
823
821 if ((move_on | op->move_on) != move_on) update_now=1; 824 if ((move_on | op->move_on) != move_on) update_now=1;
825
822 if ((move_off | op->move_off) != move_off) update_now=1; 826 if ((move_off | op->move_off) != move_off) update_now=1;
827
823 /* This isn't perfect, but I don't expect a lot of objects to 828 /* This isn't perfect, but I don't expect a lot of objects to
824 * to have move_allow right now. 829 * to have move_allow right now.
825 */ 830 */
826 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 831 if (((move_block | op->move_block) & ~op->move_allow) != move_block)
827 update_now=1; 832 update_now=1;
833
828 if ((move_slow | op->move_slow) != move_slow) update_now=1; 834 if ((move_slow | op->move_slow) != move_slow)
835 update_now=1;
829 } 836 }
830 /* if the object is being removed, we can't make intelligent 837 /* if the object is being removed, we can't make intelligent
831 * decisions, because remove_ob can't really pass the object 838 * decisions, because remove_ob can't really pass the object
832 * that is being removed. 839 * that is being removed.
833 */ 840 */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines