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.78 by root, Mon Jan 7 01:55:19 2008 UTC vs.
Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC

… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
52 ); 49 );
53 50
54 1 51 1
55} 52}
56 53
57sub safe_spot($$$) { 54sub safe_spot($) {
58 my ($m, $x, $y) = @_; 55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
59 58
59 my $m = $ob->map
60 or return;
61 my $x = $ob->x;
62 my $y = $ob->y;
63
60 return 0; 64# return 0;#d#
61 warn join ":", $m->at ($x, $y);#d# 65# warn join ":", $m->at ($x, $y);#d#
62 warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
63 return 0; 67# return 0;
64 68
65 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
66} 70}
67 71
68sub enter_map { 72sub enter_map {
69 my ($pl) = @_; 73 my ($pl) = @_;
70 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
71 my $ob = $pl->ob; 76 my $ob = $pl->ob;
72 77
73 my ($map, $x, $y) 78 my ($map, $x, $y)
74 = $ob->{_link_pos} 79 = $ob->{_link_pos}
75 ? @{delete $ob->{_link_pos}} 80 ? @{delete $ob->{_link_pos}}
76 : ($pl->maplevel, $ob->x, $ob->y); 81 : ($pl->maplevel, $ob->x, $ob->y);
77 82
83 warn $pl->ob->name, ": enter map 2\n";#d#
78 $ob->enter_link; 84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
79 86
80 my $m = cf::map::find $map; 87 my $m = cf::map::find $map;
81 my $time = delete $pl->{unclean_save}; 88 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
82 90
83 if ($time && $m && !safe_spot $m, $x, $y) { 91 if ($time && $m) {
84 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
85 # the map was reset in the meantime 93 # the map was reset in the meantime
86 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
87 95
88 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
89
90 ($map, $x, $y) = $pl->savebed;
91 97
92 if ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
93 $ob->message ( 99 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
98 cf::NDI_RED 104 cf::NDI_RED
99 ); 105 );
100 # kill them. 106 # kill them.
101 # reminds me of the famous badness 10000 syndrome... 107 # reminds me of the famous badness 10000 syndrome...
102 $ob->stats->hp (-10000); #] if they survive this they deserved to live 108 $ob->stats->hp (-10000); #] if they survive this they deserved to live
103 $pl->killer ("a cave-in"); 109 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
104 } else { 110 } else {
111 ($map, $x, $y) = $pl->savebed;
112
105 $ob->message ( 113 $ob->message (
106 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 114 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
107 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 115 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
108 . "Better use a savebed next time, much worse things could have happened... " 116 . "Better use a savebed next time, much worse things could have happened... "
109 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>", 117 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
… …
119 cf::NDI_RED 127 cf::NDI_RED
120 ); 128 );
121 } 129 }
122 } 130 }
123 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
124 $ob->goto ($map, $x, $y); 133 #$ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub {
135 warn $pl->ob->name, ": enter map check\n";#d#
136 $_[0]
137 }, sub {
138 warn $pl->ob->name, ": enter map done\n";#d#
139 });
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
125} 142}
126 143
127# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
128# (thats hard, so we crap out and fork). 145# (that's hard, so we crap out and fork).
129sub nuke_playerdir { 146sub nuke_playerdir {
130 my ($user) = @_; 147 my ($user) = @_;
131 148
132 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
133 150
… …
151*** or it has been disabled. Face caching is mandatory 168*** or it has been disabled. Face caching is mandatory
152*** so please enable it or use a newer client. 169*** so please enable it or use a newer client.
153*** 170***
154*** Look at your client preferences: 171*** Look at your client preferences:
155*** 172***
156*** CFPlus: all known versions automatically enable the facecache. 173*** deliantra: all known versions automatically enable the facecache.
157*** cfclient: use the -cache commandline option. 174*** cfclient: use the -cache commandline option.
158*** cfclient: map will not redraw automatically (bug). 175*** cfclient: map will not redraw automatically (bug).
159*** gcfclient: use -cache commandline option, or enable 176*** gcfclient: use -cache commandline option, or enable
160*** gcfclient: Client => Configure => Map & Image => Cache Images. 177*** gcfclient: Client => Configure => Map & Image => Cache Images.
161*** jcrossclient: your client is broken, use CFPlus or gcfclient. 178*** jcrossclient: your client is broken, use deliantra or gcfclient.
162*** 179***
163*** 180***
164EOF 181EOF
165 if ($ns->version =~ /jcrossclient/) { 182 if ($ns->version =~ /jcrossclient/) {
166 # let them, for now 183 # let them, for now
… …
202 cf::NDI_BLUE 219 cf::NDI_BLUE
203 ); 220 );
204 221
205 # read username 222 # read username
206 while () { 223 while () {
207 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
208 225
209 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
210 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
211 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
212 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
213 cf::NDI_RED 230 cf::NDI_RED
214 ); 231 );
215 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 232 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
216 last; 233 last;
217 } else { 234 } else {
218 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
219 "Your username contains illegal characters " 236 "Your username contains illegal characters "
220 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
221 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
222 cf::NDI_RED 239 cf::NDI_RED
223 ); 240 );
224 } 241 }
225 Coro::Timer::sleep 0.4; 242 Coro::Timer::sleep 0.4;
226 } 243 }
… …
272 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 289 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
273 nuke_str $pass; 290 nuke_str $pass;
274 # password matches, wonderful 291 # password matches, wonderful
275 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
276 $pl->connect ($ns); 293 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
277 enter_map $pl; 295 enter_map $pl;
278 last; 296 last;
279 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
280 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
281 299
… …
370 } 388 }
371 } else { 389 } else {
372 $ob->roll_stats; 390 $ob->roll_stats;
373 } 391 }
374 392
375 Coro::Timer::sleep 0.2; 393 Coro::Timer::sleep 0.05;
376 } 394 }
377 395
378 $ob->set_animation (2); 396 $ob->set_animation (2);
379 $ob->add_statbonus; 397 $ob->add_statbonus;
380 398
… …
391 409
392 $pl->chargen_race_next; 410 $pl->chargen_race_next;
393 Coro::Timer::sleep 0.2; 411 Coro::Timer::sleep 0.2;
394 } 412 }
395 413
414 # create the playerdir, if necessary, as chargen_race_done did it before
415 # presumably because of unique maps
416 aio_mkdir playerdir $pl, 0770;
396 $pl->chargen_race_done; 417 $pl->chargen_race_done;
397 418
398 while () { 419 while () {
399 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 420 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
400 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 421 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
409 Coro::Timer::sleep 0.2; 430 Coro::Timer::sleep 0.2;
410 } 431 }
411 432
412 $ob->reply (undef, "Welcome to Deliantra!"); 433 $ob->reply (undef, "Welcome to Deliantra!");
413 434
435 # XXX: Workaround for delayed client ext protocol handshake
436 $pl->esrv_new_player;
437
414 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
415 439
416 last; 440 last;
417 } 441 }
418 }); 442 });
419}); 443});
420 444
421cf::register_command quit => sub { 445cf::register_command quit => sub {
422 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
423 447
424 $ob->reply (undef, 448 $ob->send_msg (undef,
425 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
426 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 450 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
427 cf::NDI_UNIQUE | cf::NDI_RED); 451 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
428}; 452};
429 453
430cf::register_command quit_character => sub { 454cf::register_command quit_character => sub {
431 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
432 456
433 my $pl = $ob->contr; 457 my $pl = $ob->contr;
434 458
435 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
436 if ($_[0] !~ /^[yY]/) { 460 if ($_[0] !~ /^[yY]/) {
437 $ob->reply (undef, 461 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
438 "Ok, not not quitting then.",
439 cf::NDI_UNIQUE | cf::NDI_RED);
440 } else { 462 } else {
441 $ob->reply (undef, 463 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
442 "Ok, quitting, hope to see you again.",
443 cf::NDI_UNIQUE | cf::NDI_RED);
444 $pl->ns->flush; 464 $pl->ns->flush;
445 cf::async { $pl->quit_character }; 465 cf::async { $pl->quit_character };
446 } 466 }
447 }); 467 });
448}; 468};
… …
458 478
459 # update respawn position 479 # update respawn position
460 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 480 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
461 cf::async { $pl->save }; 481 cf::async { $pl->save };
462 482
463 $pl->killer ("left"); 483 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
464 $ob->check_score; 484 $ob->check_score;
465 485
466 $ob->reply (undef, "In the future, you will wake up here when you die."); 486 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
467 487
468 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
469 if ($_[0] !~ /^[yY]/) { 489 if ($_[0] !~ /^[yY]/) {
470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 490 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
471 $pl->deactivate; 491 $pl->deactivate;
… …
490 510
491 if ($cleanly) { 511 if ($cleanly) {
492 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 512 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
493 } else { 513 } else {
494 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 514 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
495 $pl->{unclean_save} = $cf::RUNTIME; 515 $pl->{unclean_save} = $cf::RUNTIME
516 unless safe_spot $pl;
496 } 517 }
497 }, 518 },
498); 519);
499 520
500#############################################################################
501 521
502our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
503our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
504
505our $SCHEDULER = cf::async_ext {
506 $Coro::current->{desc} = "player scheduler";
507
508 while () {
509 Coro::EV::timer_once $SCHEDULE_INTERVAL;
510
511 # this weird form of iteration over values is used because
512 # the hash changes underneath us frequently, and for
513 # keeps a direct reference to the value without (in 5.8 perls)
514 # keeping a reference, so this is prone to crashes or worse.
515 my @players = keys %cf::PLAYER;
516 for (@players) {
517 my $pl = $cf::PLAYER{$_}
518 or next;
519 $pl->valid or next;
520
521 eval {
522 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
523 $pl->save;
524
525 unless ($pl->active || $pl->ns) {
526 # check refcounts, this is tricky and needs to be adjusted to fit server internals
527 my $ob = $pl->ob;
528
529 my $pl_ref = $pl->refcnt_cnt;
530 my $ob_ref = $ob->refcnt_cnt;
531
532 ## pl_ref == $pl + ob->contr + %cf::PLAYER
533 ## ob_ref == $ob + pl->observe + simply being an object
534 if ($pl_ref == 3 && $ob_ref == 3) {
535 warn "player-scheduler destroy ", $ob->name;#d#
536
537 # remove from sight and get fresh "copies"
538 $pl = delete $cf::PLAYER{$ob->name};
539 $ob = $pl->ob;
540
541 $pl->destroy; # destroys $ob
542 } else {
543 my $a_ = $pl->refcnt;#d#
544 my $b_ = $ob->refcnt;#d#
545
546 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
547 }
548 }
549 }
550 };
551 warn $@ if $@;
552 Coro::cede;
553 };
554 }
555};
556
557$SCHEDULER->prio (1);
558

Diff Legend

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