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.59 by root, Tue Jul 3 01:04:43 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}
39 return unless cf::player::find_active $user; 41 return unless cf::player::find_active $user;
40 42
41 $ns->send_drawinfo ( 43 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 44 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 45 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 46 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 47 . "else is using your account at this time. If you lost your connection "
46 . "then the server will likely timeout within a minute. If you still " 48 . "then the server will likely timeout within a minute. If you still "
47 . "cannot log-in after a minute, you are still logged in. Make sure " 49 . "cannot log-in after a minute, you are still logged in. Make sure "
48 . "you do not have another client running. If you use windows, reboot, " 50 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 51 . "this will fix anything.",
50 cf::NDI_RED 52 cf::NDI_RED
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 {
177 205
178 } elsif ($k eq "smoothing") { # cfplus-style smoothing 206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
179 $ns->smoothing ($v); 207 $ns->smoothing ($v);
180 208
181 } elsif ($k eq "fxix") { 209 } elsif ($k eq "fxix") {
210 $v = 2 if $v > 2;
182 $ns->fxix ($v); 211 $ns->fxix ($v);
212 $setup{$k} = $v;
183 213
184 } elsif ($k eq "msg") { 214 } elsif ($k eq "msg") {
215 $v = 2 if $v > 2;
216 $ns->can_msg ($v >= 2);
185 $ns->{setup}{msg} = $v; 217 $setup{$k} = $v;
218
219 } elsif ($k eq "xwidget") {
220 # eXperimental server-side widgets
221 $ns->{can_widget} = 1;
186 222
187 } elsif ($k eq "excmd") { 223 } elsif ($k eq "excmd") {
188 # we support it 224 # we support it
189 225
190 } else { 226 } else {
191 # other commands: 227 # other commands:
192 # sexp: no idea, probably for oudated servers 228 # sexp: no idea, probably for oudated servers
193 # tick: more stupidity, server should sned a tick per tick 229 # tick: more stupidity, server should send a tick per tick
194 230
195 $setup{$k} = "FALSE"; 231 $setup{$k} = "FALSE";
196 } 232 }
197 } 233 }
198 234
332 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 368 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
333 nuke_str $pass; 369 nuke_str $pass;
334 # password matches, wonderful 370 # password matches, wonderful
335 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
336 $pl->connect ($ns); 372 $pl->connect ($ns);
337 check_clean_save $pl; 373 enter_map $pl;
338 last; 374 last;
339 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
340 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
341 377
342 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
405 441
406 my $pl = cf::player::new $user; 442 my $pl = cf::player::new $user;
407 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 443 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
408 nuke_str $pass; 444 nuke_str $pass;
409 $pl->connect ($ns); 445 $pl->connect ($ns);
410
411 my $ob = $pl->ob; 446 my $ob = $pl->ob;
447
448 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
412 449
413 while () { 450 while () {
414 $ob->update_stats; 451 $ob->update_stats;
415 $pl->save_stats; 452 $pl->save_stats;
416 453
431 } 468 }
432 469
433 $ob->set_animation (2); 470 $ob->set_animation (2);
434 $ob->add_statbonus; 471 $ob->add_statbonus;
435 472
436 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 473 while () {
437 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 474 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
475 my $msg = $ob->msg;
476 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
477 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
478
479 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"); 480 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
439 481
440 $ns->state (cf::ST_CHANGE_CLASS); 482 last if $res =~ /[dD]/;
483
484 $pl->chargen_race_next;
485 }
486
487 $pl->chargen_race_done;
488
489 while () {
490 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
491 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
492
493 if ($res =~ /^[fF]/) {
494 $pl->gender (1);
495 last;
496 } elsif ($res =~ /^[mM]/) {
497 $pl->gender (0);
498 last;
499 }
500 }
501
502 $ob->reply (undef, "Welcome to Crossfire!");
503
441 delete $pl->{deny_save};#d# too early 504 delete $pl->{deny_save};
442 505
443 last; 506 last;
444 } 507 }
445 }); 508 });
446} 509}
552 eval { 615 eval {
553 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 616 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
554 cf::wait_for_tick_begin; 617 cf::wait_for_tick_begin;
555 $pl->save; 618 $pl->save;
556 619
557 unless ($pl->active) { 620 unless ($pl->active || $pl->ns) {
558 # check refcounts, this is tricky and needs to be adjusted to fit server internals 621 # check refcounts, this is tricky and needs to be adjusted to fit server internals
559 my $ob = $pl->ob; 622 my $ob = $pl->ob;
560 Scalar::Util::weaken $pl; 623
561 Scalar::Util::weaken $ob;
562 my $a_ = $pl->refcnt;#d#
563 my $b_ = $ob->refcnt;#d#
564 my $pl_ref = $pl->refcnt_cnt; 624 my $pl_ref = $pl->refcnt_cnt;
565 my $ob_ref = $ob->refcnt_cnt; 625 my $ob_ref = $ob->refcnt_cnt;
566 626
567 ## pl_ref == one from object + one from cf::PLAYER 627 ## pl_ref == $pl + ob->contr + %cf::PLAYER
568 ## ob_ref == one from simply being an object 628 ## ob_ref == $ob + pl->observe + simply being an object
569 if ($pl_ref == 2 && $ob_ref == 1) { 629 if ($pl_ref == 3 && $ob_ref == 3) {
570 warn "player-scheduler destroy ", $ob->name;#d# 630 warn "player-scheduler destroy ", $ob->name;#d#
571 631
572 # remove from sight and get fresh "copies" 632 # remove from sight and get fresh "copies"
573 $pl = delete $cf::PLAYER{$ob->name}; 633 $pl = delete $cf::PLAYER{$ob->name};
574 $ob = $pl->ob; 634 $ob = $pl->ob;
575 635
576 $ob->destroy;
577 $pl->destroy; 636 $pl->destroy; # destroys $ob
578 } else { 637 } else {
638 my $a_ = $pl->refcnt;#d#
639 my $b_ = $ob->refcnt;#d#
640
579 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 641 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
580 } 642 }
581 } 643 }
582 } 644 }
583 }; 645 };
584 warn $@ if $@; 646 warn $@ if $@;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines