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.100 by root, Wed Sep 2 16:54:20 2009 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 {
… …
73 $ob->enter_link; 82 $ob->enter_link;
74 83
75 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
76 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
77 86
78 if ($time && $m && !safe_spot $m, $x, $y) { 87 if ($time && $m) {
79 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
80 # the map was reset in the meantime 89 # the map was reset in the meantime
81 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
82 91
83 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 92 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
84
85 ($map, $x, $y) = $pl->savebed;
86 93
87 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message ( 95 $ob->message (
89 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 96 "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. " 97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
93 cf::NDI_RED 100 cf::NDI_RED
94 ); 101 );
95 # kill them. 102 # kill them.
96 # reminds me of the famous badness 10000 syndrome... 103 # reminds me of the famous badness 10000 syndrome...
97 $ob->stats->hp (-10000); #] if they survive this they deserved to live 104 $ob->stats->hp (-10000); #] if they survive this they deserved to live
98 $pl->killer ("a cave-in"); 105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
99 } else { 106 } else {
107 ($map, $x, $y) = $pl->savebed;
108
100 $ob->message ( 109 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 110 "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. " 111 . "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... " 112 . "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.>", 113 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
… …
118 127
119 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
120} 129}
121 130
122# delete a player directory, be non-blocking AND synchronous... 131# delete a player directory, be non-blocking AND synchronous...
123# (thats hard, so we crap out and fork). 132# (that's hard, so we crap out and fork).
124sub nuke_playerdir { 133sub nuke_playerdir {
125 my ($user) = @_; 134 my ($user) = @_;
126 135
127 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 136 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
128 137
… …
132 }; 141 };
133} 142}
134 143
135cf::client->attach (on_addme => sub { 144cf::client->attach (on_addme => sub {
136 my ($ns) = @_; 145 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 146
183 $ns->pl and return $ns->destroy; 147 $ns->pl and return $ns->destroy;
184 148
185 $ns->async (sub { 149 $ns->async (sub {
186 $Coro::current->{desc} = "addme init"; 150 $Coro::current->{desc} = "addme init";
… …
197 cf::NDI_BLUE 161 cf::NDI_BLUE
198 ); 162 );
199 163
200 # read username 164 # read username
201 while () { 165 while () {
202 $user = query $ns, 0, "What is your name?\n:"; 166 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
203 167
204 if ($cf::LOGIN_LOCK{$user}) { 168 if ($cf::LOGIN_LOCK{$user}) {
205 $ns->send_drawinfo ( 169 $ns->send_drawinfo (
206 "That username is currently used in another login session. " 170 "That username is currently used in another login session. "
207 . "Chose another, or wait till the other session has ended.", 171 . "Chose another, or wait till the other session has ended.",
208 cf::NDI_RED 172 cf::NDI_RED
209 ); 173 );
210 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 174 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
211 last; 175 last;
212 } else { 176 } else {
213 $ns->send_drawinfo ( 177 $ns->send_drawinfo (
214 "Your username contains illegal characters " 178 "Your username contains illegal characters "
215 . "(only a-z, A-Z and 0-9 are allowed), " 179 . "(only a-z, A-Z and 0-9 are allowed), "
216 . "or is not between 3 and 18 characters in length.", 180 . "or is not between 3 and 20 characters in length.",
217 cf::NDI_RED 181 cf::NDI_RED
218 ); 182 );
219 } 183 }
220 Coro::Timer::sleep 0.4; 184 Coro::Timer::sleep 0.4;
221 } 185 }
… …
365 } 329 }
366 } else { 330 } else {
367 $ob->roll_stats; 331 $ob->roll_stats;
368 } 332 }
369 333
370 Coro::Timer::sleep 0.2; 334 Coro::Timer::sleep 0.05;
371 } 335 }
372 336
373 $ob->set_animation (2); 337 $ob->set_animation (2);
374 $ob->add_statbonus; 338 $ob->add_statbonus;
375 339
… …
386 350
387 $pl->chargen_race_next; 351 $pl->chargen_race_next;
388 Coro::Timer::sleep 0.2; 352 Coro::Timer::sleep 0.2;
389 } 353 }
390 354
355 # create the playerdir, if necessary, as chargen_race_done did it before
356 # presumably because of unique maps
357 aio_mkdir playerdir $pl, 0770;
391 $pl->chargen_race_done; 358 $pl->chargen_race_done;
392 359
393 while () { 360 while () {
394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 361 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
395 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 362 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
404 Coro::Timer::sleep 0.2; 371 Coro::Timer::sleep 0.2;
405 } 372 }
406 373
407 $ob->reply (undef, "Welcome to Deliantra!"); 374 $ob->reply (undef, "Welcome to Deliantra!");
408 375
376 # XXX: Workaround for delayed client ext protocol handshake
377 $pl->esrv_new_player;
378
409 delete $pl->{deny_save}; 379 delete $pl->{deny_save};
410 380
411 last; 381 last;
412 } 382 }
413 }); 383 });
414}); 384});
415 385
416cf::register_command quit => sub { 386cf::register_command quit => sub {
417 my ($ob, $arg) = @_; 387 my ($ob, $arg) = @_;
418 388
419 $ob->reply (undef, 389 $ob->send_msg (undef,
420 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 390 "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.", 391 . "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); 392 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
423}; 393};
424 394
425cf::register_command quit_character => sub { 395cf::register_command quit_character => sub {
426 my ($ob, $arg) = @_; 396 my ($ob, $arg) = @_;
427 397
428 my $pl = $ob->contr; 398 my $pl = $ob->contr;
429 399
430 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 400 $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]/) { 401 if ($_[0] !~ /^[yY]/) {
432 $ob->reply (undef, 402 $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 { 403 } else {
436 $ob->reply (undef, 404 $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; 405 $pl->ns->flush;
440 cf::async { $pl->quit_character }; 406 cf::async { $pl->quit_character };
441 } 407 }
442 }); 408 });
443}; 409};
… …
453 419
454 # update respawn position 420 # update respawn position
455 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 421 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
456 cf::async { $pl->save }; 422 cf::async { $pl->save };
457 423
458 $pl->killer ("left"); 424 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
459 $ob->check_score; 425 $ob->check_score;
460 426
461 $ob->reply (undef, "In the future, you will wake up here when you die."); 427 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
462 428
463 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 429 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
464 if ($_[0] !~ /^[yY]/) { 430 if ($_[0] !~ /^[yY]/) {
465 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 431 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
466 $pl->deactivate; 432 $pl->deactivate;
… …
485 451
486 if ($cleanly) { 452 if ($cleanly) {
487 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 453 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
488 } else { 454 } else {
489 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 455 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
490 $pl->{unclean_save} = $cf::RUNTIME; 456 $pl->{unclean_save} = $cf::RUNTIME
457 unless safe_spot $pl;
491 } 458 }
492 }, 459 },
493); 460);
494 461
495#############################################################################
496 462
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