--- deliantra/server/ext/map-world.ext 2007/02/03 21:41:06 1.9 +++ deliantra/server/ext/map-world.ext 2007/02/11 01:38:47 1.11 @@ -69,18 +69,24 @@ sub load_gridmap($) { my ($path) = @_; - 0 < aio_load "$path/gridmap.meta", my $map - or cf::cleanup "$path/gridmap.meta: $!\n"; + if (! -e "/tmp/xxxx.gridmap") { + 0 < aio_load "$path/gridmap.meta", my $map + or cf::cleanup "$path/gridmap.meta: $!\n"; - $map = cf::from_json $map; + $map = cf::from_json $map; - my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} - or cf::cleanup "$path/gridmap.meta: empty gridmap?"; + my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} + or cf::cleanup "$path/gridmap.meta: empty gridmap?"; - ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; - ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size; + ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; + ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size; - $map + Storable::nstore $map, "/tmp/xxxx.gridmap";#d# + + $map + } else { + Storable::retrieve "/tmp/xxxx.gridmap"; + } } # this is contorted, but likely the correct way to acquire the lock :) @@ -116,10 +122,14 @@ $self->outdoor (1); $self->default_region (undef); - $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 > 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; $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;