[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.203 by root, Sat Apr 23 04:56:46 2011 UTC vs.
Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC

 }
 void
 maptile::activate ()
 {
-  if (spaces)
+  if (in_memory != MAP_INACTIVE)
+    return;
-    for (mapspace *ms = spaces + size (); ms-- > spaces; )
+  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-      for (object *op = ms->bot; op; op = op->above)
+    for (object *op = ms->bot; op; op = op->above)
-        op->activate_recursive ();
+      op->activate_recursive ();
+  in_memory = MAP_ACTIVE;
 }
 void
 maptile::deactivate ()
 {
-  if (spaces)
+  if (in_memory != MAP_ACTIVE)
+    return;
-    for (mapspace *ms = spaces + size (); ms-- > spaces; )
+  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-      for (object *op = ms->bot; op; op = op->above)
+    for (object *op = ms->bot; op; op = op->above)
-        op->deactivate_recursive ();
+      op->deactivate_recursive ();
+  in_memory = MAP_INACTIVE;
 }
 bool
 maptile::_save_objects (object_freezer &f, int flags)
 {
 maptile::tile_available (int dir, bool load)
 {
   if (tile_path[dir])
     {
       // map is there and we don't need to load it OR it's loaded => return what we have
-      if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
+      if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
         return tile_map[dir];
       // well, try to locate it then, if possible - maybe it's there already
       if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
         return tile_map[dir];

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines