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.16 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.17 by root, Mon Sep 4 17:27:13 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.16 2006/09/04 16:46:32 root Exp $"; 3 * "$Id: object.C,v 1.17 2006/09/04 17:27:13 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
911 } 911 }
912 912
913 if (ob->inv) 913 if (ob->inv)
914 { 914 {
915 /* Only if the space blocks everything do we not process - 915 /* Only if the space blocks everything do we not process -
916 * if some form of movemnt is allowed, let objects 916 * if some form of movement is allowed, let objects
917 * drop on that space. 917 * drop on that space.
918 */ 918 */
919 if (free_inventory || ob->map == NULL 919 if (free_inventory || ob->map == NULL
920 || ob->map->in_memory != MAP_IN_MEMORY 920 || ob->map->in_memory != MAP_IN_MEMORY
921 || (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL)) 921 || (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines