| … | |
… | |
| 1151 | |
1151 | |
| 1152 | # also paths starting with '/' |
1152 | # also paths starting with '/' |
| 1153 | $EXT_MAP{"cf::map"} = qr{^(?=/)}; |
1153 | $EXT_MAP{"cf::map"} = qr{^(?=/)}; |
| 1154 | |
1154 | |
| 1155 | sub thawer_merge { |
1155 | sub thawer_merge { |
|
|
1156 | my ($self, $merge) = @_; |
|
|
1157 | |
| 1156 | # we have to keep some variables in memory intact |
1158 | # we have to keep some variables in memory intact |
| 1157 | local $_[0]{path}; |
1159 | local $self->{path}; |
|
|
1160 | local $self->{load_path}; |
| 1158 | local $_[0]{deny_save}; |
1161 | local $self->{deny_save}; |
| 1159 | local $_[0]{deny_reset}; |
1162 | local $self->{deny_reset}; |
| 1160 | |
1163 | |
| 1161 | $_[0]->SUPER::thawer_merge ($_[1]); |
1164 | $self->SUPER::thawer_merge ($merge); |
| 1162 | } |
1165 | } |
| 1163 | |
1166 | |
| 1164 | sub normalise { |
1167 | sub normalise { |
| 1165 | my ($path, $base) = @_; |
1168 | my ($path, $base) = @_; |
| 1166 | |
1169 | |
| … | |
… | |
| 1336 | |
1339 | |
| 1337 | $map->load_header |
1340 | $map->load_header |
| 1338 | or return; |
1341 | or return; |
| 1339 | |
1342 | |
| 1340 | if ($map->should_reset) { |
1343 | if ($map->should_reset) { |
|
|
1344 | $cf::WAIT_FOR_TICK->wait; |
| 1341 | $map->reset; |
1345 | $map->reset; |
| 1342 | undef $guard; |
1346 | undef $guard; |
| 1343 | $map = find $path |
1347 | $map = find $path |
| 1344 | or return; |
1348 | or return; |
| 1345 | } |
1349 | } |
