| … | |
… | |
| 1842 | |
1842 | |
| 1843 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1843 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
| 1844 | } |
1844 | } |
| 1845 | |
1845 | |
| 1846 | # also paths starting with '/' |
1846 | # also paths starting with '/' |
| 1847 | $EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; |
1847 | $EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}]; |
| 1848 | |
1848 | |
| 1849 | sub thawer_merge { |
1849 | sub thawer_merge { |
| 1850 | my ($self, $merge) = @_; |
1850 | my ($self, $merge) = @_; |
| 1851 | |
1851 | |
| 1852 | # we have to keep some variables in memory intact |
1852 | # we have to keep some variables in memory intact |
| … | |
… | |
| 2343 | |
2343 | |
| 2344 | delete $cf::MAP{$self->path}; |
2344 | delete $cf::MAP{$self->path}; |
| 2345 | |
2345 | |
| 2346 | $self->unlink_save; |
2346 | $self->unlink_save; |
| 2347 | |
2347 | |
| 2348 | bless $self, "cf::map"; |
2348 | bless $self, "cf::map::wrap"; |
| 2349 | delete $self->{deny_reset}; |
2349 | delete $self->{deny_reset}; |
| 2350 | $self->{deny_save} = 1; |
2350 | $self->{deny_save} = 1; |
| 2351 | $self->reset_timeout (1); |
2351 | $self->reset_timeout (1); |
| 2352 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2352 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
| 2353 | |
2353 | |
| … | |
… | |
| 2657 | |
2657 | |
| 2658 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2658 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
| 2659 | $self->enter_map ($map, $x, $y); |
2659 | $self->enter_map ($map, $x, $y); |
| 2660 | |
2660 | |
| 2661 | # only activate afterwards, to support waiting in hooks |
2661 | # only activate afterwards, to support waiting in hooks |
| 2662 | $self->activate_recursive; |
2662 | $self->activate_recursive |
|
|
2663 | unless exists $self->{_link_pos}; # maybe we re in-flight again |
| 2663 | } |
2664 | } |
| 2664 | |
2665 | |
| 2665 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2666 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
| 2666 | |
2667 | |
| 2667 | Moves the player to the given map-path and coordinates by first freezing |
2668 | Moves the player to the given map-path and coordinates by first freezing |
