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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.219 by root, Sat Feb 17 03:19:44 2007 UTC

… …
354 354
355 $coro 355 $coro
356} 356}
357 357
358sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
359 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
360 362
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 364 or return;
363 365
… …
785 } 787 }
786 } else { 788 } else {
787 aio_unlink $filename; 789 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
789 } 791 }
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 } 792 }
797} 793}
798 794
799sub object_freezer_as_string { 795sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 796 my ($rdata, $objs) = @_;
… …
806 802
807sub object_thawer_load { 803sub object_thawer_load {
808 my ($filename) = @_; 804 my ($filename) = @_;
809 805
810 my ($data, $av); 806 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 807
815 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
816 or return; 809 or return;
817 810
818 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1305 my ($self) = @_; 1298 my ($self) = @_;
1306 1299
1307 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 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} 1303}
1316 1304
1317sub load_header_from($) { 1305sub load_header_from($) {
1318 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1319 1307
… …
1818 $map->load; 1806 $map->load;
1819 $map->load_diag; 1807 $map->load_diag;
1820 1808
1821 return unless $self->contr->active; 1809 return unless $self->contr->active;
1822 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1824} 1814}
1825 1815
1826cf::player->attach ( 1816cf::player->attach (
1827 on_logout => sub { 1817 on_logout => sub {
… …
1840 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes 1831 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1844 (async { 1834 (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, 1835 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.", 1837 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED); 1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1851 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1853 })->prio (2); 1843 })->prio (2);
1854 } 1844 }
1855 }, 1845 },
… …
2254} 2244}
2255 2245
2256############################################################################# 2246#############################################################################
2257# the server's init and main functions 2247# the server's init and main functions
2258 2248
2259sub load_resources { 2249sub init_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d# 2251 or die "unable to load regions file\n";#d#
2262} 2252}
2263 2253
2264sub cfg_load { 2254sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2281 warn $@ if $@; 2271 warn $@ if $@;
2282 } 2272 }
2283} 2273}
2284 2274
2285sub init { 2275sub init {
2286 load_resources; 2276 init_resources;
2287} 2277}
2288 2278
2289sub main { 2279sub main {
2290 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2465 _global_reattach; 2455 _global_reattach;
2466 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2468 2458
2469 warn "loading reloadable resources"; 2459 warn "loading reloadable resources";
2470 load_resources; 2460 init_resources;
2471 2461
2472 warn "leaving sync_job"; 2462 warn "leaving sync_job";
2473 2463
2474 1 2464 1
2475 } or do { 2465 } or do {
… …
2532 Coro::async_pool { 2522 Coro::async_pool {
2533 write_runtime 2523 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2524 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2525 };
2536 } 2526 }
2537
2538 2527
2539 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541 2530
2542# my $AFTER = Event::time; 2531# my $AFTER = Event::time;

Diff Legend

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