--- deliantra/server/ext/map-world.ext	2007/09/10 17:24:36	1.29
+++ deliantra/server/ext/map-world.ext	2008/09/23 05:01:41	1.35
@@ -6,6 +6,8 @@
 # - saves temporary space (only overlay stuff needs to be saved)
 # - might get reused as a generic tiled map
 
+cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
+
 use Coro::Handle;
 use Coro::AIO;
 
@@ -65,7 +67,7 @@
       1 => sub {
          my ($src) = @_;
 
-         my $map = cf::from_json $src->[0];
+         my $map = cf::decode_json $src->[0];
 
          my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
             or cf::cleanup "$path/gridmap.meta: empty gridmap?";
@@ -84,16 +86,17 @@
    warn "worldmap gridmap loaded.";
 }
 
-# this is contorted, but likely the correct way to acquire the lock :)
-cf::sync_job {
+{
    my $guard = cf::lock_acquire "ext::world_gridmap";
-   cf::async_ext {
-      reload;
-      undef $guard;
-   };
-};
 
-cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
+   cf::post_init {
+      cf::async_ext {
+         $Coro::current->{desc} = "worldmap loader";
+         reload;
+         undef $guard;
+      };
+   };
+}
 
 sub wxwy {
    $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
@@ -146,7 +149,7 @@
    } else {
       $self->alloc;
       $self->fill;
-      $self->in_memory (cf::MAP_IN_MEMORY);
+      $self->in_memory (cf::MAP_ACTIVE);
       $self->activate;
    }
 }