ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.61 by root, Tue Jul 10 06:12:13 2007 UTC vs.
Revision 1.70 by root, Sun Sep 2 12:37:10 2007 UTC

… …
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
7 9
8# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
9sub nuke_str { 11sub nuke_str {
10 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
11} 13}
… …
53} 55}
54 56
55sub enter_map { 57sub enter_map {
56 my ($pl) = @_; 58 my ($pl) = @_;
57 59
60 my $ob = $pl->ob;
61
58 my ($map, $x, $y) 62 my ($map, $x, $y)
59 = $pl->ob->{_link_pos} 63 = $ob->{_link_pos}
60 ? @{delete $pl->ob->{_link_pos}} 64 ? @{delete $ob->{_link_pos}}
61 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 65 : ($pl->maplevel, $ob->x, $ob->y);
62 66
63 $pl->ob->enter_link; 67 $ob->enter_link;
64 68
65 if (my $time = delete $pl->{unclean_save}) { 69 if (my $time = delete $pl->{unclean_save}) {
66 if (my $m = cf::map::find $map) { 70 if (my $m = cf::map::find $map) {
67 if ($time < $m->{instantiate_time}) { 71 if ($time < $m->{instantiate_time}) {
68 # the map was reset in the meantime 72 # the map was reset in the meantime
69 my $age = $cf::RUNTIME - $time; 73 my $age = $cf::RUNTIME - $time;
74
70 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
71 76
72 # for now, just go back to savebed 77 # for now, just go back to savebed
73 ($map, $x, $y) = $pl->savebed; 78 ($map, $x, $y) = $pl->savebed;
74 79
75 $pl->ns->send_drawinfo ( 80 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
76 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 $pl->killer ("a cave-in");
92 } else {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
77 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 95 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
78 . "Better use a savebed next time, much worse things could have happened...", 96 . "Better use a savebed next time, much worse things could have happened... "
97 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
98 cf::NDI_RED
99 );
100 }
101 } else {
102 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
104 . "as lots of things could happen when you leave by other means, such as cave-ins, "
105 . "or monsters suddenly snapping your body. Better use a savebed next time. "
106 . "H<Always apply a bed of reality to disconnect from the server.>",
79 cf::NDI_RED 107 cf::NDI_RED
80 ); 108 );
81 } else {
82 $pl->ns->send_drawinfo (
83 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
84 . "as lots of things could happen when you leave by other means, such as cave-ins, "
85 . "or monsters suddenly snapping your body. Better use a savebed next time.",
86 cf::NDI_RED
87 );
88 } 109 }
89 } 110 }
90 } 111 }
91 112
92 $pl->ob->goto ($map, $x, $y); 113 $ob->goto ($map, $x, $y);
93} 114}
94 115
95# delete a player directory, be non-blocking AND synchronous... 116# delete a player directory, be non-blocking AND synchronous...
96# (thats hard, so we crap out and fork). 117# (thats hard, so we crap out and fork).
97sub nuke_playerdir { 118sub nuke_playerdir {
98 my ($user) = @_; 119 my ($user) = @_;
99 120
100 aio_stat "$PLAYERDIR/$user"; 121 aio_rename "$PLAYERDIR/$user", "$PLAYERDIR/~$Coro::current~deleting~";
101 system "cd \Q$PLAYERDIR\E " 122 system "rm -rf \Q$PLAYERDIR/~$Coro::current~deleting~\E &";
102 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
103 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
104} 123}
105 124
106cf::client->attach (on_addme => sub { 125cf::client->attach (on_addme => sub {
107 my ($ns) = @_; 126 my ($ns) = @_;
108 127
… …
121*** 140***
122*** CFPlus: all known versions automatically enable the facecache. 141*** CFPlus: all known versions automatically enable the facecache.
123*** cfclient: use the -cache commandline option. 142*** cfclient: use the -cache commandline option.
124*** cfclient: map will not redraw automatically (bug). 143*** cfclient: map will not redraw automatically (bug).
125*** gcfclient: use -cache commandline option, or enable 144*** gcfclient: use -cache commandline option, or enable
126*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 145*** gcfclient: Client => Configure => Map & Image => Cache Images.
127*** jcrossclient: your client is broken, use CFPlus or gcfclient. 146*** jcrossclient: your client is broken, use CFPlus or gcfclient.
128*** 147***
129*** 148***
130EOF 149EOF
131 if ($ns->version =~ /jcrossclient/) { 150 if ($ns->version =~ /jcrossclient/) {
… …
336 355
337 $ob->set_animation (2); 356 $ob->set_animation (2);
338 $ob->add_statbonus; 357 $ob->add_statbonus;
339 358
340 while () { 359 while () {
341 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 360 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
342 my $msg = $ob->msg; 361 my $msg = $ob->msg;
343 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 362 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
344 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 363 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
345 364
346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 365 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 366 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
348 367
349 last if $res =~ /[dD]/; 368 last if $res =~ /[dD]/;
… …
456 }, 475 },
457); 476);
458 477
459############################################################################# 478#############################################################################
460 479
461our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 480our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
462our $SAVE_TIMEOUT = 20; # save players every n seconds 481our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
463 482
464our $SCHEDULER = cf::async_ext { 483our $SCHEDULER = cf::async_ext {
465 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 484 my $schedule_interval = Coro::Event->timer (after => 1);
466 while () { 485 while () {
486 $schedule_interval->interval ($SCHEDULE_INTERVAL);
467 $schedule_interval->next; 487 $schedule_interval->next;
468 488
469 # this weird form of iteration over values is used because 489 # this weird form of iteration over values is used because
470 # the hash changes underneath us frequently, and for 490 # the hash changes underneath us frequently, and for
471 # keeps a direct reference to the value without (in 5.8 perls) 491 # keeps a direct reference to the value without (in 5.8 perls)
… …
476 or next; 496 or next;
477 $pl->valid or next; 497 $pl->valid or next;
478 498
479 eval { 499 eval {
480 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 500 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
481 cf::wait_for_tick_begin;
482 $pl->save; 501 $pl->save;
483 502
484 unless ($pl->active || $pl->ns) { 503 unless ($pl->active || $pl->ns) {
485 # check refcounts, this is tricky and needs to be adjusted to fit server internals 504 # check refcounts, this is tricky and needs to be adjusted to fit server internals
486 my $ob = $pl->ob; 505 my $ob = $pl->ob;

Diff Legend

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