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.77 by root, Fri Dec 28 19:44:34 2007 UTC vs.
Revision 1.97 by root, Sat Dec 27 01:25:00 2008 UTC

… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
52 ); 49 );
53 50
54 1 51 1
55} 52}
56 53
57sub safe_spot($$$) { 54sub safe_spot($) {
58 my ($m, $x, $y) = @_; 55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
58
59 my $m = $ob->map
60 or return;
61 my $x = $ob->x;
62 my $y = $ob->y;
63
64# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0;
59 68
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61} 70}
62 71
63sub enter_map { 72sub enter_map {
64 my ($pl) = @_; 73 my ($pl) = @_;
65 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
66 my $ob = $pl->ob; 76 my $ob = $pl->ob;
67 77
68 my ($map, $x, $y) 78 my ($map, $x, $y)
69 = $ob->{_link_pos} 79 = $ob->{_link_pos}
70 ? @{delete $ob->{_link_pos}} 80 ? @{delete $ob->{_link_pos}}
71 : ($pl->maplevel, $ob->x, $ob->y); 81 : ($pl->maplevel, $ob->x, $ob->y);
72 82
83 warn $pl->ob->name, ": enter map 2\n";#d#
73 $ob->enter_link; 84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
74 86
75 my $m = cf::map::find $map; 87 my $m = cf::map::find $map;
76 my $time = delete $pl->{unclean_save}; 88 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
77 90
78 if ($time && $m && !safe_spot $m, $x, $y) { 91 if ($time && $m) {
79 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
80 # the map was reset in the meantime 93 # the map was reset in the meantime
81 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
82 95
83 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
84
85 ($map, $x, $y) = $pl->savebed;
86 97
87 if ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message ( 99 $ob->message (
89 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 100 "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. " 101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
93 cf::NDI_RED 104 cf::NDI_RED
94 ); 105 );
95 # kill them. 106 # kill them.
96 # reminds me of the famous badness 10000 syndrome... 107 # reminds me of the famous badness 10000 syndrome...
97 $ob->stats->hp (-10000); #] if they survive this they deserved to live 108 $ob->stats->hp (-10000); #] if they survive this they deserved to live
98 $pl->killer ("a cave-in"); 109 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
99 } else { 110 } else {
111 ($map, $x, $y) = $pl->savebed;
112
100 $ob->message ( 113 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 114 "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. " 115 . "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... " 116 . "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.>", 117 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
… …
114 cf::NDI_RED 127 cf::NDI_RED
115 ); 128 );
116 } 129 }
117 } 130 }
118 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
119 $ob->goto ($map, $x, $y); 133 #$ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub {
135 warn $pl->ob->name, ": enter map check\n";#d#
136 $_[0]
137 }, sub {
138 warn $pl->ob->name, ": enter map done\n";#d#
139 });
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
120} 142}
121 143
122# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
123# (thats hard, so we crap out and fork). 145# (that's hard, so we crap out and fork).
124sub nuke_playerdir { 146sub nuke_playerdir {
125 my ($user) = @_; 147 my ($user) = @_;
126 148
127 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
128 150
… …
132 }; 154 };
133} 155}
134 156
135cf::client->attach (on_addme => sub { 157cf::client->attach (on_addme => sub {
136 my ($ns) = @_; 158 my ($ns) = @_;
137
138 if (!$ns->facecache)
139 {
140 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
141
142
143***
144*** WARNING:
145*** Your client does not support face/image caching,
146*** or it has been disabled. Face caching is mandatory
147*** so please enable it or use a newer client.
148***
149*** Look at your client preferences:
150***
151*** CFPlus: all known versions automatically enable the facecache.
152*** cfclient: use the -cache commandline option.
153*** cfclient: map will not redraw automatically (bug).
154*** gcfclient: use -cache commandline option, or enable
155*** gcfclient: Client => Configure => Map & Image => Cache Images.
156*** jcrossclient: your client is broken, use CFPlus or gcfclient.
157***
158***
159EOF
160 if ($ns->version =~ /jcrossclient/) {
161 # let them, for now
162 } else {
163 $ns->flush;
164 return $ns->destroy;
165 }
166
167 # $ns->facecache = true;
168 }
169
170 if ($ns->mapmode < cf::Map1aCmd) {
171 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
172
173
174***
175*** WARNING:
176*** Your client is too old. Please upgrade to a newer version.
177EOF
178
179 $ns->flush;
180 return $ns->destroy;
181 }
182 159
183 $ns->pl and return $ns->destroy; 160 $ns->pl and return $ns->destroy;
184 161
185 $ns->async (sub { 162 $ns->async (sub {
186 $Coro::current->{desc} = "addme init"; 163 $Coro::current->{desc} = "addme init";
… …
197 cf::NDI_BLUE 174 cf::NDI_BLUE
198 ); 175 );
199 176
200 # read username 177 # read username
201 while () { 178 while () {
202 $user = query $ns, 0, "What is your name?\n:"; 179 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
203 180
204 if ($cf::LOGIN_LOCK{$user}) { 181 if ($cf::LOGIN_LOCK{$user}) {
205 $ns->send_drawinfo ( 182 $ns->send_drawinfo (
206 "That username is currently used in another login session. " 183 "That username is currently used in another login session. "
207 . "Chose another, or wait till the other session has ended.", 184 . "Chose another, or wait till the other session has ended.",
208 cf::NDI_RED 185 cf::NDI_RED
209 ); 186 );
210 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 187 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
211 last; 188 last;
212 } else { 189 } else {
213 $ns->send_drawinfo ( 190 $ns->send_drawinfo (
214 "Your username contains illegal characters " 191 "Your username contains illegal characters "
215 . "(only a-z, A-Z and 0-9 are allowed), " 192 . "(only a-z, A-Z and 0-9 are allowed), "
216 . "or is not between 3 and 18 characters in length.", 193 . "or is not between 3 and 20 characters in length.",
217 cf::NDI_RED 194 cf::NDI_RED
218 ); 195 );
219 } 196 }
220 Coro::Timer::sleep 0.4; 197 Coro::Timer::sleep 0.4;
221 } 198 }
… …
267 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 244 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
268 nuke_str $pass; 245 nuke_str $pass;
269 # password matches, wonderful 246 # password matches, wonderful
270 my $pl = cf::player::find $user or next; 247 my $pl = cf::player::find $user or next;
271 $pl->connect ($ns); 248 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
272 enter_map $pl; 250 enter_map $pl;
273 last; 251 last;
274 } elsif (can_cleanup $pl, $mtime) { 252 } elsif (can_cleanup $pl, $mtime) {
275 Coro::Timer::sleep 1; 253 Coro::Timer::sleep 1;
276 254
… …
365 } 343 }
366 } else { 344 } else {
367 $ob->roll_stats; 345 $ob->roll_stats;
368 } 346 }
369 347
370 Coro::Timer::sleep 0.2; 348 Coro::Timer::sleep 0.05;
371 } 349 }
372 350
373 $ob->set_animation (2); 351 $ob->set_animation (2);
374 $ob->add_statbonus; 352 $ob->add_statbonus;
375 353
… …
386 364
387 $pl->chargen_race_next; 365 $pl->chargen_race_next;
388 Coro::Timer::sleep 0.2; 366 Coro::Timer::sleep 0.2;
389 } 367 }
390 368
369 # create the playerdir, if necessary, as chargen_race_done did it before
370 # presumably because of unique maps
371 aio_mkdir playerdir $pl, 0770;
391 $pl->chargen_race_done; 372 $pl->chargen_race_done;
392 373
393 while () { 374 while () {
394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 375 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
395 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 376 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
404 Coro::Timer::sleep 0.2; 385 Coro::Timer::sleep 0.2;
405 } 386 }
406 387
407 $ob->reply (undef, "Welcome to Deliantra!"); 388 $ob->reply (undef, "Welcome to Deliantra!");
408 389
390 # XXX: Workaround for delayed client ext protocol handshake
391 $pl->esrv_new_player;
392
409 delete $pl->{deny_save}; 393 delete $pl->{deny_save};
410 394
411 last; 395 last;
412 } 396 }
413 }); 397 });
414}); 398});
415 399
416cf::register_command quit => sub { 400cf::register_command quit => sub {
417 my ($ob, $arg) = @_; 401 my ($ob, $arg) = @_;
418 402
419 $ob->reply (undef, 403 $ob->send_msg (undef,
420 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 404 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
421 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 405 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
422 cf::NDI_UNIQUE | cf::NDI_RED); 406 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
423}; 407};
424 408
425cf::register_command quit_character => sub { 409cf::register_command quit_character => sub {
426 my ($ob, $arg) = @_; 410 my ($ob, $arg) = @_;
427 411
428 my $pl = $ob->contr; 412 my $pl = $ob->contr;
429 413
430 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 414 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
431 if ($_[0] !~ /^[yY]/) { 415 if ($_[0] !~ /^[yY]/) {
432 $ob->reply (undef, 416 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
433 "Ok, not not quitting then.",
434 cf::NDI_UNIQUE | cf::NDI_RED);
435 } else { 417 } else {
436 $ob->reply (undef, 418 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
437 "Ok, quitting, hope to see you again.",
438 cf::NDI_UNIQUE | cf::NDI_RED);
439 $pl->ns->flush; 419 $pl->ns->flush;
440 cf::async { $pl->quit_character }; 420 cf::async { $pl->quit_character };
441 } 421 }
442 }); 422 });
443}; 423};
… …
453 433
454 # update respawn position 434 # update respawn position
455 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 435 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
456 cf::async { $pl->save }; 436 cf::async { $pl->save };
457 437
458 $pl->killer ("left"); 438 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
459 $ob->check_score; 439 $ob->check_score;
460 440
461 $ob->reply (undef, "In the future, you will wake up here when you die."); 441 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
462 442
463 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 443 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
464 if ($_[0] !~ /^[yY]/) { 444 if ($_[0] !~ /^[yY]/) {
465 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 445 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
466 $pl->deactivate; 446 $pl->deactivate;
… …
485 465
486 if ($cleanly) { 466 if ($cleanly) {
487 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 467 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
488 } else { 468 } else {
489 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 469 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
490 $pl->{unclean_save} = $cf::RUNTIME; 470 $pl->{unclean_save} = $cf::RUNTIME
471 unless safe_spot $pl;
491 } 472 }
492 }, 473 },
493); 474);
494 475
495#############################################################################
496 476
497our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
498our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
499
500our $SCHEDULER = cf::async_ext {
501 $Coro::current->{desc} = "player scheduler";
502
503 while () {
504 Coro::EV::timer_once $SCHEDULE_INTERVAL;
505
506 # this weird form of iteration over values is used because
507 # the hash changes underneath us frequently, and for
508 # keeps a direct reference to the value without (in 5.8 perls)
509 # keeping a reference, so this is prone to crashes or worse.
510 my @players = keys %cf::PLAYER;
511 for (@players) {
512 my $pl = $cf::PLAYER{$_}
513 or next;
514 $pl->valid or next;
515
516 eval {
517 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
518 $pl->save;
519
520 unless ($pl->active || $pl->ns) {
521 # check refcounts, this is tricky and needs to be adjusted to fit server internals
522 my $ob = $pl->ob;
523
524 my $pl_ref = $pl->refcnt_cnt;
525 my $ob_ref = $ob->refcnt_cnt;
526
527 ## pl_ref == $pl + ob->contr + %cf::PLAYER
528 ## ob_ref == $ob + pl->observe + simply being an object
529 if ($pl_ref == 3 && $ob_ref == 3) {
530 warn "player-scheduler destroy ", $ob->name;#d#
531
532 # remove from sight and get fresh "copies"
533 $pl = delete $cf::PLAYER{$ob->name};
534 $ob = $pl->ob;
535
536 $pl->destroy; # destroys $ob
537 } else {
538 my $a_ = $pl->refcnt;#d#
539 my $b_ = $ob->refcnt;#d#
540
541 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
542 }
543 }
544 }
545 };
546 warn $@ if $@;
547 Coro::cede;
548 };
549 }
550};
551
552$SCHEDULER->prio (1);
553

Diff Legend

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