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.195 by root, Fri Jan 26 20:59:57 2007 UTC vs.
Revision 1.196 by root, Sat Jan 27 23:59:29 2007 UTC

1380sub post_load { } 1380sub post_load { }
1381 1381
1382sub load { 1382sub load {
1383 my ($self) = @_; 1383 my ($self) = @_;
1384 1384
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1385 my $path = $self->{path}; 1387 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1388 my $guard = cf::lock_acquire "map_load:$path";
1387 1389
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1389 1391
1731=cut 1733=cut
1732 1734
1733sub link_map { 1735sub link_map {
1734 unless ($LINK_MAP) { 1736 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1737 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1739 $LINK_MAP->load;
1738 } 1740 }
1739 1741
1740 $LINK_MAP 1742 $LINK_MAP
1741} 1743}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines