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.67 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.85 by root, Mon May 5 16:02:20 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
60 my $ob = $pl->ob; 78 my $ob = $pl->ob;
61 79
64 ? @{delete $ob->{_link_pos}} 82 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 83 : ($pl->maplevel, $ob->x, $ob->y);
66 84
67 $ob->enter_link; 85 $ob->enter_link;
68 86
87 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 89
90 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 91 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 92 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 93 my $age = $cf::RUNTIME - $time;
74 94
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 95 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 96
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 97 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 ( 98 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 99 "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, " 100 . "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. " 101 . "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.>", 102 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED 103 cf::NDI_RED
108 ); 104 );
105 # kill them.
106 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 my $killer = cf::arch::get "killer_login";
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else {
112 ($map, $x, $y) = $pl->savebed;
113
114 $ob->message (
115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
116 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
117 . "Better use a savebed next time, much worse things could have happened... "
118 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
119 cf::NDI_RED
120 );
121 }
122 } else {
123 $ob->message (
124 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
125 . "as lots of things could happen when you leave by other means, such as cave-ins, "
126 . "or monsters suddenly snapping your body. Better use a savebed next time. "
127 . "H<Always apply a bed of reality to disconnect from the server.>",
128 cf::NDI_RED
109 } 129 );
110 } 130 }
111 } 131 }
112 132
113 $ob->goto ($map, $x, $y); 133 $ob->goto ($map, $x, $y);
114} 134}
116# delete a player directory, be non-blocking AND synchronous... 136# delete a player directory, be non-blocking AND synchronous...
117# (thats hard, so we crap out and fork). 137# (thats hard, so we crap out and fork).
118sub nuke_playerdir { 138sub nuke_playerdir {
119 my ($user) = @_; 139 my ($user) = @_;
120 140
121 aio_stat "$PLAYERDIR/$user"; 141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
122 system "cd \Q$PLAYERDIR\E " 142
123 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 143 cf::fork_call {
124 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 144 rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp;
146 };
125} 147}
126 148
127cf::client->attach (on_addme => sub { 149cf::client->attach (on_addme => sub {
128 my ($ns) = @_; 150 my ($ns) = @_;
129 151
138*** or it has been disabled. Face caching is mandatory 160*** or it has been disabled. Face caching is mandatory
139*** so please enable it or use a newer client. 161*** so please enable it or use a newer client.
140*** 162***
141*** Look at your client preferences: 163*** Look at your client preferences:
142*** 164***
143*** CFPlus: all known versions automatically enable the facecache. 165*** deliantra: all known versions automatically enable the facecache.
144*** cfclient: use the -cache commandline option. 166*** cfclient: use the -cache commandline option.
145*** cfclient: map will not redraw automatically (bug). 167*** cfclient: map will not redraw automatically (bug).
146*** gcfclient: use -cache commandline option, or enable 168*** gcfclient: use -cache commandline option, or enable
147*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 169*** gcfclient: Client => Configure => Map & Image => Cache Images.
148*** jcrossclient: your client is broken, use CFPlus or gcfclient. 170*** jcrossclient: your client is broken, use deliantra or gcfclient.
149*** 171***
150*** 172***
151EOF 173EOF
152 if ($ns->version =~ /jcrossclient/) { 174 if ($ns->version =~ /jcrossclient/) {
153 # let them, for now 175 # let them, for now
173 } 195 }
174 196
175 $ns->pl and return $ns->destroy; 197 $ns->pl and return $ns->destroy;
176 198
177 $ns->async (sub { 199 $ns->async (sub {
200 $Coro::current->{desc} = "addme init";
201
178 my ($user, $pass); 202 my ($user, $pass);
179 203
180 $ns->send_packet ("addme_success"); 204 $ns->send_packet ("addme_success");
181 205
182 for (;;) { 206 for (;;) {
210 Coro::Timer::sleep 0.4; 234 Coro::Timer::sleep 0.4;
211 } 235 }
212 236
213 check_playing $ns, $user and next; 237 check_playing $ns, $user and next;
214 238
239 $Coro::current->{desc} = "addme($user) pass";
240
215 $ns->send_drawinfo ( 241 $ns->send_drawinfo (
216 "Welcome $user, please enter your password now. " 242 "Welcome $user, please enter your password now. "
217 . "New users should now choose a password. " 243 . "New users should now choose a password. "
218 . "Anything your client lets you enter is fine.", 244 . "Anything your client lets you enter is fine.",
219 cf::NDI_BLUE 245 cf::NDI_BLUE
241 next; 267 next;
242 } 268 }
243 local $cf::LOGIN_LOCK{$user} = 1; 269 local $cf::LOGIN_LOCK{$user} = 1;
244 270
245 check_playing $ns, $user and next; 271 check_playing $ns, $user and next;
272
273 $Coro::current->{desc} = "addme($user) check";
246 274
247 # try to read the user file and check the password 275 # try to read the user file and check the password
248 if (my $pl = cf::player::find $user) { 276 if (my $pl = cf::player::find $user) {
249 aio_stat $pl->path and next; 277 aio_stat $pl->path and next;
250 my $mtime = (stat _)[9]; 278 my $mtime = (stat _)[9];
304 next; 332 next;
305 } 333 }
306 } 334 }
307 335
308 # the rest of this function is character creation 336 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen";
309 338
310 # just to make sure nothing is left over 339 # just to make sure nothing is left over
311 nuke_playerdir $user; 340 nuke_playerdir $user;
312 341
313 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 342 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
371 400
372 $pl->chargen_race_next; 401 $pl->chargen_race_next;
373 Coro::Timer::sleep 0.2; 402 Coro::Timer::sleep 0.2;
374 } 403 }
375 404
405 # create the playerdir, if necessary, as chargen_race_done did it before
406 # presumably because of unique maps
407 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done; 408 $pl->chargen_race_done;
377 409
378 while () { 410 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 411 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 412 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
387 last; 419 last;
388 } 420 }
389 Coro::Timer::sleep 0.2; 421 Coro::Timer::sleep 0.2;
390 } 422 }
391 423
392 $ob->reply (undef, "Welcome to Crossfire!"); 424 $ob->reply (undef, "Welcome to Deliantra!");
393 425
394 delete $pl->{deny_save}; 426 delete $pl->{deny_save};
395 427
396 last; 428 last;
397 } 429 }
438 470
439 # update respawn position 471 # update respawn position
440 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 472 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
441 cf::async { $pl->save }; 473 cf::async { $pl->save };
442 474
475 my $killer = cf::arch::get "killer_logout";
443 $pl->killer ("left"); 476 $pl->killer ($killer);
477 $killer->destroy;
444 $ob->check_score; 478 $ob->check_score;
445 479
446 $ob->reply (undef, "In the future, you will wake up here when you die."); 480 $ob->reply (undef, "In the future, you will wake up here when you die.");
447 481
448 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 482 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
470 504
471 if ($cleanly) { 505 if ($cleanly) {
472 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 506 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
473 } else { 507 } else {
474 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 508 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
475 $pl->{unclean_save} = $cf::RUNTIME; 509 $pl->{unclean_save} = $cf::RUNTIME
510 unless safe_spot $pl;
476 } 511 }
477 }, 512 },
478); 513);
479 514
480############################################################################# 515#############################################################################
481 516
482our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 517our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
483our $SAVE_TIMEOUT = 20; # save players every n seconds 518our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
484 519
485our $SCHEDULER = cf::async_ext { 520our $SCHEDULER = cf::async_ext {
486 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 521 $Coro::current->{desc} = "player scheduler";
522
487 while () { 523 while () {
488 $schedule_interval->next; 524 Coro::EV::timer_once $SCHEDULE_INTERVAL;
489 525
490 # this weird form of iteration over values is used because 526 # this weird form of iteration over values is used because
491 # the hash changes underneath us frequently, and for 527 # the hash changes underneath us frequently, and for
492 # keeps a direct reference to the value without (in 5.8 perls) 528 # keeps a direct reference to the value without (in 5.8 perls)
493 # keeping a reference, so this is prone to crashes or worse. 529 # keeping a reference, so this is prone to crashes or worse.
497 or next; 533 or next;
498 $pl->valid or next; 534 $pl->valid or next;
499 535
500 eval { 536 eval {
501 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 537 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
502 cf::wait_for_tick_begin;
503 $pl->save; 538 $pl->save;
504 539
505 unless ($pl->active || $pl->ns) { 540 unless ($pl->active || $pl->ns) {
506 # check refcounts, this is tricky and needs to be adjusted to fit server internals 541 # check refcounts, this is tricky and needs to be adjusted to fit server internals
507 my $ob = $pl->ob; 542 my $ob = $pl->ob;
521 $pl->destroy; # destroys $ob 556 $pl->destroy; # destroys $ob
522 } else { 557 } else {
523 my $a_ = $pl->refcnt;#d# 558 my $a_ = $pl->refcnt;#d#
524 my $b_ = $ob->refcnt;#d# 559 my $b_ = $ob->refcnt;#d#
525 560
526 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 561 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
527 } 562 }
528 } 563 }
529 } 564 }
530 }; 565 };
531 warn $@ if $@; 566 warn $@ if $@;
532 Coro::cede; 567 cf::cede_to_tick;
533 }; 568 };
534 } 569 }
535}; 570};
536 571
537$SCHEDULER->prio (1); 572$SCHEDULER->prio (1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines