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.36 by root, Wed Apr 4 02:20:27 2007 UTC vs.
Revision 1.56 by root, Sun Jun 24 04:09:29 2007 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max); 7use List::Util qw(min max);
8 8
9my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 9our %EXT_SETUP;
10 10
11# paranoia function to overwrite a string-in-place 11# paranoia function to overwrite a string-in-place
12sub nuke_str { 12sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 13 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 14}
15 15
16sub query { 16sub query {
17 my ($ns, $flags, $text) = @_; 17 my ($ns, $flags, $text) = @_;
18 18
19 my $current = $Coro::current; 19 my $current = $Coro::current;
20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
21 Coro::schedule while ref $current; 21 Coro::schedule while ref $current;
22 22
23 $current 23 $current
24} 24}
25 25
… …
53 ); 53 );
54 54
55 1 55 1
56} 56}
57 57
58sub check_clean_save { 58sub enter_map {
59 my ($pl) = @_; 59 my ($pl) = @_;
60 60
61 my ($map, $x, $y)
62 = $pl->ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
65
66 $pl->ob->enter_link;
67
61 if (my $time = delete $pl->{unclean_save}) { 68 if (my $time = delete $pl->{unclean_save}) {
69 if (my $m = cf::map::find $map) {
70 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time;
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
74
75 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed;
77
62 $pl->ns->send_drawinfo ( 78 $pl->ns->send_drawinfo (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
80 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
81 . "Better use a savebed next time, much worse things could have happened...",
82 cf::NDI_RED
83 );
84 } else {
85 $pl->ns->send_drawinfo (
63 "You didn't use a savebed to leave this realm. This is very dangerous, " 86 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
64 . "as lots of things could happen when you leave by other means, such as cave-ins, " 87 . "as lots of things could happen when you leave by other means, such as cave-ins, "
65 . "or monsters suddenly snapping your body. Better use a savebed next time.", 88 . "or monsters suddenly snapping your body. Better use a savebed next time.",
66 cf::NDI_RED 89 cf::NDI_RED
90 );
91 }
67 ); 92 }
68 #d#TODO
69 } 93 }
94
95 $pl->ob->goto ($map, $x, $y);
70} 96}
71 97
72# delete a player directory, be non-blocking AND synchronous... 98# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 99# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 100sub nuke_playerdir {
… …
101 # The client then must sort this out 127 # The client then must sort this out
102 128
103 my %setup = split / +/, $args; 129 my %setup = split / +/, $args;
104 while (my ($k, $v) = each %setup) { 130 while (my ($k, $v) = each %setup) {
105 if ($k eq "sound") { 131 if ($k eq "sound") {
106 $ns->sound ($v); 132 $ns->sound ($v);
107 133
108 } elsif ($k eq "exp64") { 134 } elsif ($k eq "exp64") {
109 $setup{$k} = 1; 135 $setup{$k} = 1;
110 136
111 } elsif ($k eq "spellmon") { 137 } elsif ($k eq "spellmon") {
112 $ns->monitor_spells ($v); 138 $ns->monitor_spells ($v);
113 139
114 } elsif ($k eq "darkness") { 140 } elsif ($k eq "darkness") {
115 $ns->darkness ($v); 141 $ns->darkness ($v);
116 142
117 } elsif ($k eq "map1cmd") { 143 } elsif ($k eq "map1cmd") {
118 $ns->mapmode (cf::Map1Cmd) if $v > 0; 144 $ns->mapmode (cf::Map1Cmd) if $v > 0;
119 145
120 } elsif ($k eq "map1acmd") { 146 } elsif ($k eq "map1acmd") {
121 $ns->mapmode (cf::Map1aCmd) if $v > 0; 147 $ns->mapmode (cf::Map1aCmd) if $v > 0;
122 148
123 } elsif ($k eq "map2cmd") { 149 } elsif ($k eq "map2cmd") {
124 # gcfclient bug, map1acmd is sent too late 150 # gcfclient bug, map1acmd is sent too late
125 $ns->mapmode (cf::Map1aCmd); 151 $ns->mapmode (cf::Map1aCmd);
126 $setup{$k} = "FALSE"; 152 $setup{$k} = "FALSE";
127 153
128 } elsif ($k eq "newmapcmd") { 154 } elsif ($k eq "newmapcmd") {
129 $ns->newmapcmd ($v); 155 $ns->newmapcmd ($v);
130 156
131 } elsif ($k eq "mapinfocmd") { 157 } elsif ($k eq "mapinfocmd") {
132 $ns->mapinfocmd ($v); 158 $ns->mapinfocmd ($v);
133 159
134 } elsif ($k eq "extcmd") { 160 } elsif ($k eq "extcmd") {
135 $ns->extcmd ($v > 0); 161 $ns->extcmd ($v > 0);
136 send_capabilities $ns; 162 send_capabilities $ns;
137 163
138 } elsif ($k eq "extmap") { 164 } elsif ($k eq "extmap") {
139 $ns->extmap ($v); 165 $ns->extmap ($v);
140 166
141 } elsif ($k eq "facecache") { 167 } elsif ($k eq "facecache") {
168 if (!$v) {
169 $v = 1;
170 $setup{$k} = $v;
171 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
172 }
173
142 $ns->facecache ($v); 174 $ns->facecache ($v);
143 175
144 } elsif ($k eq "faceset") { 176 } elsif ($k eq "faceset") {
145 $ns->faceset (0); 177 $ns->faceset (0);
146 $setup{$k} = 0; 178 $setup{$k} = 0;
147 # $ns->image2 (1) 179 # $ns->image2 (1)
148 180
149 } elsif ($k eq "tileset") { 181 } elsif ($k eq "tileset") {
150 $setup{$k} = $ns->faceset ($v & 1); 182 $setup{$k} = $ns->faceset ($v & 1);
151 183
152 } elsif ($k eq "itemcmd") { 184 } elsif ($k eq "itemcmd") {
153 # Version of the item protocol command to use. Currently, 185 # Version of the item protocol command to use. Currently,
154 # only supported versions are 1 and 2. Using a numeric 186 # only supported versions are 1 and 2. Using a numeric
155 # value will make it very easy to extend this in the future. 187 # value will make it very easy to extend this in the future.
156 $ns->itemcmd ($v) if $v >= 1 && $v <= 2; 188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
157 189
158 $setup{$k} = $ns->itemcmd; 190 $setup{$k} = $ns->itemcmd;
159 191
160 } elsif ($k eq "mapsize") { 192 } elsif ($k eq "mapsize") {
161 my ($x, $y) = split /x/, $v; 193 my ($x, $y) = split /x/, $v;
162 194
163 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1); 195 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
164 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1); 196 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
165 197
166 $setup{$k} = "${x}x${y}"; 198 $setup{$k} = "${x}x${y}";
167 199
168 } elsif ($k eq "extendedMapInfos") { 200 } elsif ($k eq "extendedMapInfos") {
169 $ns->ext_mapinfos ($v); 201 $ns->ext_mapinfos ($v);
170 202
171 } elsif ($k eq "extendedTextInfos") { 203 } elsif ($k eq "extendedTextInfos") {
172 $ns->has_readable_type ($v); 204 $ns->has_readable_type ($v);
205
206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
207 $ns->smoothing ($v);
173 208
174 } elsif ($k eq "fxix") { 209 } elsif ($k eq "fxix") {
175 $ns->fxix ($v); 210 $ns->fxix ($v);
211
212 } elsif ($k eq "msg") {
213 $ns->can_msg ($v >= 2);
214 $setup{$k} = $ns->can_msg;
215
216 } elsif ($k eq "excmd") {
217 # we support it
176 218
177 } else { 219 } else {
178 # other commands: 220 # other commands:
179 # sexp: no idea, probably for oudated servers 221 # sexp: no idea, probably for oudated servers
180 # tick: more stupidity, server should sned a tick per tick 222 # tick: more stupidity, server should send a tick per tick
181 223
182 $setup{$k} = "FALSE"; 224 $setup{$k} = "FALSE";
183 } 225 }
184 } 226 }
185 227
186 $ns->send_packet (join " ", setup => %setup); 228 $ns->send_packet (join " ", setup => %setup);
187 229
… …
319 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 361 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
320 nuke_str $pass; 362 nuke_str $pass;
321 # password matches, wonderful 363 # password matches, wonderful
322 my $pl = cf::player::find $user or next; 364 my $pl = cf::player::find $user or next;
323 $pl->connect ($ns); 365 $pl->connect ($ns);
324 check_clean_save $pl; 366 enter_map $pl;
325 last; 367 last;
326 } elsif (can_cleanup $pl, $mtime) { 368 } elsif (can_cleanup $pl, $mtime) {
327 Coro::Timer::sleep 1; 369 Coro::Timer::sleep 1;
328 370
329 $ns->send_drawinfo ( 371 $ns->send_drawinfo (
… …
350 Coro::Timer::sleep 1; 392 Coro::Timer::sleep 1;
351 393
352 $ns->send_drawinfo ( 394 $ns->send_drawinfo (
353 "Wrong username or password. Please try again " 395 "Wrong username or password. Please try again "
354 . "(check for Numlock and other semi-obvious error sources).", 396 . "(check for Numlock and other semi-obvious error sources).",
397 cf::NDI_RED
398 );
399 next;
400 }
401 } else {
402 # unable to load the playerfile:
403 # check wether the player dir exists, which means the file is corrupted or
404 # something very similar.
405 if (!aio_stat cf::player::playerdir $user) {
406 $ns->send_drawinfo (
407 "Unable to retrieve this player. It might be a locked or broken account. "
408 . "If this is your account, ask a dungeon master for assistance. "
409 . "Otherwise choose a different login name.",
355 cf::NDI_RED 410 cf::NDI_RED
356 ); 411 );
357 next; 412 next;
358 } 413 }
359 } 414 }
… …
379 434
380 my $pl = cf::player::new $user; 435 my $pl = cf::player::new $user;
381 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 436 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
382 nuke_str $pass; 437 nuke_str $pass;
383 $pl->connect ($ns); 438 $pl->connect ($ns);
384
385 my $ob = $pl->ob; 439 my $ob = $pl->ob;
440
441 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
386 442
387 while () { 443 while () {
388 $ob->update_stats; 444 $ob->update_stats;
389 $pl->save_stats; 445 $pl->save_stats;
390 446
… …
405 } 461 }
406 462
407 $ob->set_animation (2); 463 $ob->set_animation (2);
408 $ob->add_statbonus; 464 $ob->add_statbonus;
409 465
410 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 466 while () {
411 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 467 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
468 my $msg = $ob->msg;
469 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
470 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
471
472 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
412 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 473 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
413 474
414 $ns->state (cf::ST_CHANGE_CLASS); 475 last if $res =~ /[dD]/;
476
477 $pl->chargen_race_next;
478 }
479
480 $pl->chargen_race_done;
481
482 while () {
483 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
484 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
485
486 if ($res =~ /^[fF]/) {
487 $pl->gender (1);
488 last;
489 } elsif ($res =~ /^[mM]/) {
490 $pl->gender (0);
491 last;
492 }
493 }
494
495 $ob->reply (undef, "Welcome to Crossfire!");
496
415 delete $pl->{deny_save};#d# too early 497 delete $pl->{deny_save};
416 498
417 last; 499 last;
418 } 500 }
419 }); 501 });
420} 502}
… …
523 or next; 605 or next;
524 $pl->valid or next; 606 $pl->valid or next;
525 607
526 eval { 608 eval {
527 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 609 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
528 $cf::WAIT_FOR_TICK_ONE->wait; 610 cf::wait_for_tick_begin;
529 $pl->save; 611 $pl->save;
530 612
531 unless ($pl->active) { 613 unless ($pl->active || $pl->ns) {
532 # check refcounts, this is tricky and needs to be adjusted to fit server internals 614 # check refcounts, this is tricky and needs to be adjusted to fit server internals
533 my $ob = $pl->ob; 615 my $ob = $pl->ob;
534 Scalar::Util::weaken $pl; 616
535 Scalar::Util::weaken $ob;
536 my $a_ = $pl->refcnt;#d#
537 my $b_ = $ob->refcnt;#d#
538 my $pl_ref = $pl->refcnt_cnt; 617 my $pl_ref = $pl->refcnt_cnt;
539 my $ob_ref = $ob->refcnt_cnt; 618 my $ob_ref = $ob->refcnt_cnt;
540 619
541 ## pl_ref == one from object + one from cf::PLAYER 620 ## pl_ref == $pl + ob->contr + %cf::PLAYER
542 ## ob_ref == one from simply being an object 621 ## ob_ref == $ob + pl->observe + simply being an object
543 if ($pl_ref == 2 && $ob_ref == 1) { 622 if ($pl_ref == 3 && $ob_ref == 3) {
544 warn "player-scheduler destroy ", $ob->name;#d# 623 warn "player-scheduler destroy ", $ob->name;#d#
545 624
546 # remove from sight and get fresh "copies" 625 # remove from sight and get fresh "copies"
547 $pl = delete $cf::PLAYER{$ob->name}; 626 $pl = delete $cf::PLAYER{$ob->name};
548 $ob = $pl->ob; 627 $ob = $pl->ob;
549 628
550 $ob->destroy;
551 $pl->destroy; 629 $pl->destroy; # destroys $ob
552 } else { 630 } else {
631 my $a_ = $pl->refcnt;#d#
632 my $b_ = $ob->refcnt;#d#
633
553 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 634 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
554 } 635 }
555 } 636 }
556 } 637 }
557 }; 638 };
558 warn $@ if $@; 639 warn $@ if $@;

Diff Legend

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