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.572 by root, Sun May 8 11:44:43 2011 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC

2239 2239
2240 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2241 $self->decay_objects; 2241 $self->decay_objects;
2242 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2243 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2245 cf::cede_to_tick; 2244 cf::cede_to_tick;
2246 #$self->activate; # no longer activate maps automatically 2245 #$self->activate; # no longer activate maps automatically
2247 } 2246 }
2248 2247
2249 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2323sub find_async { 2322sub find_async {
2324 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2325 2324
2326 $path = normalise $path, $origin; 2325 $path = normalise $path, $origin;
2327 2326
2328 print "find async $path (from $origin)\n";#d#
2329
2330 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2331 return $map if !$load || $map->linkable; 2328 return $map if !$load || $map->linkable;
2332 } 2329 }
2333 2330
2334 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines