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.248 by root, Mon Jul 14 23:47:06 2008 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC

910 || map->in_memory != MAP_ACTIVE 910 || map->in_memory != MAP_ACTIVE
911 || map->no_drop 911 || map->no_drop
912 || ms ().move_block == MOVE_ALL) 912 || ms ().move_block == MOVE_ALL)
913 { 913 {
914 while (inv) 914 while (inv)
915 {
916 inv->destroy_inv (false);
917 inv->destroy (); 915 inv->destroy (true);
918 }
919 } 916 }
920 else 917 else
921 { /* Put objects in inventory onto this space */ 918 { /* Put objects in inventory onto this space */
922 while (inv) 919 while (inv)
923 { 920 {
1551 1548
1552 return true; 1549 return true;
1553 } 1550 }
1554 else 1551 else
1555 { 1552 {
1556 destroy (1); 1553 destroy ();
1557 return false; 1554 return false;
1558 } 1555 }
1559} 1556}
1560 1557
1561/* 1558/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines