--- deliantra/server/ext/map-world.ext	2007/01/20 23:30:15	1.1
+++ deliantra/server/ext/map-world.ext	2007/01/26 20:59:57	1.7
@@ -33,20 +33,26 @@
 
    my ($x, $y) = $self->wxwy;
 
-   $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y >   0;
-   $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
-   $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;
+   $self->outdoor (1);
 
+   $self->name ("'The World' at +$x+$y");
    $self->msg ("worldmap dynamically created by map-world extension");
 
+#  $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y >   0;
+#  $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
+#  $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;
+   $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 100;
+   $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 129;
+   $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 129;
+   $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 100;
+
    #TODO: region
  
    $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
       if $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
           && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
 
-
    1
 }
 
@@ -56,6 +62,8 @@
    if ($self->{load_path}) {
       $self->SUPER::load;
    } else {
+      $self->alloc;
+
       for my $X (0 .. $WORLD->{tilew} - 1) {
          Coro::cede;
          for my $Y (0 .. $WORLD->{tileh} - 1) {
@@ -64,14 +72,20 @@
          }
       }
       $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
+
+      $self->in_memory (cf::MAP_IN_MEMORY);
    }
 }
 
-sub pre_load {
+sub post_load {
    my ($self) = @_;
 
    my ($x, $y) = $self->wxwy;
 
+   return
+      unless $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
+             && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
+
    my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew};
    my $top = ($y - $WORLD->{miny}) * $WORLD->{tileh} * $stride
               + ($x - $WORLD->{minx}) * $WORLD->{tilew};
@@ -80,12 +94,12 @@
       Coro::cede;
       my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew};
       for my $X (0 .. $WORLD->{tilew} - 1) {
+         next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
          my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X];
-         $self->insert ($ob, $X, $Y);
+         $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
+         $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
       }
    }
-
-   $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
 }
 
 1