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.56 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.63 by root, Sat Jul 14 14:54:05 2007 UTC

… …
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);
8
9our %EXT_SETUP;
10 7
11# paranoia function to overwrite a string-in-place 8# paranoia function to overwrite a string-in-place
12sub nuke_str { 9sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 10 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 11}
… …
41 return unless cf::player::find_active $user; 38 return unless cf::player::find_active $user;
42 39
43 $ns->send_drawinfo ( 40 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 41 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 42 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 43 . "If you have already a registered, make sure nobody "
47 . "else is using your account at this time. If you lost your conenction " 44 . "else is using your account at this time. If you lost your connection "
48 . "then the server will likely timeout within a minute. If you still " 45 . "then the server will likely timeout within a minute. If you still "
49 . "cannot log-in after a minute, you are still logged in. Make sure " 46 . "cannot log-in after a minute, you are still logged in. Make sure "
50 . "you do not have another client running. If you use windows, reboot, " 47 . "you do not have another client running. If you use windows, reboot, "
51 . "this will fix anything.", 48 . "this will fix anything.",
52 cf::NDI_RED 49 cf::NDI_RED
… …
56} 53}
57 54
58sub enter_map { 55sub enter_map {
59 my ($pl) = @_; 56 my ($pl) = @_;
60 57
58 my $ob = $pl->ob;
59
61 my ($map, $x, $y) 60 my ($map, $x, $y)
62 = $pl->ob->{_link_pos} 61 = $ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}} 62 ? @{delete $ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 63 : ($pl->maplevel, $ob->x, $ob->y);
65 64
66 $pl->ob->enter_link; 65 $ob->enter_link;
67 66
68 if (my $time = delete $pl->{unclean_save}) { 67 if (my $time = delete $pl->{unclean_save}) {
69 if (my $m = cf::map::find $map) { 68 if (my $m = cf::map::find $map) {
70 if ($time < $m->{instantiate_time}) { 69 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime 70 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time; 71 my $age = $cf::RUNTIME - $time;
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 72 warn $ob->name, " map reset after logout, logout age $age\n";#d#
74 73
75 # for now, just go back to savebed 74 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed; 75 ($map, $x, $y) = $pl->savebed;
77 76
78 $pl->ns->send_drawinfo ( 77 $pl->ns->send_drawinfo (
… …
90 ); 89 );
91 } 90 }
92 } 91 }
93 } 92 }
94 93
95 $pl->ob->goto ($map, $x, $y); 94 $ob->goto ($map, $x, $y);
96} 95}
97 96
98# delete a player directory, be non-blocking AND synchronous... 97# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 98# (thats hard, so we crap out and fork).
100sub nuke_playerdir { 99sub nuke_playerdir {
… …
104 system "cd \Q$PLAYERDIR\E " 103 system "cd \Q$PLAYERDIR\E "
105 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 104 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
106 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 105 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
107} 106}
108 107
109sub send_capabilities { 108cf::client->attach (on_addme => sub {
110 my ($ns) = @_; 109 my ($ns) = @_;
111 110
112 return unless $ns->extcmd;
113
114 $ns->ext_event (capabilities =>
115 # id, name, flags (1 == 2d), edge length
116 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
117 );
118}
119
120sub setup {
121 my ($ns, $args) = @_;
122
123 # run through the cmds of setup
124 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
125 #
126 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
127 # The client then must sort this out
128
129 my %setup = split / +/, $args;
130 while (my ($k, $v) = each %setup) {
131 if ($k eq "sound") {
132 $ns->sound ($v);
133
134 } elsif ($k eq "exp64") {
135 $setup{$k} = 1;
136
137 } elsif ($k eq "spellmon") {
138 $ns->monitor_spells ($v);
139
140 } elsif ($k eq "darkness") {
141 $ns->darkness ($v);
142
143 } elsif ($k eq "map1cmd") {
144 $ns->mapmode (cf::Map1Cmd) if $v > 0;
145
146 } elsif ($k eq "map1acmd") {
147 $ns->mapmode (cf::Map1aCmd) if $v > 0;
148
149 } elsif ($k eq "map2cmd") {
150 # gcfclient bug, map1acmd is sent too late
151 $ns->mapmode (cf::Map1aCmd);
152 $setup{$k} = "FALSE";
153
154 } elsif ($k eq "newmapcmd") {
155 $ns->newmapcmd ($v);
156
157 } elsif ($k eq "mapinfocmd") {
158 $ns->mapinfocmd ($v);
159
160 } elsif ($k eq "extcmd") {
161 $ns->extcmd ($v > 0);
162 send_capabilities $ns;
163
164 } elsif ($k eq "extmap") {
165 $ns->extmap ($v);
166
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
174 $ns->facecache ($v);
175
176 } elsif ($k eq "faceset") {
177 $ns->faceset (0);
178 $setup{$k} = 0;
179 # $ns->image2 (1)
180
181 } elsif ($k eq "tileset") {
182 $setup{$k} = $ns->faceset ($v & 1);
183
184 } elsif ($k eq "itemcmd") {
185 # Version of the item protocol command to use. Currently,
186 # only supported versions are 1 and 2. Using a numeric
187 # value will make it very easy to extend this in the future.
188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
189
190 $setup{$k} = $ns->itemcmd;
191
192 } elsif ($k eq "mapsize") {
193 my ($x, $y) = split /x/, $v;
194
195 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
196 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
197
198 $setup{$k} = "${x}x${y}";
199
200 } elsif ($k eq "extendedMapInfos") {
201 $ns->ext_mapinfos ($v);
202
203 } elsif ($k eq "extendedTextInfos") {
204 $ns->has_readable_type ($v);
205
206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
207 $ns->smoothing ($v);
208
209 } elsif ($k eq "fxix") {
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
218
219 } else {
220 # other commands:
221 # sexp: no idea, probably for oudated servers
222 # tick: more stupidity, server should send a tick per tick
223
224 $setup{$k} = "FALSE";
225 }
226 }
227
228 $ns->send_packet (join " ", setup => %setup);
229
230 cf::datalog setup =>
231 request => $args,
232 reply => \%setup,
233 client => $ns->version,
234 ;
235}
236
237sub addme {
238 my ($ns) = @_;
239
240 if (!$ns->facecache) 111 if (!$ns->facecache)
241 { 112 {
242 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 113 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
243 114
244 115
245*** 116***
246*** WARNING: 117*** WARNING:
247*** Your client does not support face/image caching, 118*** Your client does not support face/image caching,
… …
315 . "(only a-z, A-Z and 0-9 are allowed), " 186 . "(only a-z, A-Z and 0-9 are allowed), "
316 . "or is not between 3 and 18 characters in length.", 187 . "or is not between 3 and 18 characters in length.",
317 cf::NDI_RED 188 cf::NDI_RED
318 ); 189 );
319 } 190 }
191 Coro::Timer::sleep 0.4;
320 } 192 }
321 193
322 check_playing $ns, $user and next; 194 check_playing $ns, $user and next;
323 195
324 $ns->send_drawinfo ( 196 $ns->send_drawinfo (
… …
335 $ns->send_drawinfo ( 207 $ns->send_drawinfo (
336 "Try to use at least three characters as your password please, " 208 "Try to use at least three characters as your password please, "
337 . "that cannot be too much to ask for :)", 209 . "that cannot be too much to ask for :)",
338 cf::NDI_RED 210 cf::NDI_RED
339 ); 211 );
212 Coro::Timer::sleep 0.4;
340 } 213 }
341 214
342 # lock this username for the remainder of this login session 215 # lock this username for the remainder of this login session
343 if ($cf::LOGIN_LOCK{$user}) { 216 if ($cf::LOGIN_LOCK{$user}) {
344 $ns->send_drawinfo ( 217 $ns->send_drawinfo (
… …
425 nuke_str $pass2; 298 nuke_str $pass2;
426 $ns->send_drawinfo ( 299 $ns->send_drawinfo (
427 "The passwords do not match, please try again.", 300 "The passwords do not match, please try again.",
428 cf::NDI_RED 301 cf::NDI_RED
429 ); 302 );
303 Coro::Timer::sleep 0.5;
430 next; 304 next;
431 } 305 }
432 306
433 nuke_str $pass2; 307 nuke_str $pass2;
434 308
… …
456 $ob->swap_stats ($res - 1, $swap - 1); 330 $ob->swap_stats ($res - 1, $swap - 1);
457 } 331 }
458 } else { 332 } else {
459 $ob->roll_stats; 333 $ob->roll_stats;
460 } 334 }
335
336 Coro::Timer::sleep 0.2;
461 } 337 }
462 338
463 $ob->set_animation (2); 339 $ob->set_animation (2);
464 $ob->add_statbonus; 340 $ob->add_statbonus;
465 341
… …
473 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 349 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
474 350
475 last if $res =~ /[dD]/; 351 last if $res =~ /[dD]/;
476 352
477 $pl->chargen_race_next; 353 $pl->chargen_race_next;
354 Coro::Timer::sleep 0.2;
478 } 355 }
479 356
480 $pl->chargen_race_done; 357 $pl->chargen_race_done;
481 358
482 while () { 359 while () {
… …
488 last; 365 last;
489 } elsif ($res =~ /^[mM]/) { 366 } elsif ($res =~ /^[mM]/) {
490 $pl->gender (0); 367 $pl->gender (0);
491 last; 368 last;
492 } 369 }
370 Coro::Timer::sleep 0.2;
493 } 371 }
494 372
495 $ob->reply (undef, "Welcome to Crossfire!"); 373 $ob->reply (undef, "Welcome to Crossfire!");
496 374
497 delete $pl->{deny_save}; 375 delete $pl->{deny_save};
498 376
499 last; 377 last;
500 } 378 }
501 }); 379 });
502} 380});
503 381
504cf::register_command quit => sub { 382cf::register_command quit => sub {
505 my ($ob, $arg) = @_; 383 my ($ob, $arg) = @_;
506 384
507 $ob->reply (undef, 385 $ob->reply (undef,
… …
578 $pl->{unclean_save} = $cf::RUNTIME; 456 $pl->{unclean_save} = $cf::RUNTIME;
579 } 457 }
580 }, 458 },
581); 459);
582 460
583cf::client->attach (
584 on_addme => \&addme,
585 on_setup => \&setup,
586);
587
588############################################################################# 461#############################################################################
589 462
590our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 463our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
591our $SAVE_TIMEOUT = 20; # save players every n seconds 464our $SAVE_TIMEOUT = 20; # save players every n seconds
592 465

Diff Legend

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