| … | |
… | |
| 8 | use Storable; |
8 | use Storable; |
| 9 | use Opcode; |
9 | use Opcode; |
| 10 | use Safe; |
10 | use Safe; |
| 11 | use Safe::Hole; |
11 | use Safe::Hole; |
| 12 | |
12 | |
| 13 | use Coro 3.4 (); |
13 | use Coro 3.5 (); |
| 14 | use Coro::Event; |
14 | use Coro::Event; |
| 15 | use Coro::Timer; |
15 | use Coro::Timer; |
| 16 | use Coro::Signal; |
16 | use Coro::Signal; |
| 17 | use Coro::Semaphore; |
17 | use Coro::Semaphore; |
| 18 | use Coro::AIO; |
18 | use Coro::AIO; |
| … | |
… | |
| 1176 | } |
1176 | } |
| 1177 | |
1177 | |
| 1178 | sub normalise { |
1178 | sub normalise { |
| 1179 | my ($path, $base) = @_; |
1179 | my ($path, $base) = @_; |
| 1180 | |
1180 | |
|
|
1181 | $path = "$path"; # make sure its a string |
|
|
1182 | |
| 1181 | # map plan: |
1183 | # map plan: |
| 1182 | # |
1184 | # |
| 1183 | # /! non-realised random map exit (special hack!) |
1185 | # /! non-realised random map exit (special hack!) |
| 1184 | # {... are special paths that are not being touched |
1186 | # {... are special paths that are not being touched |
| 1185 | # ?xxx/... are special absolute paths |
1187 | # ?xxx/... are special absolute paths |
| … | |
… | |
| 1221 | $self->init; # pass $1 etc. |
1223 | $self->init; # pass $1 etc. |
| 1222 | return $self; |
1224 | return $self; |
| 1223 | } |
1225 | } |
| 1224 | } |
1226 | } |
| 1225 | |
1227 | |
| 1226 | Carp::carp "unable to resolve path '$path'."; |
1228 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
| 1227 | () |
1229 | () |
| 1228 | } |
1230 | } |
| 1229 | |
1231 | |
| 1230 | sub init { |
1232 | sub init { |
| 1231 | my ($self) = @_; |
1233 | my ($self) = @_; |
| … | |
… | |
| 1360 | $map->{last_save} = $cf::RUNTIME; |
1362 | $map->{last_save} = $cf::RUNTIME; |
| 1361 | |
1363 | |
| 1362 | $map->load_header |
1364 | $map->load_header |
| 1363 | or return; |
1365 | or return; |
| 1364 | |
1366 | |
| 1365 | if ($map->should_reset) { |
1367 | if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) |
| 1366 | # doing this can freeze the server in a sync job, obviously |
1368 | # doing this can freeze the server in a sync job, obviously |
| 1367 | #$cf::WAIT_FOR_TICK->wait; |
1369 | #$cf::WAIT_FOR_TICK->wait; |
| 1368 | $map->reset; |
1370 | $map->reset; |
| 1369 | undef $guard; |
1371 | undef $guard; |
| 1370 | $map = find $path |
1372 | return find $path; |
| 1371 | or return; |
|
|
| 1372 | } |
1373 | } |
| 1373 | |
1374 | |
| 1374 | $cf::MAP{$path} = $map |
1375 | $cf::MAP{$path} = $map |
| 1375 | } |
1376 | } |
| 1376 | } |
1377 | } |
| … | |
… | |
| 1747 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1748 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
| 1748 | |
1749 | |
| 1749 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1750 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
| 1750 | if $self->map; |
1751 | if $self->map; |
| 1751 | |
1752 | |
| 1752 | $self->enter_map ($LINK_MAP || link_map, 20, 20); |
1753 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
| 1753 | } |
1754 | } |
| 1754 | |
1755 | |
| 1755 | sub cf::object::player::leave_link { |
1756 | sub cf::object::player::leave_link { |
| 1756 | my ($self, $map, $x, $y) = @_; |
1757 | my ($self, $map, $x, $y) = @_; |
| 1757 | |
1758 | |
| … | |
… | |
| 1898 | sub cf::object::player::enter_exit { |
1899 | sub cf::object::player::enter_exit { |
| 1899 | my ($self, $exit) = @_; |
1900 | my ($self, $exit) = @_; |
| 1900 | |
1901 | |
| 1901 | return unless $self->type == cf::PLAYER; |
1902 | return unless $self->type == cf::PLAYER; |
| 1902 | |
1903 | |
|
|
1904 | if ($exit->slaying eq "/!") { |
|
|
1905 | #TODO: this should de-fi-ni-te-ly not be a sync-job |
|
|
1906 | cf::sync_job { prepare_random_map $exit }; |
|
|
1907 | } |
|
|
1908 | |
|
|
1909 | my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
|
|
1910 | my $hp = $exit->stats->hp; |
|
|
1911 | my $sp = $exit->stats->sp; |
|
|
1912 | |
| 1903 | $self->enter_link; |
1913 | $self->enter_link; |
| 1904 | |
1914 | |
| 1905 | (async { |
1915 | (async { |
| 1906 | $self->deactivate_recursive; # just to be sure |
1916 | $self->deactivate_recursive; # just to be sure |
| 1907 | unless (eval { |
1917 | unless (eval { |
| 1908 | prepare_random_map $exit |
1918 | $self->goto ($slaying, $hp, $sp); |
| 1909 | if $exit->slaying eq "/!"; |
|
|
| 1910 | |
|
|
| 1911 | my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path; |
|
|
| 1912 | $self->goto ($path, $exit->stats->hp, $exit->stats->sp); |
|
|
| 1913 | |
1919 | |
| 1914 | 1; |
1920 | 1; |
| 1915 | }) { |
1921 | }) { |
| 1916 | $self->message ("Something went wrong deep within the crossfire server. " |
1922 | $self->message ("Something went wrong deep within the crossfire server. " |
| 1917 | . "I'll try to bring you back to the map you were before. " |
1923 | . "I'll try to bring you back to the map you were before. " |
