ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.218 by root, Sat Feb 17 01:58:55 2007 UTC

… …
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
799sub object_freezer_as_string { 793sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 794 my ($rdata, $objs) = @_;
… …
806 800
807sub object_thawer_load { 801sub 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
1317sub load_header_from($) { 1303sub 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
1826cf::player->attach ( 1814cf::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 },
… …
2254} 2242}
2255 2243
2256############################################################################# 2244#############################################################################
2257# the server's init and main functions 2245# the server's init and main functions
2258 2246
2259sub load_resources { 2247sub init_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2248 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d# 2249 or die "unable to load regions file\n";#d#
2262} 2250}
2263 2251
2264sub cfg_load { 2252sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2253 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2281 warn $@ if $@; 2269 warn $@ if $@;
2282 } 2270 }
2283} 2271}
2284 2272
2285sub init { 2273sub init {
2286 load_resources; 2274 init_resources;
2287} 2275}
2288 2276
2289sub main { 2277sub main {
2290 # we must not ever block the main coroutine 2278 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2279 local $Coro::idle = sub {
… …
2465 _global_reattach; 2453 _global_reattach;
2466 warn "reattaching attachments to maps"; 2454 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2468 2456
2469 warn "loading reloadable resources"; 2457 warn "loading reloadable resources";
2470 load_resources; 2458 init_resources;
2471 2459
2472 warn "leaving sync_job"; 2460 warn "leaving sync_job";
2473 2461
2474 1 2462 1
2475 } or do { 2463 } or do {
… …
2532 Coro::async_pool { 2520 Coro::async_pool {
2533 write_runtime 2521 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2522 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2523 };
2536 } 2524 }
2537
2538 2525
2539 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541 2528
2542# my $AFTER = Event::time; 2529# my $AFTER = Event::time;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines