--- deliantra/server/ext/map-world.ext 2007/02/03 21:41:06 1.9 +++ deliantra/server/ext/map-world.ext 2007/02/12 19:57:34 1.12 @@ -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 :) @@ -139,11 +145,12 @@ Coro::cede; for my $Y (0 .. $WORLD->{tile_h} - 1) { my $ob = cf::object::new "deep_sea"; + $ob->flag (cf::FLAG_NO_MAP_SAVE, 1); $self->insert ($ob, $X, $Y); } } $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1); - $self->default_region (cf::region::find "ocean"); + $self->default_region (cf::region::find "panthalassia"); $self->in_memory (cf::MAP_IN_MEMORY); }