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.31 by root, Wed Sep 19 21:56:30 2007 UTC vs.
Revision 1.38 by root, Thu Apr 29 07:32:34 2010 UTC

… …
65 "$path/gridmap.regn.png", 65 "$path/gridmap.regn.png",
66 ], 66 ],
67 1 => sub { 67 1 => sub {
68 my ($src) = @_; 68 my ($src) = @_;
69 69
70 my $map = cf::from_json $src->[0]; 70 my $map = cf::decode_json $src->[0];
71 71
72 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} 72 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
73 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 73 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
74 74
75 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; 75 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
… …
81 Coro::Storable::thaw $map 81 Coro::Storable::thaw $map
82} 82}
83 83
84sub reload() { 84sub reload() {
85 $WORLD = load_gridmap "$MAPDIR/world"; 85 $WORLD = load_gridmap "$MAPDIR/world";
86 warn "worldmap gridmap loaded."; 86 cf::trace "worldmap gridmap loaded.\n";
87} 87}
88 88
89# this is contorted, but likely the correct way to acquire the lock :) 89{
90cf::sync_job {
91 my $guard = cf::lock_acquire "ext::world_gridmap"; 90 my $guard = cf::lock_acquire "ext::world_gridmap";
91
92 cf::post_init {
92 cf::async_ext { 93 cf::async_ext {
93 $Coro::current->{desc} = "worldmap loader"; 94 $Coro::current->{desc} = "worldmap loader";
94 reload; 95 reload;
95 undef $guard; 96 undef $guard;
97 };
96 }; 98 };
97}; 99}
98 100
99sub wxwy { 101sub wxwy {
100 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 102 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
101 ? ($1, $2) 103 ? ($1, $2)
102 : (0, 0) 104 : (0, 0)
… …
133} 135}
134 136
135sub fill { 137sub fill {
136 my ($self) = @_; 138 my ($self) = @_;
137 139
138 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt}); 140 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});#d#
139 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]); 141 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]);
140} 142}
141 143
142sub load { 144sub load {
143 my ($self) = @_; 145 my ($self) = @_;
… …
145 if ($self->{load_path}) { 147 if ($self->{load_path}) {
146 $self->SUPER::load; 148 $self->SUPER::load;
147 } else { 149 } else {
148 $self->alloc; 150 $self->alloc;
149 $self->fill; 151 $self->fill;
150 $self->in_memory (cf::MAP_IN_MEMORY); 152 $self->in_memory (cf::MAP_ACTIVE);
151 $self->activate; 153 $self->activate;
152 } 154 }
153} 155}
154 156
155sub post_load { 157sub post_load {

Diff Legend

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