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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines