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.88 by root, Sun Aug 17 22:46:26 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 {
119 my ($user) = @_; 150 my ($user) = @_;
120 151
121 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
122 system "cd \Q$PLAYERDIR\E " 153
123 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 154 cf::fork_call {
124 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 155 rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp;
157 };
125} 158}
126 159
127cf::client->attach (on_addme => sub { 160cf::client->attach (on_addme => sub {
128 my ($ns) = @_; 161 my ($ns) = @_;
129 162
138*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
139*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
140*** 173***
141*** Look at your client preferences: 174*** Look at your client preferences:
142*** 175***
143*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
144*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
145*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
146*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
147*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
148*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
149*** 182***
150*** 183***
151EOF 184EOF
152 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
153 # let them, for now 186 # let them, for now
173 } 206 }
174 207
175 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
176 209
177 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
178 my ($user, $pass); 213 my ($user, $pass);
179 214
180 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
181 216
182 for (;;) { 217 for (;;) {
210 Coro::Timer::sleep 0.4; 245 Coro::Timer::sleep 0.4;
211 } 246 }
212 247
213 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
214 249
250 $Coro::current->{desc} = "addme($user) pass";
251
215 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
216 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
217 . "New users should now choose a password. " 254 . "New users should now choose a password. "
218 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
219 cf::NDI_BLUE 256 cf::NDI_BLUE
241 next; 278 next;
242 } 279 }
243 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
244 281
245 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
283
284 $Coro::current->{desc} = "addme($user) check";
246 285
247 # try to read the user file and check the password 286 # try to read the user file and check the password
248 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
249 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
250 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
304 next; 343 next;
305 } 344 }
306 } 345 }
307 346
308 # the rest of this function is character creation 347 # the rest of this function is character creation
348 $Coro::current->{desc} = "addme($user) chargen";
309 349
310 # just to make sure nothing is left over 350 # just to make sure nothing is left over
311 nuke_playerdir $user; 351 nuke_playerdir $user;
312 352
313 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 353 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
350 } 390 }
351 } else { 391 } else {
352 $ob->roll_stats; 392 $ob->roll_stats;
353 } 393 }
354 394
355 Coro::Timer::sleep 0.2; 395 Coro::Timer::sleep 0.05;
356 } 396 }
357 397
358 $ob->set_animation (2); 398 $ob->set_animation (2);
359 $ob->add_statbonus; 399 $ob->add_statbonus;
360 400
371 411
372 $pl->chargen_race_next; 412 $pl->chargen_race_next;
373 Coro::Timer::sleep 0.2; 413 Coro::Timer::sleep 0.2;
374 } 414 }
375 415
416 # create the playerdir, if necessary, as chargen_race_done did it before
417 # presumably because of unique maps
418 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done; 419 $pl->chargen_race_done;
377 420
378 while () { 421 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 422 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 423 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
387 last; 430 last;
388 } 431 }
389 Coro::Timer::sleep 0.2; 432 Coro::Timer::sleep 0.2;
390 } 433 }
391 434
392 $ob->reply (undef, "Welcome to Crossfire!"); 435 $ob->reply (undef, "Welcome to Deliantra!");
393 436
394 delete $pl->{deny_save}; 437 delete $pl->{deny_save};
395 438
396 last; 439 last;
397 } 440 }
438 481
439 # update respawn position 482 # update respawn position
440 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 483 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
441 cf::async { $pl->save }; 484 cf::async { $pl->save };
442 485
443 $pl->killer ("left"); 486 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
444 $ob->check_score; 487 $ob->check_score;
445 488
446 $ob->reply (undef, "In the future, you will wake up here when you die."); 489 $ob->reply (undef, "In the future, you will wake up here when you die.");
447 490
448 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 491 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
470 513
471 if ($cleanly) { 514 if ($cleanly) {
472 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 515 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
473 } else { 516 } else {
474 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 517 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
475 $pl->{unclean_save} = $cf::RUNTIME; 518 $pl->{unclean_save} = $cf::RUNTIME
519 unless safe_spot $pl;
476 } 520 }
477 }, 521 },
478); 522);
479 523
480############################################################################# 524#############################################################################
481 525
482our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 526our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
483our $SAVE_TIMEOUT = 20; # save players every n seconds 527our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
484 528
485our $SCHEDULER = cf::async_ext { 529our $SCHEDULER = cf::async_ext {
486 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 530 $Coro::current->{desc} = "player scheduler";
531
487 while () { 532 while () {
488 $schedule_interval->next; 533 Coro::EV::timer_once $SCHEDULE_INTERVAL;
489 534
490 # this weird form of iteration over values is used because 535 # this weird form of iteration over values is used because
491 # the hash changes underneath us frequently, and for 536 # the hash changes underneath us frequently, and for
492 # keeps a direct reference to the value without (in 5.8 perls) 537 # keeps a direct reference to the value without (in 5.8 perls)
493 # keeping a reference, so this is prone to crashes or worse. 538 # keeping a reference, so this is prone to crashes or worse.
497 or next; 542 or next;
498 $pl->valid or next; 543 $pl->valid or next;
499 544
500 eval { 545 eval {
501 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 546 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
502 cf::wait_for_tick_begin;
503 $pl->save; 547 $pl->save;
504 548
505 unless ($pl->active || $pl->ns) { 549 unless ($pl->active || $pl->ns) {
506 # check refcounts, this is tricky and needs to be adjusted to fit server internals 550 # check refcounts, this is tricky and needs to be adjusted to fit server internals
507 my $ob = $pl->ob; 551 my $ob = $pl->ob;
521 $pl->destroy; # destroys $ob 565 $pl->destroy; # destroys $ob
522 } else { 566 } else {
523 my $a_ = $pl->refcnt;#d# 567 my $a_ = $pl->refcnt;#d#
524 my $b_ = $ob->refcnt;#d# 568 my $b_ = $ob->refcnt;#d#
525 569
526 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 570 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
527 } 571 }
528 } 572 }
529 } 573 }
530 }; 574 };
531 warn $@ if $@; 575 warn $@ if $@;
532 Coro::cede; 576 cf::cede_to_tick;
533 }; 577 };
534 } 578 }
535}; 579};
536 580
537$SCHEDULER->prio (1); 581$SCHEDULER->prio (1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines