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.8 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.12 by root, Mon Feb 12 19:57:34 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;
123 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 100;
124 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 129;
125 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 129;
126 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 100;
127 129
128 $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", cf::datadir, cf::mapdir, $x, $y
129 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 131 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
130 132
131 1 133 1
… …
141 143
142 for my $X (0 .. $WORLD->{tile_w} - 1) { 144 for my $X (0 .. $WORLD->{tile_w} - 1) {
143 Coro::cede; 145 Coro::cede;
144 for my $Y (0 .. $WORLD->{tile_h} - 1) { 146 for my $Y (0 .. $WORLD->{tile_h} - 1) {
145 my $ob = cf::object::new "deep_sea"; 147 my $ob = cf::object::new "deep_sea";
148 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
146 $self->insert ($ob, $X, $Y); 149 $self->insert ($ob, $X, $Y);
147 } 150 }
148 } 151 }
149 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1); 152 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
153 $self->default_region (cf::region::find "panthalassia");
150 154
151 $self->in_memory (cf::MAP_IN_MEMORY); 155 $self->in_memory (cf::MAP_IN_MEMORY);
152 } 156 }
153} 157}
154 158

Diff Legend

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