| … | |
… | |
| 1436 | if (length $@) { |
1436 | if (length $@) { |
| 1437 | warn "$v->{path}: $@\n"; |
1437 | warn "$v->{path}: $@\n"; |
| 1438 | |
1438 | |
| 1439 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1439 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
| 1440 | if exists $v->{meta}{mandatory}; |
1440 | if exists $v->{meta}{mandatory}; |
|
|
1441 | |
|
|
1442 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
|
|
1443 | delete $todo{$k}; |
| 1441 | } else { |
1444 | } else { |
| 1442 | $done{$k} = delete $todo{$k}; |
1445 | $done{$k} = delete $todo{$k}; |
| 1443 | push @EXTS, $v->{pkg}; |
1446 | push @EXTS, $v->{pkg}; |
| 1444 | $progress = 1; |
1447 | $progress = 1; |
| 1445 | |
1448 | |
| … | |
… | |
| 2212 | $MAP_PREFETCHER->prio (6); |
2215 | $MAP_PREFETCHER->prio (6); |
| 2213 | |
2216 | |
| 2214 | () |
2217 | () |
| 2215 | } |
2218 | } |
| 2216 | |
2219 | |
|
|
2220 | # common code, used by both ->save and ->swapout |
| 2217 | sub save { |
2221 | sub _save { |
| 2218 | my ($self) = @_; |
2222 | my ($self) = @_; |
| 2219 | |
|
|
| 2220 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
| 2221 | |
2223 | |
| 2222 | $self->{last_save} = $cf::RUNTIME; |
2224 | $self->{last_save} = $cf::RUNTIME; |
| 2223 | |
2225 | |
| 2224 | return unless $self->dirty; |
2226 | return unless $self->dirty; |
| 2225 | |
2227 | |
| … | |
… | |
| 2245 | } else { |
2247 | } else { |
| 2246 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); |
2248 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); |
| 2247 | } |
2249 | } |
| 2248 | } |
2250 | } |
| 2249 | |
2251 | |
|
|
2252 | sub save { |
|
|
2253 | my ($self) = @_; |
|
|
2254 | |
|
|
2255 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2256 | |
|
|
2257 | $self->_save; |
|
|
2258 | } |
|
|
2259 | |
| 2250 | sub swap_out { |
2260 | sub swap_out { |
| 2251 | my ($self) = @_; |
2261 | my ($self) = @_; |
| 2252 | |
2262 | |
| 2253 | # save first because save cedes |
|
|
| 2254 | $self->save; |
|
|
| 2255 | |
|
|
| 2256 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2263 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
| 2257 | |
2264 | |
| 2258 | return if $self->players; |
|
|
| 2259 | return if $self->in_memory != cf::MAP_ACTIVE; |
2265 | return if $self->in_memory != cf::MAP_ACTIVE; |
| 2260 | return if $self->{deny_save}; |
2266 | return if $self->{deny_save}; |
|
|
2267 | return if $self->players; |
| 2261 | |
2268 | |
| 2262 | $self->in_memory (cf::MAP_SWAPPED); |
2269 | # first deactivate the map and "unlink" it from the core |
| 2263 | |
|
|
| 2264 | $self->deactivate; |
2270 | $self->deactivate; |
| 2265 | $_->clear_links_to ($self) for values %cf::MAP; |
2271 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2272 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2273 | |
|
|
2274 | # then atomically save |
|
|
2275 | $self->_save; |
|
|
2276 | |
|
|
2277 | # then free the map |
| 2266 | $self->clear; |
2278 | $self->clear; |
| 2267 | } |
2279 | } |
| 2268 | |
2280 | |
| 2269 | sub reset_at { |
2281 | sub reset_at { |
| 2270 | my ($self) = @_; |
2282 | my ($self) = @_; |
| … | |
… | |
| 2599 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2611 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
| 2600 | |
2612 | |
| 2601 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2613 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
| 2602 | if $self->map && $self->map->{path} ne "{link}"; |
2614 | if $self->map && $self->map->{path} ne "{link}"; |
| 2603 | |
2615 | |
| 2604 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
2616 | $self->enter_map ($LINK_MAP || link_map, 3, 3); |
| 2605 | } |
2617 | } |
| 2606 | |
2618 | |
| 2607 | sub cf::object::player::leave_link { |
2619 | sub cf::object::player::leave_link { |
| 2608 | my ($self, $map, $x, $y) = @_; |
2620 | my ($self, $map, $x, $y) = @_; |
| 2609 | |
2621 | |
| … | |
… | |
| 3776 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
3788 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
| 3777 | for my $name (keys %$leaf_symtab) { |
3789 | for my $name (keys %$leaf_symtab) { |
| 3778 | _gv_clear *{"$pkg$name"}; |
3790 | _gv_clear *{"$pkg$name"}; |
| 3779 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
3791 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
| 3780 | } |
3792 | } |
| 3781 | warn "cleared package $pkg\n";#d# |
|
|
| 3782 | } |
3793 | } |
| 3783 | |
3794 | |
| 3784 | sub do_reload_perl() { |
3795 | sub do_reload_perl() { |
| 3785 | # can/must only be called in main |
3796 | # can/must only be called in main |
| 3786 | if ($Coro::current != $Coro::main) { |
3797 | if ($Coro::current != $Coro::main) { |
