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.73 by root, Mon Oct 1 00:55:50 2007 UTC vs.
Revision 1.90 by root, Tue Sep 16 16:03:02 2008 UTC

… …
52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub safe_spot($) {
58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
57sub enter_map { 75sub enter_map {
58 my ($pl) = @_; 76 my ($pl) = @_;
59 77
78 warn $pl->ob->name, ": enter map 1\n";#d#
60 my $ob = $pl->ob; 79 my $ob = $pl->ob;
61 80
62 my ($map, $x, $y) 81 my ($map, $x, $y)
63 = $ob->{_link_pos} 82 = $ob->{_link_pos}
64 ? @{delete $ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
66 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
67 $ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
68 89
90 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 96 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
74 98
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 100
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 101 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 $pl->killer ("a cave-in");
92 } else {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
96 . "Better use a savebed next time, much worse things could have happened... "
97 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
98 cf::NDI_RED
99 );
100 }
101 } else {
102 $ob->message ( 102 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 103 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "as lots of things could happen when you leave by other means, such as cave-ins, " 104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
105 . "or monsters suddenly snapping your body. Better use a savebed next time. " 105 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<Always apply a bed of reality to disconnect from the server.>", 106 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED 107 cf::NDI_RED
108 ); 108 );
109 # kill them.
110 # reminds me of the famous badness 10000 syndrome...
111 $ob->stats->hp (-10000); #] if they survive this they deserved to live
112 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
113 } else {
114 ($map, $x, $y) = $pl->savebed;
115
116 $ob->message (
117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
118 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
119 . "Better use a savebed next time, much worse things could have happened... "
120 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
121 cf::NDI_RED
122 );
123 }
124 } else {
125 $ob->message (
126 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
127 . "as lots of things could happen when you leave by other means, such as cave-ins, "
128 . "or monsters suddenly snapping your body. Better use a savebed next time. "
129 . "H<Always apply a bed of reality to disconnect from the server.>",
130 cf::NDI_RED
109 } 131 );
110 } 132 }
111 } 133 }
112 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
113 $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
114} 145}
115 146
116# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
117# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
118sub nuke_playerdir { 149sub nuke_playerdir {
… …
140*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
141*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
142*** 173***
143*** Look at your client preferences: 174*** Look at your client preferences:
144*** 175***
145*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
146*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
147*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
148*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
149*** gcfclient: Client => Configure => Map & Image => Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
150*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
151*** 182***
152*** 183***
153EOF 184EOF
154 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
155 # let them, for now 186 # let them, for now
… …
191 cf::NDI_BLUE 222 cf::NDI_BLUE
192 ); 223 );
193 224
194 # read username 225 # read username
195 while () { 226 while () {
196 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
197 228
198 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
199 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
200 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
201 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
… …
261 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) {
262 nuke_str $pass; 293 nuke_str $pass;
263 # password matches, wonderful 294 # password matches, wonderful
264 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
265 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
266 enter_map $pl; 298 enter_map $pl;
267 last; 299 last;
268 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
269 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
270 302
… …
359 } 391 }
360 } else { 392 } else {
361 $ob->roll_stats; 393 $ob->roll_stats;
362 } 394 }
363 395
364 Coro::Timer::sleep 0.2; 396 Coro::Timer::sleep 0.05;
365 } 397 }
366 398
367 $ob->set_animation (2); 399 $ob->set_animation (2);
368 $ob->add_statbonus; 400 $ob->add_statbonus;
369 401
… …
380 412
381 $pl->chargen_race_next; 413 $pl->chargen_race_next;
382 Coro::Timer::sleep 0.2; 414 Coro::Timer::sleep 0.2;
383 } 415 }
384 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;
385 $pl->chargen_race_done; 420 $pl->chargen_race_done;
386 421
387 while () { 422 while () {
388 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
389 "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";
… …
396 last; 431 last;
397 } 432 }
398 Coro::Timer::sleep 0.2; 433 Coro::Timer::sleep 0.2;
399 } 434 }
400 435
401 $ob->reply (undef, "Welcome to Crossfire!"); 436 $ob->reply (undef, "Welcome to Deliantra!");
402 437
403 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
404 439
405 last; 440 last;
406 } 441 }
… …
447 482
448 # update respawn position 483 # update respawn position
449 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
450 cf::async { $pl->save }; 485 cf::async { $pl->save };
451 486
452 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
453 $ob->check_score; 488 $ob->check_score;
454 489
455 $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.");
456 491
457 $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 {
… …
479 514
480 if ($cleanly) { 515 if ($cleanly) {
481 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 516 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
482 } else { 517 } else {
483 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 518 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
484 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
485 } 521 }
486 }, 522 },
487); 523);
488 524
489############################################################################# 525#############################################################################
… …
492our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds 528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
493 529
494our $SCHEDULER = cf::async_ext { 530our $SCHEDULER = cf::async_ext {
495 $Coro::current->{desc} = "player scheduler"; 531 $Coro::current->{desc} = "player scheduler";
496 532
497 my $schedule_interval = Coro::Event->timer (after => 1, data => cf::WF_AUTOCANCEL);
498 while () { 533 while () {
499 $schedule_interval->interval ($SCHEDULE_INTERVAL); 534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
500 $schedule_interval->next;
501 535
502 # this weird form of iteration over values is used because 536 # this weird form of iteration over values is used because
503 # the hash changes underneath us frequently, and for 537 # the hash changes underneath us frequently, and for
504 # keeps a direct reference to the value without (in 5.8 perls) 538 # keeps a direct reference to the value without (in 5.8 perls)
505 # keeping a reference, so this is prone to crashes or worse. 539 # keeping a reference, so this is prone to crashes or worse.
… …
532 $pl->destroy; # destroys $ob 566 $pl->destroy; # destroys $ob
533 } else { 567 } else {
534 my $a_ = $pl->refcnt;#d# 568 my $a_ = $pl->refcnt;#d#
535 my $b_ = $ob->refcnt;#d# 569 my $b_ = $ob->refcnt;#d#
536 570
537 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 571 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
538 } 572 }
539 } 573 }
540 } 574 }
541 }; 575 };
542 warn $@ if $@; 576 warn $@ if $@;
543 Coro::cede; 577 cf::cede_to_tick;
544 }; 578 };
545 } 579 }
546}; 580};
547 581
548$SCHEDULER->prio (1); 582$SCHEDULER->prio (1);

Diff Legend

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