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.85 by root, Mon May 5 16:02:20 2008 UTC vs.
Revision 1.90 by root, Tue Sep 16 16:03:02 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.",
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
470 482
471 # update respawn position 483 # update respawn position
472 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
473 cf::async { $pl->save }; 485 cf::async { $pl->save };
474 486
475 my $killer = cf::arch::get "killer_logout"; 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
476 $pl->killer ($killer);
477 $killer->destroy;
478 $ob->check_score; 488 $ob->check_score;
479 489
480 $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.");
481 491
482 $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 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines