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.9 by root, Sat Feb 3 21:41:06 2007 UTC vs.
Revision 1.11 by root, Sun Feb 11 01:38:47 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 0 < aio_load "$path/gridmap.meta", my $map 73 0 < aio_load "$path/gridmap.meta", my $map
73 or cf::cleanup "$path/gridmap.meta: $!\n"; 74 or cf::cleanup "$path/gridmap.meta: $!\n";
74 75
75 $map = cf::from_json $map; 76 $map = cf::from_json $map;
76 77
77 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} 78 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
78 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 79 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
79 80
80 ($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;
81 ($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;
82 83
84 Storable::nstore $map, "/tmp/xxxx.gridmap";#d#
85
83 $map 86 $map
87 } else {
88 Storable::retrieve "/tmp/xxxx.gridmap";
89 }
84} 90}
85 91
86# 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 :)
87cf::sync_job { 93cf::sync_job {
88 my $guard = cf::lock_acquire "ext::world_gridmap"; 94 my $guard = cf::lock_acquire "ext::world_gridmap";
114 $self->name ("'The World' at +$x+$y"); 120 $self->name ("'The World' at +$x+$y");
115 $self->msg ("worldmap dynamically created by map-world extension"); 121 $self->msg ("worldmap dynamically created by map-world extension");
116 $self->outdoor (1); 122 $self->outdoor (1);
117 $self->default_region (undef); 123 $self->default_region (undef);
118 124
119 $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;
120 $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;
121 $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;
122 $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;
129 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 100;
130 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 129;
131 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 129;
132 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 100;
123 133
124 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y 134 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
125 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 135 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
126 136
127 1 137 1

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines