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.22 by root, Wed Apr 18 14:24:09 2007 UTC vs.
Revision 1.26 by root, Sat Apr 21 16:56:32 2007 UTC

… …
78 78
79 Coro::Storable::thaw $map 79 Coro::Storable::thaw $map
80} 80}
81 81
82sub reload() { 82sub reload() {
83 $WORLD = load_gridmap sprintf "%s/%s/%s", cf::datadir, cf::mapdir, "world"; 83 $WORLD = load_gridmap "$MAPDIR/world";
84 warn "worldmap gridmap loaded."; 84 warn "worldmap gridmap loaded.";
85} 85}
86 86
87# this is contorted, but likely the correct way to acquire the lock :) 87# this is contorted, but likely the correct way to acquire the lock :)
88cf::sync_job { 88cf::sync_job {
89 my $guard = cf::lock_acquire "ext::world_gridmap"; 89 my $guard = cf::lock_acquire "ext::world_gridmap";
90 cf::async_ext { 90 cf::async_ext {
91 reload; 91 reload;
92 undef $guard; 92 undef $guard;
93 } 93 };
94}; 94};
95 95
96cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100); 96cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
97 97
98sub wxwy { 98sub wxwy {
… …
119 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 119 $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; 120 $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; 121 $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; 122 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
123 123
124 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d.map", cf::datadir, cf::mapdir, $x, $y 124 $self->{load_path} = sprintf "%s/world-overlay/world_%03d_%03d.map", $cf::MAPDIR, $x, $y
125 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 125 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
126
127 $self->{need_create_treasure} = 1;
126 128
127 1 129 1
128} 130}
129 131
130sub fill { 132sub fill {
… …
141 $self->SUPER::load; 143 $self->SUPER::load;
142 } else { 144 } else {
143 $self->alloc; 145 $self->alloc;
144 $self->fill; 146 $self->fill;
145 $self->in_memory (cf::MAP_IN_MEMORY); 147 $self->in_memory (cf::MAP_IN_MEMORY);
148 $self->activate;
146 } 149 }
147} 150}
148 151
149sub post_load { 152sub post_load {
150 my ($self) = @_; 153 my ($self) = @_;
151 154
155 {
152 my $guard = cf::lock_acquire "ext::world_gridmap"; 156 my $guard = cf::lock_acquire "ext::world_gridmap";
153 157
154 my ($x, $y) = $self->wxwy; 158 my ($x, $y) = $self->wxwy;
155 159
156 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 160 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
157 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 161 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
158 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 162 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
159 + ($x - 100) * $WORLD->{tile_w}; 163 + ($x - 100) * $WORLD->{tile_w};
160 164
161 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 165 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
162 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 166 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
163 167
164 } else { 168 } else {
165 $self->fill; 169 $self->fill;
170 }
166 } 171 }
172
173 $self->create_region_treasure
174 if delete $self->{need_create_treasure};
167} 175}
168 176
1691 1771
170 178

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines