ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

2176 $self->alloc; 2176 $self->alloc;
2177 2177
2178 $self->pre_load; 2178 $self->pre_load;
2179 cf::cede_to_tick; 2179 cf::cede_to_tick;
2180 2180
2181 if (exists $self->{load_path}) {
2181 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2182 $f->skip_block; 2183 $f->skip_block;
2183 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2184 or return; 2185 or return;
2185 2186
2186 $self->post_load_original 2187 $self->post_load_original
2187 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2188 2189
2189 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2190 utf8::encode $uniq; 2191 utf8::encode $uniq;
2191 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2192 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2193 $self->clear_unique_items; 2194 $self->clear_unique_items;
2194 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2195 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2196 } 2198 }
2197 } 2199 }
2198 }
2199 2200
2200 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2201 2203
2202 cf::cede_to_tick; 2204 cf::cede_to_tick;
2203 # now do the right thing for maps 2205 # now do the right thing for maps
2204 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2205 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines