… | |
… | |
785 | } |
785 | } |
786 | } else { |
786 | } else { |
787 | aio_unlink $filename; |
787 | aio_unlink $filename; |
788 | aio_unlink "$filename.pst"; |
788 | aio_unlink "$filename.pst"; |
789 | } |
789 | } |
790 | |
|
|
791 | #d##TODO# nuke non .map-files if exist |
|
|
792 | if ($filename =~ s/\.map$//) { |
|
|
793 | aio_unlink $filename; |
|
|
794 | aio_unlink "$filename.pst"; |
|
|
795 | } |
|
|
796 | } |
790 | } |
797 | } |
791 | } |
798 | |
792 | |
799 | sub object_freezer_as_string { |
793 | sub object_freezer_as_string { |
800 | my ($rdata, $objs) = @_; |
794 | my ($rdata, $objs) = @_; |
… | |
… | |
806 | |
800 | |
807 | sub object_thawer_load { |
801 | sub object_thawer_load { |
808 | my ($filename) = @_; |
802 | my ($filename) = @_; |
809 | |
803 | |
810 | my ($data, $av); |
804 | my ($data, $av); |
811 | |
|
|
812 | #d#TODO remove .map if file does not exist |
|
|
813 | aio_stat $filename and $filename =~ s/\.map$//; |
|
|
814 | |
805 | |
815 | (aio_load $filename, $data) >= 0 |
806 | (aio_load $filename, $data) >= 0 |
816 | or return; |
807 | or return; |
817 | |
808 | |
818 | unless (aio_stat "$filename.pst") { |
809 | unless (aio_stat "$filename.pst") { |
… | |
… | |
1305 | my ($self) = @_; |
1296 | my ($self) = @_; |
1306 | |
1297 | |
1307 | utf8::encode (my $save = $self->save_path); |
1298 | utf8::encode (my $save = $self->save_path); |
1308 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1299 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1309 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
1300 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
1310 | |
|
|
1311 | #d#TODO remove .map and also nuke |
|
|
1312 | $save =~ s/\.map// or return;#d# |
|
|
1313 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d# |
|
|
1314 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d# |
|
|
1315 | } |
1301 | } |
1316 | |
1302 | |
1317 | sub load_header_from($) { |
1303 | sub load_header_from($) { |
1318 | my ($self, $path) = @_; |
1304 | my ($self, $path) = @_; |
1319 | |
1305 | |
… | |
… | |
1818 | $map->load; |
1804 | $map->load; |
1819 | $map->load_diag; |
1805 | $map->load_diag; |
1820 | |
1806 | |
1821 | return unless $self->contr->active; |
1807 | return unless $self->contr->active; |
1822 | $self->activate_recursive; |
1808 | $self->activate_recursive; |
|
|
1809 | |
|
|
1810 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1823 | $self->enter_map ($map, $x, $y); |
1811 | $self->enter_map ($map, $x, $y); |
1824 | } |
1812 | } |
1825 | |
1813 | |
1826 | cf::player->attach ( |
1814 | cf::player->attach ( |
1827 | on_logout => sub { |
1815 | on_logout => sub { |
… | |
… | |
1840 | # try to abort aborted map switching on player login :) |
1828 | # try to abort aborted map switching on player login :) |
1841 | # should happen only on crashes |
1829 | # should happen only on crashes |
1842 | if ($pl->ob->{_link_pos}) { |
1830 | if ($pl->ob->{_link_pos}) { |
1843 | $pl->ob->enter_link; |
1831 | $pl->ob->enter_link; |
1844 | (async { |
1832 | (async { |
1845 | # we need this sleep as the login has a concurrent enter_exit running |
|
|
1846 | # and this sleep increases chances of the player not ending up in scorn |
|
|
1847 | $pl->ob->reply (undef, |
1833 | $pl->ob->reply (undef, |
1848 | "There was an internal problem at your last logout, " |
1834 | "There was an internal problem at your last logout, " |
1849 | . "the server will try to bring you to your intended destination in a second.", |
1835 | . "the server will try to bring you to your intended destination in a second.", |
1850 | cf::NDI_RED); |
1836 | cf::NDI_RED); |
|
|
1837 | # we need this sleep as the login has a concurrent enter_exit running |
|
|
1838 | # and this sleep increases chances of the player not ending up in scorn |
1851 | Coro::Timer::sleep 1; |
1839 | Coro::Timer::sleep 1; |
1852 | $pl->ob->leave_link; |
1840 | $pl->ob->leave_link; |
1853 | })->prio (2); |
1841 | })->prio (2); |
1854 | } |
1842 | } |
1855 | }, |
1843 | }, |