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.76 by root, Fri Dec 28 19:40:22 2007 UTC vs.
Revision 1.93 by elmex, Fri Oct 31 16:13:41 2008 UTC

… …
52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub safe_spot($$$) { 57sub safe_spot($) {
58 my ($m, $x, $y) = @_; 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;
59 71
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61} 73}
62 74
63sub enter_map { 75sub enter_map {
64 my ($pl) = @_; 76 my ($pl) = @_;
65 77
78 warn $pl->ob->name, ": enter map 1\n";#d#
66 my $ob = $pl->ob; 79 my $ob = $pl->ob;
67 80
68 my ($map, $x, $y) 81 my ($map, $x, $y)
69 = $ob->{_link_pos} 82 = $ob->{_link_pos}
70 ? @{delete $ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
71 : ($pl->maplevel, $ob->x, $ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
72 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
73 $ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
74 89
90 my $m = cf::map::find $map;
75 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
76 if (my $m = cf::map::find $map) { 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
77 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
78 # the map was reset in the meantime 96 # the map was reset in the meantime
79 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
80 98
81 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#
82 100
83 ($map, $x, $y) = $pl->savebed;
84
85 if (safe_spot $m, $x, $y) {
86 # do nothing, this is simply ok without a special scary message
87 } elsif ($age >= $MAX_DISCONNECT_TIME) { 101 if ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message (
89 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
90 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
91 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
92 . "H<You disconnected too long without having used a savebed.>",
93 cf::NDI_RED
94 );
95 # kill them.
96 # reminds me of the famous badness 10000 syndrome...
97 $ob->stats->hp (-10000); #] if they survive this they deserved to live
98 $pl->killer ("a cave-in");
99 } else {
100 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
102 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
103 . "Better use a savebed next time, much worse things could have happened... "
104 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
105 cf::NDI_RED
106 );
107 }
108 } elsif (safe_spot $m, $x, $y) {
109 # do nothing, this is simply ok without a special scary message
110 } else {
111 $ob->message ( 102 $ob->message (
112 "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. "
113 . "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. "
114 . "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... "
115 . "H<Always apply a bed of reality to disconnect from the server.>", 106 . "H<You disconnected too long without having used a savebed.>",
116 cf::NDI_RED 107 cf::NDI_RED
117 ); 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
118 } 131 );
119 } 132 }
120 } 133 }
121 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
122 $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
123} 145}
124 146
125# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
126# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
127sub nuke_playerdir { 149sub nuke_playerdir {
… …
149*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
150*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
151*** 173***
152*** Look at your client preferences: 174*** Look at your client preferences:
153*** 175***
154*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
155*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
156*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
157*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
158*** gcfclient: Client => Configure => Map & Image => Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
159*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
160*** 182***
161*** 183***
162EOF 184EOF
163 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
164 # let them, for now 186 # let them, for now
… …
200 cf::NDI_BLUE 222 cf::NDI_BLUE
201 ); 223 );
202 224
203 # read username 225 # read username
204 while () { 226 while () {
205 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
206 228
207 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
208 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
209 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
210 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
211 cf::NDI_RED 233 cf::NDI_RED
212 ); 234 );
213 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
214 last; 236 last;
215 } else { 237 } else {
216 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
217 "Your username contains illegal characters " 239 "Your username contains illegal characters "
218 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
219 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 20 characters in length.",
220 cf::NDI_RED 242 cf::NDI_RED
221 ); 243 );
222 } 244 }
223 Coro::Timer::sleep 0.4; 245 Coro::Timer::sleep 0.4;
224 } 246 }
… …
270 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) {
271 nuke_str $pass; 293 nuke_str $pass;
272 # password matches, wonderful 294 # password matches, wonderful
273 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
274 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
275 enter_map $pl; 298 enter_map $pl;
276 last; 299 last;
277 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
278 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
279 302
… …
368 } 391 }
369 } else { 392 } else {
370 $ob->roll_stats; 393 $ob->roll_stats;
371 } 394 }
372 395
373 Coro::Timer::sleep 0.2; 396 Coro::Timer::sleep 0.05;
374 } 397 }
375 398
376 $ob->set_animation (2); 399 $ob->set_animation (2);
377 $ob->add_statbonus; 400 $ob->add_statbonus;
378 401
… …
389 412
390 $pl->chargen_race_next; 413 $pl->chargen_race_next;
391 Coro::Timer::sleep 0.2; 414 Coro::Timer::sleep 0.2;
392 } 415 }
393 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;
394 $pl->chargen_race_done; 420 $pl->chargen_race_done;
395 421
396 while () { 422 while () {
397 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
398 "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";
… …
406 } 432 }
407 Coro::Timer::sleep 0.2; 433 Coro::Timer::sleep 0.2;
408 } 434 }
409 435
410 $ob->reply (undef, "Welcome to Deliantra!"); 436 $ob->reply (undef, "Welcome to Deliantra!");
437
438 # XXX: Workaround for delayed client ext protocol handshake
439 $pl->esrv_new_player;
411 440
412 delete $pl->{deny_save}; 441 delete $pl->{deny_save};
413 442
414 last; 443 last;
415 } 444 }
… …
456 485
457 # update respawn position 486 # update respawn position
458 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 487 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
459 cf::async { $pl->save }; 488 cf::async { $pl->save };
460 489
461 $pl->killer ("left"); 490 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
462 $ob->check_score; 491 $ob->check_score;
463 492
464 $ob->reply (undef, "In the future, you will wake up here when you die."); 493 $ob->reply (undef, "In the future, you will wake up here when you die.");
465 494
466 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 495 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
488 517
489 if ($cleanly) { 518 if ($cleanly) {
490 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 519 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
491 } else { 520 } else {
492 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 521 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
493 $pl->{unclean_save} = $cf::RUNTIME; 522 $pl->{unclean_save} = $cf::RUNTIME
523 unless safe_spot $pl;
494 } 524 }
495 }, 525 },
496); 526);
497 527
498#############################################################################
499 528
500our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
501our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
502
503our $SCHEDULER = cf::async_ext {
504 $Coro::current->{desc} = "player scheduler";
505
506 while () {
507 Coro::EV::timer_once $SCHEDULE_INTERVAL;
508
509 # this weird form of iteration over values is used because
510 # the hash changes underneath us frequently, and for
511 # keeps a direct reference to the value without (in 5.8 perls)
512 # keeping a reference, so this is prone to crashes or worse.
513 my @players = keys %cf::PLAYER;
514 for (@players) {
515 my $pl = $cf::PLAYER{$_}
516 or next;
517 $pl->valid or next;
518
519 eval {
520 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
521 $pl->save;
522
523 unless ($pl->active || $pl->ns) {
524 # check refcounts, this is tricky and needs to be adjusted to fit server internals
525 my $ob = $pl->ob;
526
527 my $pl_ref = $pl->refcnt_cnt;
528 my $ob_ref = $ob->refcnt_cnt;
529
530 ## pl_ref == $pl + ob->contr + %cf::PLAYER
531 ## ob_ref == $ob + pl->observe + simply being an object
532 if ($pl_ref == 3 && $ob_ref == 3) {
533 warn "player-scheduler destroy ", $ob->name;#d#
534
535 # remove from sight and get fresh "copies"
536 $pl = delete $cf::PLAYER{$ob->name};
537 $ob = $pl->ob;
538
539 $pl->destroy; # destroys $ob
540 } else {
541 my $a_ = $pl->refcnt;#d#
542 my $b_ = $ob->refcnt;#d#
543
544 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
545 }
546 }
547 }
548 };
549 warn $@ if $@;
550 Coro::cede;
551 };
552 }
553};
554
555$SCHEDULER->prio (1);
556

Diff Legend

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