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.222 by root, Tue Mar 6 03:06:00 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") {
… …
1037=cut 1030=cut
1038 1031
1039sub quit_character { 1032sub quit_character {
1040 my ($pl) = @_; 1033 my ($pl) = @_;
1041 1034
1035 my $name = $pl->ob->name;
1036
1042 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1039
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1046 $pl->deactivate; 1041 $pl->deactivate;
… …
1050 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1055 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1057}
1058
1059=item $pl->kick
1060
1061Kicks a player out of the game. This destroys the connection.
1062
1063=cut
1064
1065sub kick {
1066 my ($pl, $kicker) = @_;
1067
1068 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1069 $pl->killer ("kicked");
1070 $pl->ns->destroy;
1056} 1071}
1057 1072
1058=item cf::player::list_logins 1073=item cf::player::list_logins
1059 1074
1060Returns am arrayref of all valid playernames in the system, can take a 1075Returns am arrayref of all valid playernames in the system, can take a
… …
1305 my ($self) = @_; 1320 my ($self) = @_;
1306 1321
1307 utf8::encode (my $save = $self->save_path); 1322 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1323 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1324 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} 1325}
1316 1326
1317sub load_header_from($) { 1327sub load_header_from($) {
1318 my ($self, $path) = @_; 1328 my ($self, $path) = @_;
1319 1329
… …
1818 $map->load; 1828 $map->load;
1819 $map->load_diag; 1829 $map->load_diag;
1820 1830
1821 return unless $self->contr->active; 1831 return unless $self->contr->active;
1822 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1824} 1836}
1825 1837
1826cf::player->attach ( 1838cf::player->attach (
1827 on_logout => sub { 1839 on_logout => sub {
… …
1840 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes 1853 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1844 (async { 1856 (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, 1857 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.", 1859 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED); 1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1851 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1853 })->prio (2); 1865 })->prio (2);
1854 } 1866 }
1855 }, 1867 },
… …
2254} 2266}
2255 2267
2256############################################################################# 2268#############################################################################
2257# the server's init and main functions 2269# the server's init and main functions
2258 2270
2259sub load_resources { 2271sub init_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d# 2273 or die "unable to load regions file\n";#d#
2262} 2274}
2263 2275
2264sub cfg_load { 2276sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2281 warn $@ if $@; 2293 warn $@ if $@;
2282 } 2294 }
2283} 2295}
2284 2296
2285sub init { 2297sub init {
2286 load_resources; 2298 init_resources;
2287} 2299}
2288 2300
2289sub main { 2301sub main {
2290 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
… …
2460 2472
2461 warn "loading extensions"; 2473 warn "loading extensions";
2462 cf::load_extensions; 2474 cf::load_extensions;
2463 2475
2464 warn "reattaching attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2465 _global_reattach; 2477 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 2478 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2480 warn "reattaching attachments to players";
2481 reattach $_ for values %PLAYER;
2468 2482
2469 warn "loading reloadable resources"; 2483 warn "loading reloadable resources";
2470 load_resources; 2484 init_resources;
2471 2485
2472 warn "leaving sync_job"; 2486 warn "leaving sync_job";
2473 2487
2474 1 2488 1
2475 } or do { 2489 } or do {
… …
2532 Coro::async_pool { 2546 Coro::async_pool {
2533 write_runtime 2547 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2548 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2549 };
2536 } 2550 }
2537
2538 2551
2539 $WAIT_FOR_TICK->broadcast; 2552 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2553 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541 2554
2542# my $AFTER = Event::time; 2555# my $AFTER = Event::time;

Diff Legend

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