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.92 by root, Mon Sep 22 01:33:09 2008 UTC

52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub safe_spot($) {
58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
57sub enter_map { 75sub enter_map {
58 my ($pl) = @_; 76 my ($pl) = @_;
59 77
78 warn $pl->ob->name, ": enter map 1\n";#d#
60 my $ob = $pl->ob; 79 my $ob = $pl->ob;
61 80
62 my ($map, $x, $y) 81 my ($map, $x, $y)
63 = $ob->{_link_pos} 82 = $ob->{_link_pos}
64 ? @{delete $ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
66 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
67 $ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
68 89
90 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 96 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
74 98
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 100
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 101 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
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. "
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 {
102 $ob->message ( 102 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 103 "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, " 104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
105 . "or monsters suddenly snapping your body. Better use a savebed next time. " 105 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<Always apply a bed of reality to disconnect from the server.>", 106 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED 107 cf::NDI_RED
108 ); 108 );
109 # kill them.
110 # reminds me of the famous badness 10000 syndrome...
111 $ob->stats->hp (-10000); #] if they survive this they deserved to live
112 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
113 } else {
114 ($map, $x, $y) = $pl->savebed;
115
116 $ob->message (
117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
118 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
119 . "Better use a savebed next time, much worse things could have happened... "
120 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
121 cf::NDI_RED
122 );
123 }
124 } else {
125 $ob->message (
126 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
127 . "as lots of things could happen when you leave by other means, such as cave-ins, "
128 . "or monsters suddenly snapping your body. Better use a savebed next time. "
129 . "H<Always apply a bed of reality to disconnect from the server.>",
130 cf::NDI_RED
109 } 131 );
110 } 132 }
111 } 133 }
112 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
113 $ob->goto ($map, $x, $y); 136 #$ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub {
138 warn $pl->ob->name, ": enter map check\n";#d#
139 $_[0]
140 }, sub {
141 warn $pl->ob->name, ": enter map done\n";#d#
142 });
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
114} 145}
115 146
116# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
117# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
118sub nuke_playerdir { 149sub nuke_playerdir {
119 my ($user) = @_; 150 my ($user) = @_;
120 151
121 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
122 system "cd \Q$PLAYERDIR\E " 153
123 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 154 cf::fork_call {
124 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 155 rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp;
157 };
125} 158}
126 159
127cf::client->attach (on_addme => sub { 160cf::client->attach (on_addme => sub {
128 my ($ns) = @_; 161 my ($ns) = @_;
129 162
138*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
139*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
140*** 173***
141*** Look at your client preferences: 174*** Look at your client preferences:
142*** 175***
143*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
144*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
145*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
146*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
147*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
148*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
149*** 182***
150*** 183***
151EOF 184EOF
152 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
153 # let them, for now 186 # let them, for now
173 } 206 }
174 207
175 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
176 209
177 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
178 my ($user, $pass); 213 my ($user, $pass);
179 214
180 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
181 216
182 for (;;) { 217 for (;;) {
187 cf::NDI_BLUE 222 cf::NDI_BLUE
188 ); 223 );
189 224
190 # read username 225 # read username
191 while () { 226 while () {
192 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
193 228
194 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
195 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
196 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
197 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
198 cf::NDI_RED 233 cf::NDI_RED
199 ); 234 );
200 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
201 last; 236 last;
202 } else { 237 } else {
203 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
204 "Your username contains illegal characters " 239 "Your username contains illegal characters "
205 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
206 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 20 characters in length.",
207 cf::NDI_RED 242 cf::NDI_RED
208 ); 243 );
209 } 244 }
210 Coro::Timer::sleep 0.4; 245 Coro::Timer::sleep 0.4;
211 } 246 }
212 247
213 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
214 251
215 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
216 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
217 . "New users should now choose a password. " 254 . "New users should now choose a password. "
218 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
242 } 279 }
243 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
244 281
245 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
246 283
284 $Coro::current->{desc} = "addme($user) check";
285
247 # try to read the user file and check the password 286 # try to read the user file and check the password
248 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
249 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
250 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
251 my $hash = $pl->password; 290 my $hash = $pl->password;
253 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
254 nuke_str $pass; 293 nuke_str $pass;
255 # password matches, wonderful 294 # password matches, wonderful
256 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
257 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
258 enter_map $pl; 298 enter_map $pl;
259 last; 299 last;
260 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
261 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
262 302
304 next; 344 next;
305 } 345 }
306 } 346 }
307 347
308 # the rest of this function is character creation 348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
309 350
310 # just to make sure nothing is left over 351 # just to make sure nothing is left over
311 nuke_playerdir $user; 352 nuke_playerdir $user;
312 353
313 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 354 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
350 } 391 }
351 } else { 392 } else {
352 $ob->roll_stats; 393 $ob->roll_stats;
353 } 394 }
354 395
355 Coro::Timer::sleep 0.2; 396 Coro::Timer::sleep 0.05;
356 } 397 }
357 398
358 $ob->set_animation (2); 399 $ob->set_animation (2);
359 $ob->add_statbonus; 400 $ob->add_statbonus;
360 401
371 412
372 $pl->chargen_race_next; 413 $pl->chargen_race_next;
373 Coro::Timer::sleep 0.2; 414 Coro::Timer::sleep 0.2;
374 } 415 }
375 416
417 # create the playerdir, if necessary, as chargen_race_done did it before
418 # presumably because of unique maps
419 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done; 420 $pl->chargen_race_done;
377 421
378 while () { 422 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 424 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
387 last; 431 last;
388 } 432 }
389 Coro::Timer::sleep 0.2; 433 Coro::Timer::sleep 0.2;
390 } 434 }
391 435
392 $ob->reply (undef, "Welcome to Crossfire!"); 436 $ob->reply (undef, "Welcome to Deliantra!");
393 437
394 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
395 439
396 last; 440 last;
397 } 441 }
438 482
439 # update respawn position 483 # update respawn position
440 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
441 cf::async { $pl->save }; 485 cf::async { $pl->save };
442 486
443 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
444 $ob->check_score; 488 $ob->check_score;
445 489
446 $ob->reply (undef, "In the future, you will wake up here when you die."); 490 $ob->reply (undef, "In the future, you will wake up here when you die.");
447 491
448 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
470 514
471 if ($cleanly) { 515 if ($cleanly) {
472 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 516 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
473 } else { 517 } else {
474 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 518 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
475 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
476 } 521 }
477 }, 522 },
478); 523);
479 524
480#############################################################################
481 525
482our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
483our $SAVE_TIMEOUT = 20; # save players every n seconds
484
485our $SCHEDULER = cf::async_ext {
486 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
487 while () {
488 $schedule_interval->next;
489
490 # this weird form of iteration over values is used because
491 # the hash changes underneath us frequently, and for
492 # keeps a direct reference to the value without (in 5.8 perls)
493 # keeping a reference, so this is prone to crashes or worse.
494 my @players = keys %cf::PLAYER;
495 for (@players) {
496 my $pl = $cf::PLAYER{$_}
497 or next;
498 $pl->valid or next;
499
500 eval {
501 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
502 cf::wait_for_tick_begin;
503 $pl->save;
504
505 unless ($pl->active || $pl->ns) {
506 # check refcounts, this is tricky and needs to be adjusted to fit server internals
507 my $ob = $pl->ob;
508
509 my $pl_ref = $pl->refcnt_cnt;
510 my $ob_ref = $ob->refcnt_cnt;
511
512 ## pl_ref == $pl + ob->contr + %cf::PLAYER
513 ## ob_ref == $ob + pl->observe + simply being an object
514 if ($pl_ref == 3 && $ob_ref == 3) {
515 warn "player-scheduler destroy ", $ob->name;#d#
516
517 # remove from sight and get fresh "copies"
518 $pl = delete $cf::PLAYER{$ob->name};
519 $ob = $pl->ob;
520
521 $pl->destroy; # destroys $ob
522 } else {
523 my $a_ = $pl->refcnt;#d#
524 my $b_ = $ob->refcnt;#d#
525
526 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
527 }
528 }
529 }
530 };
531 warn $@ if $@;
532 Coro::cede;
533 };
534 }
535};
536
537$SCHEDULER->prio (1);
538

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines