--- deliantra/server/ext/map-world.ext	2007/07/17 11:24:48	1.28
+++ deliantra/server/ext/map-world.ext	2010/04/29 07:32:34	1.38
@@ -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?";
@@ -81,19 +83,20 @@
 
 sub reload() {
    $WORLD = load_gridmap "$MAPDIR/world";
-   warn "worldmap gridmap loaded.";
+   cf::trace "worldmap gridmap loaded.\n";
 }
 
-# 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)$}
@@ -121,7 +124,7 @@
    $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
    $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x >   0;
 
-   my $overlay = sprintf "%s/world-overlay/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
+   my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
 
    $self->{load_path} = $overlay
       unless Coro::AIO::aio_stat $overlay;
@@ -134,7 +137,7 @@
 sub fill {
    my ($self) = @_;
 
-   $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});
+   $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});#d#
    $self->default_region (cf::region::find $WORLD->{reg_plt}[0]);
 }
 
@@ -146,7 +149,7 @@
    } else {
       $self->alloc;
       $self->fill;
-      $self->in_memory (cf::MAP_IN_MEMORY);
+      $self->in_memory (cf::MAP_ACTIVE);
       $self->activate;
    }
 }