--- deliantra/server/ext/map-world.ext	2011/04/22 06:19:07	1.42
+++ deliantra/server/ext/map-world.ext	2011/05/04 16:12:15	1.45
@@ -1,4 +1,4 @@
-#! perl # optional
+#! perl # mandatory
 
 # manages the worldmap by directing to other handlers
 
@@ -63,7 +63,6 @@
 
          last;
       }
-          
    }
 
    $self->SUPER::init;
@@ -120,18 +119,23 @@
    }
 }
 
-sub load {
-   my ($self) = @_;
-
-   if ($self->{load_path}) {
-      $self->SUPER::load;
-   } else {
-      $self->alloc;
-      $self->fill;
-      $self->in_memory (cf::MAP_ACTIVE);
-      $self->activate;
-   }
-}
+#sub load {
+#   my ($self) = @_;
+#
+#   if ($self->{load_path}) {
+#      warn "load $self\n";#d#
+#      $self->SUPER::load;
+#   } else {
+#      warn "fill $self\n";#d#
+#      my $guard = cf::lock_acquire "map_data:$self->{path}";
+#
+#      $self->alloc;
+#      $self->fill;
+#      $self->state (cf::MAP_ACTIVE);
+#      $self->activate;
+#      $self->post_load;
+#   }
+#}
 
 # MUST be overwritten to call at least ->fill
 sub post_load {