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.43 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.54 by root, Sat Jun 16 00:12:20 2007 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max); 7use List::Util qw(min max);
8
9our %EXT_SETUP;
8 10
9# paranoia function to overwrite a string-in-place 11# paranoia function to overwrite a string-in-place
10sub nuke_str { 12sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 13 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 14}
51 ); 53 );
52 54
53 1 55 1
54} 56}
55 57
56sub check_clean_save { 58sub enter_map {
57 my ($pl) = @_; 59 my ($pl) = @_;
58 60
61 my ($map, $x, $y)
62 = $pl->ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
65
66 $pl->ob->enter_link;
67
59 if (my $time = delete $pl->{unclean_save}) { 68 if (my $time = delete $pl->{unclean_save}) {
69 if (my $m = cf::map::find $map) {
70 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time;
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
74
75 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed;
77
60 $pl->ns->send_drawinfo ( 78 $pl->ns->send_drawinfo (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
80 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
81 . "Better use a savebed next time, much worse things could have happened...",
82 cf::NDI_RED
83 );
84 } else {
85 $pl->ns->send_drawinfo (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 86 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
62 . "as lots of things could happen when you leave by other means, such as cave-ins, " 87 . "as lots of things could happen when you leave by other means, such as cave-ins, "
63 . "or monsters suddenly snapping your body. Better use a savebed next time.", 88 . "or monsters suddenly snapping your body. Better use a savebed next time.",
64 cf::NDI_RED 89 cf::NDI_RED
90 );
91 }
65 ); 92 }
66 #d#TODO
67 } 93 }
94
95 $pl->ob->goto ($map, $x, $y);
68} 96}
69 97
70# delete a player directory, be non-blocking AND synchronous... 98# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 99# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 100sub nuke_playerdir {
180 208
181 } elsif ($k eq "fxix") { 209 } elsif ($k eq "fxix") {
182 $ns->fxix ($v); 210 $ns->fxix ($v);
183 211
184 } elsif ($k eq "msg") { 212 } elsif ($k eq "msg") {
185 $ns->{setup}{msg} = $v; 213 $ns->can_msg ($v);
214
215 } elsif ($k eq "excmd") {
216 # we support it
186 217
187 } else { 218 } else {
188 # other commands: 219 # other commands:
189 # sexp: no idea, probably for oudated servers 220 # sexp: no idea, probably for oudated servers
190 # tick: more stupidity, server should sned a tick per tick 221 # tick: more stupidity, server should send a tick per tick
191 222
192 $setup{$k} = "FALSE"; 223 $setup{$k} = "FALSE";
193 } 224 }
194 } 225 }
195 226
329 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 360 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
330 nuke_str $pass; 361 nuke_str $pass;
331 # password matches, wonderful 362 # password matches, wonderful
332 my $pl = cf::player::find $user or next; 363 my $pl = cf::player::find $user or next;
333 $pl->connect ($ns); 364 $pl->connect ($ns);
334 check_clean_save $pl; 365 enter_map $pl;
335 last; 366 last;
336 } elsif (can_cleanup $pl, $mtime) { 367 } elsif (can_cleanup $pl, $mtime) {
337 Coro::Timer::sleep 1; 368 Coro::Timer::sleep 1;
338 369
339 $ns->send_drawinfo ( 370 $ns->send_drawinfo (
402 433
403 my $pl = cf::player::new $user; 434 my $pl = cf::player::new $user;
404 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 435 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
405 nuke_str $pass; 436 nuke_str $pass;
406 $pl->connect ($ns); 437 $pl->connect ($ns);
407
408 my $ob = $pl->ob; 438 my $ob = $pl->ob;
439
440 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
409 441
410 while () { 442 while () {
411 $ob->update_stats; 443 $ob->update_stats;
412 $pl->save_stats; 444 $pl->save_stats;
413 445
428 } 460 }
429 461
430 $ob->set_animation (2); 462 $ob->set_animation (2);
431 $ob->add_statbonus; 463 $ob->add_statbonus;
432 464
433 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 465 while () {
434 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 466 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
467 my $msg = $ob->msg;
468 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
469 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
470
471 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
435 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 472 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
436 473
437 $ns->state (cf::ST_CHANGE_CLASS); 474 last if $res =~ /[dD]/;
475
476 $pl->chargen_race_next;
477 }
478
479 $pl->chargen_race_done;
480
438 delete $pl->{deny_save};#d# too early 481 delete $pl->{deny_save};
439 482
440 last; 483 last;
441 } 484 }
442 }); 485 });
443} 486}
549 eval { 592 eval {
550 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 593 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
551 cf::wait_for_tick_begin; 594 cf::wait_for_tick_begin;
552 $pl->save; 595 $pl->save;
553 596
554 unless ($pl->active) { 597 unless ($pl->active || $pl->ns) {
555 # check refcounts, this is tricky and needs to be adjusted to fit server internals 598 # check refcounts, this is tricky and needs to be adjusted to fit server internals
556 my $ob = $pl->ob; 599 my $ob = $pl->ob;
557 Scalar::Util::weaken $pl; 600
558 Scalar::Util::weaken $ob;
559 my $a_ = $pl->refcnt;#d#
560 my $b_ = $ob->refcnt;#d#
561 my $pl_ref = $pl->refcnt_cnt; 601 my $pl_ref = $pl->refcnt_cnt;
562 my $ob_ref = $ob->refcnt_cnt; 602 my $ob_ref = $ob->refcnt_cnt;
563 603
564 ## pl_ref == one from object + one from cf::PLAYER 604 ## pl_ref == $pl + ob->contr + %cf::PLAYER
565 ## ob_ref == one from simply being an object 605 ## ob_ref == $ob + pl->observe + simply being an object
566 if ($pl_ref == 2 && $ob_ref == 1) { 606 if ($pl_ref == 3 && $ob_ref == 3) {
567 warn "player-scheduler destroy ", $ob->name;#d# 607 warn "player-scheduler destroy ", $ob->name;#d#
568 608
569 # remove from sight and get fresh "copies" 609 # remove from sight and get fresh "copies"
570 $pl = delete $cf::PLAYER{$ob->name}; 610 $pl = delete $cf::PLAYER{$ob->name};
571 $ob = $pl->ob; 611 $ob = $pl->ob;
572 612
573 $ob->destroy;
574 $pl->destroy; 613 $pl->destroy; # destroys $ob
575 } else { 614 } else {
615 my $a_ = $pl->refcnt;#d#
616 my $b_ = $ob->refcnt;#d#
617
576 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 618 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
577 } 619 }
578 } 620 }
579 } 621 }
580 }; 622 };
581 warn $@ if $@; 623 warn $@ if $@;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines