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.33 by root, Tue Apr 15 14:21:04 2008 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;
145 if ($self->{load_path}) { 145 if ($self->{load_path}) {
146 $self->SUPER::load; 146 $self->SUPER::load;
147 } else { 147 } else {
148 $self->alloc; 148 $self->alloc;
149 $self->fill; 149 $self->fill;
150 $self->in_memory (cf::MAP_IN_MEMORY); 150 $self->in_memory (cf::MAP_ACTIVE);
151 $self->activate; 151 $self->activate;
152 } 152 }
153} 153}
154 154
155sub post_load { 155sub post_load {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines