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.64 by root, Sat Jul 14 19:27:59 2007 UTC vs.
Revision 1.101 by root, Thu Oct 15 21:56:50 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
54sub safe_spot($) {
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;
68
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70}
71
57sub enter_map { 72sub enter_map {
58 my ($pl) = @_; 73 my ($pl) = @_;
59 74
60 my $ob = $pl->ob; 75 my $ob = $pl->ob;
61 76
… …
64 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
66 81
67 $ob->enter_link; 82 $ob->enter_link;
68 83
84 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 85 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 86
87 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 89 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
74 91
75 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#
76 93
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 94 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 } else {
92 $ob->message (
93 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
94 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
95 . "Better use a savebed next time, much worse things could have happened... "
96 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
97 cf::NDI_RED
98 );
99 }
100 } else {
101 $ob->message ( 95 $ob->message (
102 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
103 . "as lots of things could happen when you leave by other means, such as cave-ins, " 97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
104 . "or monsters suddenly snapping your body. Better use a savebed next time. " 98 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
105 . "H<Always apply a bed of reality to disconnect from the server.>", 99 . "H<You disconnected too long without having used a savebed.>",
106 cf::NDI_RED 100 cf::NDI_RED
107 ); 101 );
102 # kill them.
103 # reminds me of the famous badness 10000 syndrome...
104 $ob->stats->hp (-10000); #] if they survive this they deserved to live
105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
106 } else {
107 ($map, $x, $y) = $pl->savebed;
108
109 $ob->message (
110 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
111 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
112 . "Better use a savebed next time, much worse things could have happened... "
113 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
114 cf::NDI_RED
115 );
116 }
117 } else {
118 $ob->message (
119 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
120 . "as lots of things could happen when you leave by other means, such as cave-ins, "
121 . "or monsters suddenly snapping your body. Better use a savebed next time. "
122 . "H<Always apply a bed of reality to disconnect from the server.>",
123 cf::NDI_RED
108 } 124 );
109 } 125 }
110 } 126 }
111 127
112 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
113} 129}
114 130
115# delete a player directory, be non-blocking AND synchronous... 131# delete a player directory, be non-blocking AND synchronous...
116# (thats hard, so we crap out and fork). 132# (that's hard, so we crap out and fork).
117sub nuke_playerdir { 133sub nuke_playerdir {
118 my ($user) = @_; 134 my ($user) = @_;
119 135
120 aio_stat "$PLAYERDIR/$user"; 136 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
121 system "cd \Q$PLAYERDIR\E " 137
122 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 138 cf::fork_call {
123 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 139 rename "$PLAYERDIR/$user", $temp;
140 system "rm", "-rf", $temp;
141 };
124} 142}
125 143
126cf::client->attach (on_addme => sub { 144cf::client->attach (on_addme => sub {
127 my ($ns) = @_; 145 my ($ns) = @_;
128 146
129 if (!$ns->facecache)
130 {
131 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
132
133
134***
135*** WARNING:
136*** Your client does not support face/image caching,
137*** or it has been disabled. Face caching is mandatory
138*** so please enable it or use a newer client.
139***
140*** Look at your client preferences:
141***
142*** CFPlus: all known versions automatically enable the facecache.
143*** cfclient: use the -cache commandline option.
144*** cfclient: map will not redraw automatically (bug).
145*** gcfclient: use -cache commandline option, or enable
146*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
147*** jcrossclient: your client is broken, use CFPlus or gcfclient.
148***
149***
150EOF
151 if ($ns->version =~ /jcrossclient/) {
152 # let them, for now
153 } else {
154 $ns->flush;
155 return $ns->destroy;
156 }
157
158 # $ns->facecache = true;
159 }
160
161 if ($ns->mapmode < cf::Map1aCmd) {
162 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
163
164
165***
166*** WARNING:
167*** Your client is too old. Please upgrade to a newer version.
168EOF
169
170 $ns->flush;
171 return $ns->destroy;
172 }
173
174 $ns->pl and return $ns->destroy; 147 $ns->pl and return $ns->destroy;
175 148
176 $ns->async (sub { 149 $ns->async (sub {
150 $Coro::current->{desc} = "addme init";
151
177 my ($user, $pass); 152 my ($user, $pass);
178 153
179 $ns->send_packet ("addme_success"); 154 $ns->send_packet ("addme_success");
180 155
181 for (;;) { 156 for (;;) {
… …
186 cf::NDI_BLUE 161 cf::NDI_BLUE
187 ); 162 );
188 163
189 # read username 164 # read username
190 while () { 165 while () {
191 $user = query $ns, 0, "What is your name?\n:"; 166 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
192 167
193 if ($cf::LOGIN_LOCK{$user}) { 168 if ($cf::LOGIN_LOCK{$user}) {
194 $ns->send_drawinfo ( 169 $ns->send_drawinfo (
195 "That username is currently used in another login session. " 170 "That username is currently used in another login session. "
196 . "Chose another, or wait till the other session has ended.", 171 . "Chose another, or wait till the other session has ended.",
197 cf::NDI_RED 172 cf::NDI_RED
198 ); 173 );
199 } 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/) {
200 last; 175 last;
201 } else { 176 } else {
202 $ns->send_drawinfo ( 177 $ns->send_drawinfo (
203 "Your username contains illegal characters " 178 "Your username contains illegal characters "
204 . "(only a-z, A-Z and 0-9 are allowed), " 179 . "(only a-z, A-Z and 0-9 are allowed), "
205 . "or is not between 3 and 18 characters in length.", 180 . "or is not between 3 and 20 characters in length.",
206 cf::NDI_RED 181 cf::NDI_RED
207 ); 182 );
208 } 183 }
209 Coro::Timer::sleep 0.4; 184 Coro::Timer::sleep 0.4;
210 } 185 }
211 186
212 check_playing $ns, $user and next; 187 check_playing $ns, $user and next;
188
189 $Coro::current->{desc} = "addme($user) pass";
213 190
214 $ns->send_drawinfo ( 191 $ns->send_drawinfo (
215 "Welcome $user, please enter your password now. " 192 "Welcome $user, please enter your password now. "
216 . "New users should now choose a password. " 193 . "New users should now choose a password. "
217 . "Anything your client lets you enter is fine.", 194 . "Anything your client lets you enter is fine.",
… …
240 next; 217 next;
241 } 218 }
242 local $cf::LOGIN_LOCK{$user} = 1; 219 local $cf::LOGIN_LOCK{$user} = 1;
243 220
244 check_playing $ns, $user and next; 221 check_playing $ns, $user and next;
222
223 $Coro::current->{desc} = "addme($user) check";
245 224
246 # try to read the user file and check the password 225 # try to read the user file and check the password
247 if (my $pl = cf::player::find $user) { 226 if (my $pl = cf::player::find $user) {
248 aio_stat $pl->path and next; 227 aio_stat $pl->path and next;
249 my $mtime = (stat _)[9]; 228 my $mtime = (stat _)[9];
… …
303 next; 282 next;
304 } 283 }
305 } 284 }
306 285
307 # the rest of this function is character creation 286 # the rest of this function is character creation
287 $Coro::current->{desc} = "addme($user) chargen";
308 288
309 # just to make sure nothing is left over 289 # just to make sure nothing is left over
310 nuke_playerdir $user; 290 nuke_playerdir $user;
311 291
312 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 292 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
349 } 329 }
350 } else { 330 } else {
351 $ob->roll_stats; 331 $ob->roll_stats;
352 } 332 }
353 333
354 Coro::Timer::sleep 0.2; 334 Coro::Timer::sleep 0.05;
355 } 335 }
356 336
357 $ob->set_animation (2); 337 $ob->set_animation (2);
358 $ob->add_statbonus; 338 $ob->add_statbonus;
359 339
360 while () { 340 while () {
361 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 341 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
362 my $msg = $ob->msg; 342 my $msg = $ob->msg;
363 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 343 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
364 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 344 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
365 345
366 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
367 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
368 348
369 last if $res =~ /[dD]/; 349 last if $res =~ /[dD]/;
370 350
371 $pl->chargen_race_next; 351 $pl->chargen_race_next;
372 Coro::Timer::sleep 0.2; 352 Coro::Timer::sleep 0.2;
373 } 353 }
374 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;
375 $pl->chargen_race_done; 358 $pl->chargen_race_done;
376 359
377 while () { 360 while () {
378 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 361 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
379 "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";
… …
386 last; 369 last;
387 } 370 }
388 Coro::Timer::sleep 0.2; 371 Coro::Timer::sleep 0.2;
389 } 372 }
390 373
391 $ob->reply (undef, "Welcome to Crossfire!"); 374 $ob->reply (undef, "Welcome to Deliantra!");
375
376 # XXX: Workaround for delayed client ext protocol handshake
377 $pl->esrv_new_player;
392 378
393 delete $pl->{deny_save}; 379 delete $pl->{deny_save};
394 380
395 last; 381 last;
382 }
383
384 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
385 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
396 } 386 }
397 }); 387 });
398}); 388});
399 389
400cf::register_command quit => sub { 390cf::register_command quit => sub {
401 my ($ob, $arg) = @_; 391 my ($ob, $arg) = @_;
402 392
403 $ob->reply (undef, 393 $ob->send_msg (undef,
404 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 394 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
405 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 395 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
406 cf::NDI_UNIQUE | cf::NDI_RED); 396 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
407}; 397};
408 398
409cf::register_command quit_character => sub { 399cf::register_command quit_character => sub {
410 my ($ob, $arg) = @_; 400 my ($ob, $arg) = @_;
411 401
412 my $pl = $ob->contr; 402 my $pl = $ob->contr;
413 403
414 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 404 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
415 if ($_[0] !~ /^[yY]/) { 405 if ($_[0] !~ /^[yY]/) {
416 $ob->reply (undef, 406 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
417 "Ok, not not quitting then.",
418 cf::NDI_UNIQUE | cf::NDI_RED);
419 } else { 407 } else {
420 $ob->reply (undef, 408 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
421 "Ok, quitting, hope to see you again.",
422 cf::NDI_UNIQUE | cf::NDI_RED);
423 $pl->ns->flush; 409 $pl->ns->flush;
424 cf::async { $pl->quit_character }; 410 cf::async { $pl->quit_character };
425 } 411 }
426 }); 412 });
427}; 413};
… …
437 423
438 # update respawn position 424 # update respawn position
439 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 425 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
440 cf::async { $pl->save }; 426 cf::async { $pl->save };
441 427
442 $pl->killer ("left"); 428 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
443 $ob->check_score; 429 $ob->check_score;
444 430
445 $ob->reply (undef, "In the future, you will wake up here when you die."); 431 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
446 432
447 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 433 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
448 if ($_[0] !~ /^[yY]/) { 434 if ($_[0] !~ /^[yY]/) {
449 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 435 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
450 $pl->deactivate; 436 $pl->deactivate;
… …
469 455
470 if ($cleanly) { 456 if ($cleanly) {
471 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 457 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
472 } else { 458 } else {
473 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 459 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
474 $pl->{unclean_save} = $cf::RUNTIME; 460 $pl->{unclean_save} = $cf::RUNTIME
461 unless safe_spot $pl;
475 } 462 }
476 }, 463 },
477); 464);
478 465
479#############################################################################
480 466
481our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
482our $SAVE_TIMEOUT = 20; # save players every n seconds
483
484our $SCHEDULER = cf::async_ext {
485 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
486 while () {
487 $schedule_interval->next;
488
489 # this weird form of iteration over values is used because
490 # the hash changes underneath us frequently, and for
491 # keeps a direct reference to the value without (in 5.8 perls)
492 # keeping a reference, so this is prone to crashes or worse.
493 my @players = keys %cf::PLAYER;
494 for (@players) {
495 my $pl = $cf::PLAYER{$_}
496 or next;
497 $pl->valid or next;
498
499 eval {
500 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
501 cf::wait_for_tick_begin;
502 $pl->save;
503
504 unless ($pl->active || $pl->ns) {
505 # check refcounts, this is tricky and needs to be adjusted to fit server internals
506 my $ob = $pl->ob;
507
508 my $pl_ref = $pl->refcnt_cnt;
509 my $ob_ref = $ob->refcnt_cnt;
510
511 ## pl_ref == $pl + ob->contr + %cf::PLAYER
512 ## ob_ref == $ob + pl->observe + simply being an object
513 if ($pl_ref == 3 && $ob_ref == 3) {
514 warn "player-scheduler destroy ", $ob->name;#d#
515
516 # remove from sight and get fresh "copies"
517 $pl = delete $cf::PLAYER{$ob->name};
518 $ob = $pl->ob;
519
520 $pl->destroy; # destroys $ob
521 } else {
522 my $a_ = $pl->refcnt;#d#
523 my $b_ = $ob->refcnt;#d#
524
525 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
526 }
527 }
528 }
529 };
530 warn $@ if $@;
531 Coro::cede;
532 };
533 }
534};
535
536$SCHEDULER->prio (1);
537

Diff Legend

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