ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/map-world.ext
(Generate patch)

Comparing deliantra/server/ext/map-world.ext (file contents):
Revision 1.15 by root, Thu Feb 15 03:19:02 2007 UTC vs.
Revision 1.20 by root, Sat Apr 14 07:22:59 2007 UTC

67} 67}
68 68
69sub load_gridmap($) { 69sub load_gridmap($) {
70 my ($path) = @_; 70 my ($path) = @_;
71 71
72 if (! -e "/tmp/xxxx.gridmap") { 72# if (! -e "/tmp/xxxx.gridmap") {
73 0 < aio_load "$path/gridmap.meta", my $map 73 0 < aio_load "$path/gridmap.meta", my $map
74 or cf::cleanup "$path/gridmap.meta: $!\n"; 74 or cf::cleanup "$path/gridmap.meta: $!\n";
75 75
76 $map = cf::from_json $map; 76 $map = cf::from_json $map;
77 77
79 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 79 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
80 80
81 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; 81 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
82 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size; 82 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
83 83
84 Storable::nstore $map, "/tmp/xxxx.gridmap";#d# 84# Storable::nstore $map, "/tmp/xxxx.gridmap" if 0;#d#
85 85
86 $map 86 $map
87 } else { 87# } else {
88 Storable::retrieve "/tmp/xxxx.gridmap"; 88# Storable::retrieve "/tmp/xxxx.gridmap";
89 } 89# }
90} 90}
91 91
92# this is contorted, but likely the correct way to acquire the lock :) 92# this is contorted, but likely the correct way to acquire the lock :)
93cf::sync_job { 93cf::sync_job {
94 my $guard = cf::lock_acquire "ext::world_gridmap"; 94 my $guard = cf::lock_acquire "ext::world_gridmap";
118 $self->height ($WORLD->{tile_h}); 118 $self->height ($WORLD->{tile_h});
119 119
120 $self->name ("'The World' at +$x+$y"); 120 $self->name ("'The World' at +$x+$y");
121 $self->msg ("worldmap dynamically created by map-world extension"); 121 $self->msg ("worldmap dynamically created by map-world extension");
122 $self->outdoor (1); 122 $self->outdoor (1);
123 $self->default_region (undef); 123 $self->default_region (cf::region::find "wilderness");
124 124
125 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 125 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0;
126 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999; 126 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
127 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999; 127 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
128 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0; 128 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines