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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 2007 UTC

1891 1891
1892 { 1892 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1894 1894
1895 return unless $self->valid; 1895 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1897
1898 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1899 1899
1900 $self->alloc; 1900 $self->alloc;
1901 1901
2073 2073
2074 return if $self->players; 2074 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2077 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2078 $self->deactivate; 2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2082 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2083}
2082 2084
2083sub reset_at { 2085sub reset_at {
2084 my ($self) = @_; 2086 my ($self) = @_;
2085 2087
2118 } 2120 }
2119 2121
2120 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2121 2123
2122 $self->deactivate; 2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2126 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2127
2127 $self->unlink_save; 2128 $self->unlink_save;
2128 $self->destroy; 2129 $self->destroy;
2129} 2130}
2130 2131

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines