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.84 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.92 by root, Mon Sep 22 01:33:09 2008 UTC

… …
73} 73}
74 74
75sub enter_map { 75sub enter_map {
76 my ($pl) = @_; 76 my ($pl) = @_;
77 77
78 warn $pl->ob->name, ": enter map 1\n";#d#
78 my $ob = $pl->ob; 79 my $ob = $pl->ob;
79 80
80 my ($map, $x, $y) 81 my ($map, $x, $y)
81 = $ob->{_link_pos} 82 = $ob->{_link_pos}
82 ? @{delete $ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
83 : ($pl->maplevel, $ob->x, $ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
84 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
85 $ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
86 89
87 my $m = cf::map::find $map; 90 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 91 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
89 93
90 if ($time && $m) { 94 if ($time && $m) {
91 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
92 # the map was reset in the meantime 96 # the map was reset in the meantime
93 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
… …
103 cf::NDI_RED 107 cf::NDI_RED
104 ); 108 );
105 # kill them. 109 # kill them.
106 # reminds me of the famous badness 10000 syndrome... 110 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live 111 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 my $killer = cf::arch::get "killer_login"; 112 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else { 113 } else {
112 ($map, $x, $y) = $pl->savebed; 114 ($map, $x, $y) = $pl->savebed;
113 115
114 $ob->message ( 116 $ob->message (
115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
… …
128 cf::NDI_RED 130 cf::NDI_RED
129 ); 131 );
130 } 132 }
131 } 133 }
132 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
133 $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
134} 145}
135 146
136# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
137# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
138sub nuke_playerdir { 149sub nuke_playerdir {
… …
211 cf::NDI_BLUE 222 cf::NDI_BLUE
212 ); 223 );
213 224
214 # read username 225 # read username
215 while () { 226 while () {
216 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
217 228
218 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
219 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
220 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
221 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
222 cf::NDI_RED 233 cf::NDI_RED
223 ); 234 );
224 } 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/) {
225 last; 236 last;
226 } else { 237 } else {
227 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
228 "Your username contains illegal characters " 239 "Your username contains illegal characters "
229 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
230 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 20 characters in length.",
231 cf::NDI_RED 242 cf::NDI_RED
232 ); 243 );
233 } 244 }
234 Coro::Timer::sleep 0.4; 245 Coro::Timer::sleep 0.4;
235 } 246 }
… …
281 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) {
282 nuke_str $pass; 293 nuke_str $pass;
283 # password matches, wonderful 294 # password matches, wonderful
284 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
285 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
286 enter_map $pl; 298 enter_map $pl;
287 last; 299 last;
288 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
289 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
290 302
… …
379 } 391 }
380 } else { 392 } else {
381 $ob->roll_stats; 393 $ob->roll_stats;
382 } 394 }
383 395
384 Coro::Timer::sleep 0.2; 396 Coro::Timer::sleep 0.05;
385 } 397 }
386 398
387 $ob->set_animation (2); 399 $ob->set_animation (2);
388 $ob->add_statbonus; 400 $ob->add_statbonus;
389 401
… …
400 412
401 $pl->chargen_race_next; 413 $pl->chargen_race_next;
402 Coro::Timer::sleep 0.2; 414 Coro::Timer::sleep 0.2;
403 } 415 }
404 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;
405 $pl->chargen_race_done; 420 $pl->chargen_race_done;
406 421
407 while () { 422 while () {
408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
409 "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";
… …
467 482
468 # update respawn position 483 # update respawn position
469 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
470 cf::async { $pl->save }; 485 cf::async { $pl->save };
471 486
472 my $killer = cf::arch::get "killer_logout"; 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
473 $pl->killer ($killer);
474 $killer->destroy;
475 $ob->check_score; 488 $ob->check_score;
476 489
477 $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.");
478 491
479 $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 {
… …
507 unless safe_spot $pl; 520 unless safe_spot $pl;
508 } 521 }
509 }, 522 },
510); 523);
511 524
512#############################################################################
513 525
514our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
515our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
516
517our $SCHEDULER = cf::async_ext {
518 $Coro::current->{desc} = "player scheduler";
519
520 while () {
521 Coro::EV::timer_once $SCHEDULE_INTERVAL;
522
523 # this weird form of iteration over values is used because
524 # the hash changes underneath us frequently, and for
525 # keeps a direct reference to the value without (in 5.8 perls)
526 # keeping a reference, so this is prone to crashes or worse.
527 my @players = keys %cf::PLAYER;
528 for (@players) {
529 my $pl = $cf::PLAYER{$_}
530 or next;
531 $pl->valid or next;
532
533 eval {
534 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
535 $pl->save;
536
537 unless ($pl->active || $pl->ns) {
538 # check refcounts, this is tricky and needs to be adjusted to fit server internals
539 my $ob = $pl->ob;
540
541 my $pl_ref = $pl->refcnt_cnt;
542 my $ob_ref = $ob->refcnt_cnt;
543
544 ## pl_ref == $pl + ob->contr + %cf::PLAYER
545 ## ob_ref == $ob + pl->observe + simply being an object
546 if ($pl_ref == 3 && $ob_ref == 3) {
547 warn "player-scheduler destroy ", $ob->name;#d#
548
549 # remove from sight and get fresh "copies"
550 $pl = delete $cf::PLAYER{$ob->name};
551 $ob = $pl->ob;
552
553 $pl->destroy; # destroys $ob
554 } else {
555 my $a_ = $pl->refcnt;#d#
556 my $b_ = $ob->refcnt;#d#
557
558 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
559 }
560 }
561 }
562 };
563 warn $@ if $@;
564 cf::cede_to_tick;
565 };
566 }
567};
568
569$SCHEDULER->prio (1);
570

Diff Legend

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