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.67 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.77 by root, Fri Dec 28 19:44:34 2007 UTC

52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub safe_spot($$$) {
58 my ($m, $x, $y) = @_;
59
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61}
62
57sub enter_map { 63sub enter_map {
58 my ($pl) = @_; 64 my ($pl) = @_;
59 65
60 my $ob = $pl->ob; 66 my $ob = $pl->ob;
61 67
64 ? @{delete $ob->{_link_pos}} 70 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 71 : ($pl->maplevel, $ob->x, $ob->y);
66 72
67 $ob->enter_link; 73 $ob->enter_link;
68 74
75 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 76 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 77
78 if ($time && $m && !safe_spot $m, $x, $y) {
71 if ($time < $m->{instantiate_time}) { 79 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 80 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 81 my $age = $cf::RUNTIME - $time;
74 82
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 83 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 84
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed; 85 ($map, $x, $y) = $pl->savebed;
79 86
80 if ($age >= $MAX_DISCONNECT_TIME) { 87 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message ( 88 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 89 "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. " 90 . "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... " 91 . "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.>", 92 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED 93 cf::NDI_RED
87 ); 94 );
88 # kill them. 95 # kill them.
89 # reminds me of the famous badness 10000 syndrome... 96 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live 97 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 $pl->killer ("a cave-in"); 98 $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. "
95 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
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 { 99 } else {
102 $ob->message ( 100 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "as lots of things could happen when you leave by other means, such as cave-ins, " 102 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
105 . "or monsters suddenly snapping your body. Better use a savebed next time. " 103 . "Better use a savebed next time, much worse things could have happened... "
106 . "H<Always apply a bed of reality to disconnect from the server.>", 104 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
107 cf::NDI_RED 105 cf::NDI_RED
108 ); 106 );
109 } 107 }
108 } else {
109 $ob->message (
110 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
111 . "as lots of things could happen when you leave by other means, such as cave-ins, "
112 . "or monsters suddenly snapping your body. Better use a savebed next time. "
113 . "H<Always apply a bed of reality to disconnect from the server.>",
114 cf::NDI_RED
115 );
110 } 116 }
111 } 117 }
112 118
113 $ob->goto ($map, $x, $y); 119 $ob->goto ($map, $x, $y);
114} 120}
116# delete a player directory, be non-blocking AND synchronous... 122# delete a player directory, be non-blocking AND synchronous...
117# (thats hard, so we crap out and fork). 123# (thats hard, so we crap out and fork).
118sub nuke_playerdir { 124sub nuke_playerdir {
119 my ($user) = @_; 125 my ($user) = @_;
120 126
121 aio_stat "$PLAYERDIR/$user"; 127 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
122 system "cd \Q$PLAYERDIR\E " 128
123 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 129 cf::fork_call {
124 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 130 rename "$PLAYERDIR/$user", $temp;
131 system "rm", "-rf", $temp;
132 };
125} 133}
126 134
127cf::client->attach (on_addme => sub { 135cf::client->attach (on_addme => sub {
128 my ($ns) = @_; 136 my ($ns) = @_;
129 137
142*** 150***
143*** CFPlus: all known versions automatically enable the facecache. 151*** CFPlus: all known versions automatically enable the facecache.
144*** cfclient: use the -cache commandline option. 152*** cfclient: use the -cache commandline option.
145*** cfclient: map will not redraw automatically (bug). 153*** cfclient: map will not redraw automatically (bug).
146*** gcfclient: use -cache commandline option, or enable 154*** gcfclient: use -cache commandline option, or enable
147*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 155*** gcfclient: Client => Configure => Map & Image => Cache Images.
148*** jcrossclient: your client is broken, use CFPlus or gcfclient. 156*** jcrossclient: your client is broken, use CFPlus or gcfclient.
149*** 157***
150*** 158***
151EOF 159EOF
152 if ($ns->version =~ /jcrossclient/) { 160 if ($ns->version =~ /jcrossclient/) {
173 } 181 }
174 182
175 $ns->pl and return $ns->destroy; 183 $ns->pl and return $ns->destroy;
176 184
177 $ns->async (sub { 185 $ns->async (sub {
186 $Coro::current->{desc} = "addme init";
187
178 my ($user, $pass); 188 my ($user, $pass);
179 189
180 $ns->send_packet ("addme_success"); 190 $ns->send_packet ("addme_success");
181 191
182 for (;;) { 192 for (;;) {
210 Coro::Timer::sleep 0.4; 220 Coro::Timer::sleep 0.4;
211 } 221 }
212 222
213 check_playing $ns, $user and next; 223 check_playing $ns, $user and next;
214 224
225 $Coro::current->{desc} = "addme($user) pass";
226
215 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
216 "Welcome $user, please enter your password now. " 228 "Welcome $user, please enter your password now. "
217 . "New users should now choose a password. " 229 . "New users should now choose a password. "
218 . "Anything your client lets you enter is fine.", 230 . "Anything your client lets you enter is fine.",
219 cf::NDI_BLUE 231 cf::NDI_BLUE
241 next; 253 next;
242 } 254 }
243 local $cf::LOGIN_LOCK{$user} = 1; 255 local $cf::LOGIN_LOCK{$user} = 1;
244 256
245 check_playing $ns, $user and next; 257 check_playing $ns, $user and next;
258
259 $Coro::current->{desc} = "addme($user) check";
246 260
247 # try to read the user file and check the password 261 # try to read the user file and check the password
248 if (my $pl = cf::player::find $user) { 262 if (my $pl = cf::player::find $user) {
249 aio_stat $pl->path and next; 263 aio_stat $pl->path and next;
250 my $mtime = (stat _)[9]; 264 my $mtime = (stat _)[9];
304 next; 318 next;
305 } 319 }
306 } 320 }
307 321
308 # the rest of this function is character creation 322 # the rest of this function is character creation
323 $Coro::current->{desc} = "addme($user) chargen";
309 324
310 # just to make sure nothing is left over 325 # just to make sure nothing is left over
311 nuke_playerdir $user; 326 nuke_playerdir $user;
312 327
313 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 328 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
387 last; 402 last;
388 } 403 }
389 Coro::Timer::sleep 0.2; 404 Coro::Timer::sleep 0.2;
390 } 405 }
391 406
392 $ob->reply (undef, "Welcome to Crossfire!"); 407 $ob->reply (undef, "Welcome to Deliantra!");
393 408
394 delete $pl->{deny_save}; 409 delete $pl->{deny_save};
395 410
396 last; 411 last;
397 } 412 }
477 }, 492 },
478); 493);
479 494
480############################################################################# 495#############################################################################
481 496
482our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 497our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
483our $SAVE_TIMEOUT = 20; # save players every n seconds 498our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
484 499
485our $SCHEDULER = cf::async_ext { 500our $SCHEDULER = cf::async_ext {
486 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 501 $Coro::current->{desc} = "player scheduler";
502
487 while () { 503 while () {
488 $schedule_interval->next; 504 Coro::EV::timer_once $SCHEDULE_INTERVAL;
489 505
490 # this weird form of iteration over values is used because 506 # this weird form of iteration over values is used because
491 # the hash changes underneath us frequently, and for 507 # the hash changes underneath us frequently, and for
492 # keeps a direct reference to the value without (in 5.8 perls) 508 # keeps a direct reference to the value without (in 5.8 perls)
493 # keeping a reference, so this is prone to crashes or worse. 509 # keeping a reference, so this is prone to crashes or worse.
497 or next; 513 or next;
498 $pl->valid or next; 514 $pl->valid or next;
499 515
500 eval { 516 eval {
501 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 517 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
502 cf::wait_for_tick_begin;
503 $pl->save; 518 $pl->save;
504 519
505 unless ($pl->active || $pl->ns) { 520 unless ($pl->active || $pl->ns) {
506 # check refcounts, this is tricky and needs to be adjusted to fit server internals 521 # check refcounts, this is tricky and needs to be adjusted to fit server internals
507 my $ob = $pl->ob; 522 my $ob = $pl->ob;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines