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.98 by root, Sun Jun 28 16:46:50 2009 UTC vs.
Revision 1.105 by root, Wed Apr 28 11:28:21 2010 UTC

1#! perl # mandatory 1#! perl # mandatory depends=highscore
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
… …
70} 70}
71 71
72sub enter_map { 72sub enter_map {
73 my ($pl) = @_; 73 my ($pl) = @_;
74 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
76 my $ob = $pl->ob; 75 my $ob = $pl->ob;
77 76
78 my ($map, $x, $y) 77 my ($map, $x, $y)
79 = $ob->{_link_pos} 78 = $ob->{_link_pos}
80 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
81 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
82 81
83 warn $pl->ob->name, ": enter map 2\n";#d#
84 $ob->enter_link; 82 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86 83
87 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
90 86
91 if ($time && $m) { 87 if ($time && $m) {
92 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
93 # the map was reset in the meantime 89 # the map was reset in the meantime
94 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
… …
127 cf::NDI_RED 123 cf::NDI_RED
128 ); 124 );
129 } 125 }
130 } 126 }
131 127
132 warn $pl->ob->name, ": enter map 5\n";#d#
133 #$ob->goto ($map, $x, $y); 128 $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
142} 129}
143 130
144# delete a player directory, be non-blocking AND synchronous... 131# delete a player directory, be non-blocking AND synchronous...
145# (that's hard, so we crap out and fork). 132# (that's hard, so we crap out and fork).
146sub nuke_playerdir { 133sub nuke_playerdir {
… …
244 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 231 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
245 nuke_str $pass; 232 nuke_str $pass;
246 # password matches, wonderful 233 # password matches, wonderful
247 my $pl = cf::player::find $user or next; 234 my $pl = cf::player::find $user or next;
248 $pl->connect ($ns); 235 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
250 #d# Coro::Timer::sleep 60;#d# log out here to trigger DEBUG bug
251 enter_map $pl; 236 enter_map $pl;
252 last; 237 last;
253 } elsif (can_cleanup $pl, $mtime) { 238 } elsif (can_cleanup $pl, $mtime) {
254 Coro::Timer::sleep 1; 239 Coro::Timer::sleep 1;
255 240
… …
318 } 303 }
319 304
320 nuke_str $pass2; 305 nuke_str $pass2;
321 306
322 my $pl = cf::player::new $user; 307 my $pl = cf::player::new $user;
323 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 308 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]);
324 nuke_str $pass; 309 nuke_str $pass;
325 $pl->connect ($ns); 310 $pl->connect ($ns);
326 my $ob = $pl->ob; 311 my $ob = $pl->ob;
327 312
328 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 313 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
362 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
363 348
364 last if $res =~ /[dD]/; 349 last if $res =~ /[dD]/;
365 350
366 $pl->chargen_race_next; 351 $pl->chargen_race_next;
367 Coro::Timer::sleep 0.2; 352 Coro::Timer::sleep 0.05;
368 } 353 }
369 354
370 # create the playerdir, if necessary, as chargen_race_done did it before 355 # create the playerdir, if necessary, as chargen_race_done did it before
371 # presumably because of unique maps 356 # presumably because of unique maps
372 aio_mkdir playerdir $pl, 0770; 357 aio_mkdir playerdir $pl, 0770;
… …
381 last; 366 last;
382 } elsif ($res =~ /^[mM]/) { 367 } elsif ($res =~ /^[mM]/) {
383 $pl->gender (0); 368 $pl->gender (0);
384 last; 369 last;
385 } 370 }
386 Coro::Timer::sleep 0.2; 371 Coro::Timer::sleep 0.05;
387 } 372 }
388 373
389 $ob->reply (undef, "Welcome to Deliantra!"); 374 $ob->reply (undef, "Welcome to Deliantra!");
390 375
391 # XXX: Workaround for delayed client ext protocol handshake 376 # XXX: Workaround for delayed client ext protocol handshake
392 $pl->esrv_new_player; 377 $pl->esrv_new_player;
393 378
394 delete $pl->{deny_save}; 379 delete $pl->{deny_save};
395 380
396 last; 381 last;
382 }
383
384 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
385 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
397 } 386 }
398 }); 387 });
399}); 388});
400 389
401cf::register_command quit => sub { 390cf::register_command quit => sub {
… …
416 if ($_[0] !~ /^[yY]/) { 405 if ($_[0] !~ /^[yY]/) {
417 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 406 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
418 } else { 407 } else {
419 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 408 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
420 $pl->ns->flush; 409 $pl->ns->flush;
410 cf::async {
411 ext::highscore::check $pl->ob;
421 cf::async { $pl->quit_character }; 412 $pl->quit_character;
413 };
422 } 414 }
423 }); 415 });
424}; 416};
425 417
426cf::object->attach ( 418cf::object->attach (
… …
435 # update respawn position 427 # update respawn position
436 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 428 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
437 cf::async { $pl->save }; 429 cf::async { $pl->save };
438 430
439 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 431 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
440 $ob->check_score; 432 ext::highscore::check $ob;
441 433
442 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 434 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
443 435
444 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 436 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
445 if ($_[0] !~ /^[yY]/) { 437 if ($_[0] !~ /^[yY]/) {

Diff Legend

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