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.345 by root, Sun May 1 16:58:15 2011 UTC vs.
Revision 1.346 by root, Wed May 4 07:36:40 2011 UTC

898 * if some form of movement is allowed, let objects 898 * if some form of movement is allowed, let objects
899 * drop on that space. 899 * drop on that space.
900 */ 900 */
901 if (!drop_to_ground 901 if (!drop_to_ground
902 || !map 902 || !map
903 || map->in_memory != MAP_ACTIVE 903 || !map->linkable ()
904 || map->no_drop 904 || map->no_drop
905 || ms ().move_block == MOVE_ALL) 905 || ms ().move_block == MOVE_ALL)
906 { 906 {
907 while (inv) 907 while (inv)
908 inv->destroy (); 908 inv->destroy ();
1198 1198
1199 above = 0; 1199 above = 0;
1200 below = 0; 1200 below = 0;
1201 1201
1202 ms.invalidate (); 1202 ms.invalidate ();
1203
1204 if (map->in_memory == MAP_SAVING)
1205 return;
1206 1203
1207 int check_walk_off = !flag [FLAG_NO_APPLY]; 1204 int check_walk_off = !flag [FLAG_NO_APPLY];
1208 1205
1209 if (object *pl = ms.player ()) 1206 if (object *pl = ms.player ())
1210 { 1207 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines