--- deliantra/server/ext/map-world.ext 2007/02/16 19:43:41 1.16 +++ deliantra/server/ext/map-world.ext 2007/04/17 20:41:15 1.21 @@ -43,13 +43,10 @@ or die "convert: $!"; binmode $fh; - binmode $fh; $size * 3 == read $fh, my $data, $size * 3 or die "$path.png, expected $size rgb triplets: $!"; - $data =~ s{(...)}{ - $plt{$1} or die "$path.png: color not in palette: #" . unpack "H*", $1 - }sge; + cf::_quantise $data, [map "$_$plt{$_}", keys %plt]; binmode STDOUT; syswrite STDOUT, $data; @@ -69,7 +66,7 @@ sub load_gridmap($) { my ($path) = @_; - if (1 || ! -e "/tmp/xxxx.gridmap") { +# if (! -e "/tmp/xxxx.gridmap") { 0 < aio_load "$path/gridmap.meta", my $map or cf::cleanup "$path/gridmap.meta: $!\n"; @@ -81,12 +78,12 @@ ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size; - Storable::nstore $map, "/tmp/xxxx.gridmap";#d# +# Storable::nstore $map, "/tmp/xxxx.gridmap" if 0;#d# $map - } else { - Storable::retrieve "/tmp/xxxx.gridmap"; - } +# } else { +# Storable::retrieve "/tmp/xxxx.gridmap"; +# } } # this is contorted, but likely the correct way to acquire the lock :) @@ -120,7 +117,7 @@ $self->name ("'The World' at +$x+$y"); $self->msg ("worldmap dynamically created by map-world extension"); $self->outdoor (1); - $self->default_region (undef); + $self->default_region (cf::region::find "wilderness"); $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;