--- deliantra/server/common/map.C	2011/05/04 07:36:40	1.204
+++ deliantra/server/common/map.C	2011/05/04 07:41:13	1.205
@@ -363,27 +363,27 @@
 void
 maptile::activate ()
 {
-  if (in_memory != MAP_INACTIVE)
+  if (state != MAP_INACTIVE)
     return;
 
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
     for (object *op = ms->bot; op; op = op->above)
       op->activate_recursive ();
 
-  in_memory = MAP_ACTIVE;
+  state = MAP_ACTIVE;
 }
 
 void
 maptile::deactivate ()
 {
-  if (in_memory != MAP_ACTIVE)
+  if (state != MAP_ACTIVE)
     return;
 
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
     for (object *op = ms->bot; op; op = op->above)
       op->deactivate_recursive ();
 
-  in_memory = MAP_INACTIVE;
+  state = MAP_INACTIVE;
 }
 
 bool
@@ -437,7 +437,7 @@
 void
 maptile::init ()
 {
-  in_memory = MAP_SWAPPED;
+  state = MAP_SWAPPED;
 
   /* The maps used to pick up default x and y values from the
    * map archetype. Mimic that behaviour.