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.44 by root, Mon Apr 23 19:10:16 2007 UTC vs.
Revision 1.57 by root, Mon Jun 25 05:43:45 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 >= 2);
214 $setup{$k} = $ns->can_msg;
215
216 } elsif ($k eq "xwidget") {
217 # eXperimental server-side widgets
218 $ns->{can_widget} = 1;
186 219
187 } elsif ($k eq "excmd") { 220 } elsif ($k eq "excmd") {
188 # we support it 221 # we support it
189 222
190 } else { 223 } else {
191 # other commands: 224 # other commands:
192 # sexp: no idea, probably for oudated servers 225 # sexp: no idea, probably for oudated servers
193 # tick: more stupidity, server should sned a tick per tick 226 # tick: more stupidity, server should send a tick per tick
194 227
195 $setup{$k} = "FALSE"; 228 $setup{$k} = "FALSE";
196 } 229 }
197 } 230 }
198 231
332 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 365 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
333 nuke_str $pass; 366 nuke_str $pass;
334 # password matches, wonderful 367 # password matches, wonderful
335 my $pl = cf::player::find $user or next; 368 my $pl = cf::player::find $user or next;
336 $pl->connect ($ns); 369 $pl->connect ($ns);
337 check_clean_save $pl; 370 enter_map $pl;
338 last; 371 last;
339 } elsif (can_cleanup $pl, $mtime) { 372 } elsif (can_cleanup $pl, $mtime) {
340 Coro::Timer::sleep 1; 373 Coro::Timer::sleep 1;
341 374
342 $ns->send_drawinfo ( 375 $ns->send_drawinfo (
405 438
406 my $pl = cf::player::new $user; 439 my $pl = cf::player::new $user;
407 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 440 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
408 nuke_str $pass; 441 nuke_str $pass;
409 $pl->connect ($ns); 442 $pl->connect ($ns);
410
411 my $ob = $pl->ob; 443 my $ob = $pl->ob;
444
445 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
412 446
413 while () { 447 while () {
414 $ob->update_stats; 448 $ob->update_stats;
415 $pl->save_stats; 449 $pl->save_stats;
416 450
431 } 465 }
432 466
433 $ob->set_animation (2); 467 $ob->set_animation (2);
434 $ob->add_statbonus; 468 $ob->add_statbonus;
435 469
436 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 470 while () {
437 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 471 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
472 my $msg = $ob->msg;
473 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
474 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
475
476 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
438 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 477 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
439 478
440 $ns->state (cf::ST_CHANGE_CLASS); 479 last if $res =~ /[dD]/;
480
481 $pl->chargen_race_next;
482 }
483
484 $pl->chargen_race_done;
485
486 while () {
487 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
488 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
489
490 if ($res =~ /^[fF]/) {
491 $pl->gender (1);
492 last;
493 } elsif ($res =~ /^[mM]/) {
494 $pl->gender (0);
495 last;
496 }
497 }
498
499 $ob->reply (undef, "Welcome to Crossfire!");
500
441 delete $pl->{deny_save};#d# too early 501 delete $pl->{deny_save};
442 502
443 last; 503 last;
444 } 504 }
445 }); 505 });
446} 506}
552 eval { 612 eval {
553 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 613 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
554 cf::wait_for_tick_begin; 614 cf::wait_for_tick_begin;
555 $pl->save; 615 $pl->save;
556 616
557 unless ($pl->active) { 617 unless ($pl->active || $pl->ns) {
558 # check refcounts, this is tricky and needs to be adjusted to fit server internals 618 # check refcounts, this is tricky and needs to be adjusted to fit server internals
559 my $ob = $pl->ob; 619 my $ob = $pl->ob;
560 Scalar::Util::weaken $pl; 620
561 Scalar::Util::weaken $ob;
562 my $a_ = $pl->refcnt;#d#
563 my $b_ = $ob->refcnt;#d#
564 my $pl_ref = $pl->refcnt_cnt; 621 my $pl_ref = $pl->refcnt_cnt;
565 my $ob_ref = $ob->refcnt_cnt; 622 my $ob_ref = $ob->refcnt_cnt;
566 623
567 ## pl_ref == one from object + one from cf::PLAYER 624 ## pl_ref == $pl + ob->contr + %cf::PLAYER
568 ## ob_ref == one from simply being an object 625 ## ob_ref == $ob + pl->observe + simply being an object
569 if ($pl_ref == 2 && $ob_ref == 1) { 626 if ($pl_ref == 3 && $ob_ref == 3) {
570 warn "player-scheduler destroy ", $ob->name;#d# 627 warn "player-scheduler destroy ", $ob->name;#d#
571 628
572 # remove from sight and get fresh "copies" 629 # remove from sight and get fresh "copies"
573 $pl = delete $cf::PLAYER{$ob->name}; 630 $pl = delete $cf::PLAYER{$ob->name};
574 $ob = $pl->ob; 631 $ob = $pl->ob;
575 632
576 $ob->destroy;
577 $pl->destroy; 633 $pl->destroy; # destroys $ob
578 } else { 634 } else {
635 my $a_ = $pl->refcnt;#d#
636 my $b_ = $ob->refcnt;#d#
637
579 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 638 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
580 } 639 }
581 } 640 }
582 } 641 }
583 }; 642 };
584 warn $@ if $@; 643 warn $@ if $@;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines