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.40 by root, Mon Apr 16 15:50:49 2007 UTC vs.
Revision 1.57 by root, Mon Jun 25 05:43:45 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}
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") {
142 if (!$v) { 168 if (!$v) {
143 $v = 1; 169 $v = 1;
144 $setup{$k} = $v; 170 $setup{$k} = $v;
145 $ns->send_drawinfo ("(trying to force facecaching to be enabled)", cf::NDI_RED); 171 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
146 } 172 }
147 173
148 $ns->facecache ($v); 174 $ns->facecache ($v);
149 175
150 } elsif ($k eq "faceset") { 176 } elsif ($k eq "faceset") {
151 $ns->faceset (0); 177 $ns->faceset (0);
152 $setup{$k} = 0; 178 $setup{$k} = 0;
153 # $ns->image2 (1) 179 # $ns->image2 (1)
154 180
155 } elsif ($k eq "tileset") { 181 } elsif ($k eq "tileset") {
156 $setup{$k} = $ns->faceset ($v & 1); 182 $setup{$k} = $ns->faceset ($v & 1);
157 183
158 } elsif ($k eq "itemcmd") { 184 } elsif ($k eq "itemcmd") {
159 # Version of the item protocol command to use. Currently, 185 # Version of the item protocol command to use. Currently,
160 # only supported versions are 1 and 2. Using a numeric 186 # only supported versions are 1 and 2. Using a numeric
161 # 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.
162 $ns->itemcmd ($v) if $v >= 1 && $v <= 2; 188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
163 189
164 $setup{$k} = $ns->itemcmd; 190 $setup{$k} = $ns->itemcmd;
165 191
166 } elsif ($k eq "mapsize") { 192 } elsif ($k eq "mapsize") {
167 my ($x, $y) = split /x/, $v; 193 my ($x, $y) = split /x/, $v;
168 194
169 $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);
170 $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);
171 197
172 $setup{$k} = "${x}x${y}"; 198 $setup{$k} = "${x}x${y}";
173 199
174 } elsif ($k eq "extendedMapInfos") { 200 } elsif ($k eq "extendedMapInfos") {
175 $ns->ext_mapinfos ($v); 201 $ns->ext_mapinfos ($v);
176 202
177 } elsif ($k eq "extendedTextInfos") { 203 } elsif ($k eq "extendedTextInfos") {
178 $ns->has_readable_type ($v); 204 $ns->has_readable_type ($v);
179 205
180 } elsif ($k eq "smoothing") { # cfplus-style smoothing 206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
181 $ns->smoothing ($v); 207 $ns->smoothing ($v);
182 208
183 } elsif ($k eq "fxix") { 209 } elsif ($k eq "fxix") {
184 $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 "xwidget") {
217 # eXperimental server-side widgets
218 $ns->{can_widget} = 1;
219
220 } elsif ($k eq "excmd") {
221 # we support it
185 222
186 } else { 223 } else {
187 # other commands: 224 # other commands:
188 # sexp: no idea, probably for oudated servers 225 # sexp: no idea, probably for oudated servers
189 # tick: more stupidity, server should sned a tick per tick 226 # tick: more stupidity, server should send a tick per tick
190 227
191 $setup{$k} = "FALSE"; 228 $setup{$k} = "FALSE";
192 } 229 }
193 } 230 }
194 231
195 $ns->send_packet (join " ", setup => %setup); 232 $ns->send_packet (join " ", setup => %setup);
196 233
328 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 365 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
329 nuke_str $pass; 366 nuke_str $pass;
330 # password matches, wonderful 367 # password matches, wonderful
331 my $pl = cf::player::find $user or next; 368 my $pl = cf::player::find $user or next;
332 $pl->connect ($ns); 369 $pl->connect ($ns);
333 check_clean_save $pl; 370 enter_map $pl;
334 last; 371 last;
335 } elsif (can_cleanup $pl, $mtime) { 372 } elsif (can_cleanup $pl, $mtime) {
336 Coro::Timer::sleep 1; 373 Coro::Timer::sleep 1;
337 374
338 $ns->send_drawinfo ( 375 $ns->send_drawinfo (
401 438
402 my $pl = cf::player::new $user; 439 my $pl = cf::player::new $user;
403 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 440 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
404 nuke_str $pass; 441 nuke_str $pass;
405 $pl->connect ($ns); 442 $pl->connect ($ns);
406
407 my $ob = $pl->ob; 443 my $ob = $pl->ob;
444
445 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
408 446
409 while () { 447 while () {
410 $ob->update_stats; 448 $ob->update_stats;
411 $pl->save_stats; 449 $pl->save_stats;
412 450
427 } 465 }
428 466
429 $ob->set_animation (2); 467 $ob->set_animation (2);
430 $ob->add_statbonus; 468 $ob->add_statbonus;
431 469
432 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 470 while () {
433 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 471 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
472 my $msg = $ob->msg;
473 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
474 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
475
476 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
434 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 477 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
435 478
436 $ns->state (cf::ST_CHANGE_CLASS); 479 last if $res =~ /[dD]/;
480
481 $pl->chargen_race_next;
482 }
483
484 $pl->chargen_race_done;
485
486 while () {
487 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
488 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
489
490 if ($res =~ /^[fF]/) {
491 $pl->gender (1);
492 last;
493 } elsif ($res =~ /^[mM]/) {
494 $pl->gender (0);
495 last;
496 }
497 }
498
499 $ob->reply (undef, "Welcome to Crossfire!");
500
437 delete $pl->{deny_save};#d# too early 501 delete $pl->{deny_save};
438 502
439 last; 503 last;
440 } 504 }
441 }); 505 });
442} 506}
548 eval { 612 eval {
549 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 613 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
550 cf::wait_for_tick_begin; 614 cf::wait_for_tick_begin;
551 $pl->save; 615 $pl->save;
552 616
553 unless ($pl->active) { 617 unless ($pl->active || $pl->ns) {
554 # check refcounts, this is tricky and needs to be adjusted to fit server internals 618 # check refcounts, this is tricky and needs to be adjusted to fit server internals
555 my $ob = $pl->ob; 619 my $ob = $pl->ob;
556 Scalar::Util::weaken $pl; 620
557 Scalar::Util::weaken $ob;
558 my $a_ = $pl->refcnt;#d#
559 my $b_ = $ob->refcnt;#d#
560 my $pl_ref = $pl->refcnt_cnt; 621 my $pl_ref = $pl->refcnt_cnt;
561 my $ob_ref = $ob->refcnt_cnt; 622 my $ob_ref = $ob->refcnt_cnt;
562 623
563 ## pl_ref == one from object + one from cf::PLAYER 624 ## pl_ref == $pl + ob->contr + %cf::PLAYER
564 ## ob_ref == one from simply being an object 625 ## ob_ref == $ob + pl->observe + simply being an object
565 if ($pl_ref == 2 && $ob_ref == 1) { 626 if ($pl_ref == 3 && $ob_ref == 3) {
566 warn "player-scheduler destroy ", $ob->name;#d# 627 warn "player-scheduler destroy ", $ob->name;#d#
567 628
568 # remove from sight and get fresh "copies" 629 # remove from sight and get fresh "copies"
569 $pl = delete $cf::PLAYER{$ob->name}; 630 $pl = delete $cf::PLAYER{$ob->name};
570 $ob = $pl->ob; 631 $ob = $pl->ob;
571 632
572 $ob->destroy;
573 $pl->destroy; 633 $pl->destroy; # destroys $ob
574 } else { 634 } else {
635 my $a_ = $pl->refcnt;#d#
636 my $b_ = $ob->refcnt;#d#
637
575 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 638 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
576 } 639 }
577 } 640 }
578 } 641 }
579 }; 642 };
580 warn $@ if $@; 643 warn $@ if $@;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines