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.11 by root, Sun Feb 11 01:38:47 2007 UTC vs.
Revision 1.17 by root, Sat Feb 17 01:58:55 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 (1 || ! -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 }
… …
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 (undef);
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;
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;
133 129
134 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y 130 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d.map", cf::datadir, cf::mapdir, $x, $y
135 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 131 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
136 132
137 1 133 1
134}
135
136sub fill {
137 my ($self) = @_;
138
139 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});
140 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]);
138} 141}
139 142
140sub load { 143sub load {
141 my ($self) = @_; 144 my ($self) = @_;
142 145
143 if ($self->{load_path}) { 146 if ($self->{load_path}) {
144 $self->SUPER::load; 147 $self->SUPER::load;
145 } else { 148 } else {
146 $self->alloc; 149 $self->alloc;
147 150 $self->fill;
148 for my $X (0 .. $WORLD->{tile_w} - 1) {
149 Coro::cede;
150 for my $Y (0 .. $WORLD->{tile_h} - 1) {
151 my $ob = cf::object::new "deep_sea";
152 $self->insert ($ob, $X, $Y);
153 }
154 }
155 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
156 $self->default_region (cf::region::find "ocean");
157
158 $self->in_memory (cf::MAP_IN_MEMORY); 151 $self->in_memory (cf::MAP_IN_MEMORY);
159 } 152 }
160} 153}
161 154
162sub post_load { 155sub post_load {
… …
164 157
165 my $guard = cf::lock_acquire "ext::world_gridmap"; 158 my $guard = cf::lock_acquire "ext::world_gridmap";
166 159
167 my ($x, $y) = $self->wxwy; 160 my ($x, $y) = $self->wxwy;
168 161
169 return
170 unless $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 162 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
163 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
164 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
165 + ($x - 100) * $WORLD->{tile_w};
171 166
172 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 167 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
173 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 168 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
174 + ($x - 100) * $WORLD->{tile_w};
175 169
176 my $reg; 170 } else {
177 171 $self->fill;
178 for my $Y (0 .. $WORLD->{tile_h} - 1) {
179 Coro::cede;
180 my $row = substr $WORLD->{arc_data}, $top + $Y * $stride, $WORLD->{tile_w};
181 $reg .= substr $WORLD->{reg_data}, $top + $Y * $stride, $WORLD->{tile_w};
182 for my $X (0 .. $WORLD->{tile_w} - 1) {
183 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
184 my $ob = cf::object::new $WORLD->{arc_plt}[ord substr $row, $X];
185 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
186 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
187 }
188 } 172 }
189
190 $self->set_regiondata ($reg, $WORLD->{reg_plt});
191} 173}
192 174
1931 1751
194 176

Diff Legend

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