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.205 by root, Sun Apr 13 01:34:08 2008 UTC vs.
Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC

863 * if some form of movement is allowed, let objects 863 * if some form of movement is allowed, let objects
864 * drop on that space. 864 * drop on that space.
865 */ 865 */
866 if (!drop_to_ground 866 if (!drop_to_ground
867 || !map 867 || !map
868 || map->in_memory != MAP_IN_MEMORY 868 || map->in_memory != MAP_ACTIVE
869 || map->nodrop 869 || map->nodrop
870 || ms ().move_block == MOVE_ALL) 870 || ms ().move_block == MOVE_ALL)
871 { 871 {
872 while (inv) 872 while (inv)
873 { 873 {
935 freed_map->width = 3; 935 freed_map->width = 3;
936 freed_map->height = 3; 936 freed_map->height = 3;
937 freed_map->nodrop = 1; 937 freed_map->nodrop = 1;
938 938
939 freed_map->alloc (); 939 freed_map->alloc ();
940 freed_map->in_memory = MAP_IN_MEMORY; 940 freed_map->in_memory = MAP_ACTIVE;
941 } 941 }
942 942
943 map = freed_map; 943 map = freed_map;
944 x = 1; 944 x = 1;
945 y = 1; 945 y = 1;
1512 orig_ob->destroy (1); 1512 orig_ob->destroy (1);
1513 else if (!is_removed) 1513 else if (!is_removed)
1514 { 1514 {
1515 if (orig_ob->env != NULL) 1515 if (orig_ob->env != NULL)
1516 sub_weight (orig_ob->env, orig_ob->weight * nr); 1516 sub_weight (orig_ob->env, orig_ob->weight * nr);
1517 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1517 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1518 { 1518 {
1519 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1519 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1520 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1520 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1521 return NULL; 1521 return NULL;
1522 } 1522 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines