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.70 by root, Sun Sep 2 12:37:10 2007 UTC vs.
Revision 1.87 by root, Wed May 28 05:12:01 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_rename "$PLAYERDIR/$user", "$PLAYERDIR/~$Coro::current~deleting~";
122 system "rm -rf \Q$PLAYERDIR/~$Coro::current~deleting~\E &"; 139 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
140
141 cf::fork_call {
142 rename "$PLAYERDIR/$user", $temp;
143 system "rm", "-rf", $temp;
144 };
123} 145}
124 146
125cf::client->attach (on_addme => sub { 147cf::client->attach (on_addme => sub {
126 my ($ns) = @_; 148 my ($ns) = @_;
127 149
136*** or it has been disabled. Face caching is mandatory 158*** or it has been disabled. Face caching is mandatory
137*** so please enable it or use a newer client. 159*** so please enable it or use a newer client.
138*** 160***
139*** Look at your client preferences: 161*** Look at your client preferences:
140*** 162***
141*** CFPlus: all known versions automatically enable the facecache. 163*** deliantra: all known versions automatically enable the facecache.
142*** cfclient: use the -cache commandline option. 164*** cfclient: use the -cache commandline option.
143*** cfclient: map will not redraw automatically (bug). 165*** cfclient: map will not redraw automatically (bug).
144*** gcfclient: use -cache commandline option, or enable 166*** gcfclient: use -cache commandline option, or enable
145*** gcfclient: Client => Configure => Map & Image => Cache Images. 167*** gcfclient: Client => Configure => Map & Image => Cache Images.
146*** jcrossclient: your client is broken, use CFPlus or gcfclient. 168*** jcrossclient: your client is broken, use deliantra or gcfclient.
147*** 169***
148*** 170***
149EOF 171EOF
150 if ($ns->version =~ /jcrossclient/) { 172 if ($ns->version =~ /jcrossclient/) {
151 # let them, for now 173 # let them, for now
171 } 193 }
172 194
173 $ns->pl and return $ns->destroy; 195 $ns->pl and return $ns->destroy;
174 196
175 $ns->async (sub { 197 $ns->async (sub {
198 $Coro::current->{desc} = "addme init";
199
176 my ($user, $pass); 200 my ($user, $pass);
177 201
178 $ns->send_packet ("addme_success"); 202 $ns->send_packet ("addme_success");
179 203
180 for (;;) { 204 for (;;) {
208 Coro::Timer::sleep 0.4; 232 Coro::Timer::sleep 0.4;
209 } 233 }
210 234
211 check_playing $ns, $user and next; 235 check_playing $ns, $user and next;
212 236
237 $Coro::current->{desc} = "addme($user) pass";
238
213 $ns->send_drawinfo ( 239 $ns->send_drawinfo (
214 "Welcome $user, please enter your password now. " 240 "Welcome $user, please enter your password now. "
215 . "New users should now choose a password. " 241 . "New users should now choose a password. "
216 . "Anything your client lets you enter is fine.", 242 . "Anything your client lets you enter is fine.",
217 cf::NDI_BLUE 243 cf::NDI_BLUE
239 next; 265 next;
240 } 266 }
241 local $cf::LOGIN_LOCK{$user} = 1; 267 local $cf::LOGIN_LOCK{$user} = 1;
242 268
243 check_playing $ns, $user and next; 269 check_playing $ns, $user and next;
270
271 $Coro::current->{desc} = "addme($user) check";
244 272
245 # try to read the user file and check the password 273 # try to read the user file and check the password
246 if (my $pl = cf::player::find $user) { 274 if (my $pl = cf::player::find $user) {
247 aio_stat $pl->path and next; 275 aio_stat $pl->path and next;
248 my $mtime = (stat _)[9]; 276 my $mtime = (stat _)[9];
302 next; 330 next;
303 } 331 }
304 } 332 }
305 333
306 # the rest of this function is character creation 334 # the rest of this function is character creation
335 $Coro::current->{desc} = "addme($user) chargen";
307 336
308 # just to make sure nothing is left over 337 # just to make sure nothing is left over
309 nuke_playerdir $user; 338 nuke_playerdir $user;
310 339
311 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.";
348 } 377 }
349 } else { 378 } else {
350 $ob->roll_stats; 379 $ob->roll_stats;
351 } 380 }
352 381
353 Coro::Timer::sleep 0.2; 382 Coro::Timer::sleep 0.05;
354 } 383 }
355 384
356 $ob->set_animation (2); 385 $ob->set_animation (2);
357 $ob->add_statbonus; 386 $ob->add_statbonus;
358 387
369 398
370 $pl->chargen_race_next; 399 $pl->chargen_race_next;
371 Coro::Timer::sleep 0.2; 400 Coro::Timer::sleep 0.2;
372 } 401 }
373 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;
374 $pl->chargen_race_done; 406 $pl->chargen_race_done;
375 407
376 while () { 408 while () {
377 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 409 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
378 "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";
385 last; 417 last;
386 } 418 }
387 Coro::Timer::sleep 0.2; 419 Coro::Timer::sleep 0.2;
388 } 420 }
389 421
390 $ob->reply (undef, "Welcome to Crossfire!"); 422 $ob->reply (undef, "Welcome to Deliantra!");
391 423
392 delete $pl->{deny_save}; 424 delete $pl->{deny_save};
393 425
394 last; 426 last;
395 } 427 }
436 468
437 # update respawn position 469 # update respawn position
438 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 470 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
439 cf::async { $pl->save }; 471 cf::async { $pl->save };
440 472
441 $pl->killer ("left"); 473 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
442 $ob->check_score; 474 $ob->check_score;
443 475
444 $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.");
445 477
446 $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 {
468 500
469 if ($cleanly) { 501 if ($cleanly) {
470 $_->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;
471 } else { 503 } else {
472 $_->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;
473 $pl->{unclean_save} = $cf::RUNTIME; 505 $pl->{unclean_save} = $cf::RUNTIME
506 unless safe_spot $pl;
474 } 507 }
475 }, 508 },
476); 509);
477 510
478############################################################################# 511#############################################################################
479 512
480our $SCHEDULE_INTERVAL = $cf::CFG{player_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
481our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds 514our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
482 515
483our $SCHEDULER = cf::async_ext { 516our $SCHEDULER = cf::async_ext {
484 my $schedule_interval = Coro::Event->timer (after => 1); 517 $Coro::current->{desc} = "player scheduler";
518
485 while () { 519 while () {
486 $schedule_interval->interval ($SCHEDULE_INTERVAL); 520 Coro::EV::timer_once $SCHEDULE_INTERVAL;
487 $schedule_interval->next;
488 521
489 # this weird form of iteration over values is used because 522 # this weird form of iteration over values is used because
490 # the hash changes underneath us frequently, and for 523 # the hash changes underneath us frequently, and for
491 # 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)
492 # keeping a reference, so this is prone to crashes or worse. 525 # keeping a reference, so this is prone to crashes or worse.
519 $pl->destroy; # destroys $ob 552 $pl->destroy; # destroys $ob
520 } else { 553 } else {
521 my $a_ = $pl->refcnt;#d# 554 my $a_ = $pl->refcnt;#d#
522 my $b_ = $ob->refcnt;#d# 555 my $b_ = $ob->refcnt;#d#
523 556
524 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#
525 } 558 }
526 } 559 }
527 } 560 }
528 }; 561 };
529 warn $@ if $@; 562 warn $@ if $@;
530 Coro::cede; 563 cf::cede_to_tick;
531 }; 564 };
532 } 565 }
533}; 566};
534 567
535$SCHEDULER->prio (1); 568$SCHEDULER->prio (1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines