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.32 by root, Mon Apr 2 18:04:45 2007 UTC vs.
Revision 1.40 by root, Mon Apr 16 15:50:49 2007 UTC

… …
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
… …
76 76
77 aio_stat "$PLAYERDIR/$user"; 77 aio_stat "$PLAYERDIR/$user";
78 system "cd \Q$PLAYERDIR\E " 78 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81}
82
83sub send_capabilities {
84 my ($ns) = @_;
85
86 return unless $ns->extcmd;
87
88 $ns->ext_event (capabilities =>
89 # id, name, flags (1 == 2d), edge length
90 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
91 );
92}
93
94sub setup {
95 my ($ns, $args) = @_;
96
97 # run through the cmds of setup
98 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
99 #
100 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
101 # The client then must sort this out
102
103 my %setup = split / +/, $args;
104 while (my ($k, $v) = each %setup) {
105 if ($k eq "sound") {
106 $ns->sound ($v);
107
108 } elsif ($k eq "exp64") {
109 $setup{$k} = 1;
110
111 } elsif ($k eq "spellmon") {
112 $ns->monitor_spells ($v);
113
114 } elsif ($k eq "darkness") {
115 $ns->darkness ($v);
116
117 } elsif ($k eq "map1cmd") {
118 $ns->mapmode (cf::Map1Cmd) if $v > 0;
119
120 } elsif ($k eq "map1acmd") {
121 $ns->mapmode (cf::Map1aCmd) if $v > 0;
122
123 } elsif ($k eq "map2cmd") {
124 # gcfclient bug, map1acmd is sent too late
125 $ns->mapmode (cf::Map1aCmd);
126 $setup{$k} = "FALSE";
127
128 } elsif ($k eq "newmapcmd") {
129 $ns->newmapcmd ($v);
130
131 } elsif ($k eq "mapinfocmd") {
132 $ns->mapinfocmd ($v);
133
134 } elsif ($k eq "extcmd") {
135 $ns->extcmd ($v > 0);
136 send_capabilities $ns;
137
138 } elsif ($k eq "extmap") {
139 $ns->extmap ($v);
140
141 } elsif ($k eq "facecache") {
142 if (!$v) {
143 $v = 1;
144 $setup{$k} = $v;
145 $ns->send_drawinfo ("(trying to force facecaching to be enabled)", cf::NDI_RED);
146 }
147
148 $ns->facecache ($v);
149
150 } elsif ($k eq "faceset") {
151 $ns->faceset (0);
152 $setup{$k} = 0;
153 # $ns->image2 (1)
154
155 } elsif ($k eq "tileset") {
156 $setup{$k} = $ns->faceset ($v & 1);
157
158 } elsif ($k eq "itemcmd") {
159 # Version of the item protocol command to use. Currently,
160 # only supported versions are 1 and 2. Using a numeric
161 # value will make it very easy to extend this in the future.
162 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
163
164 $setup{$k} = $ns->itemcmd;
165
166 } elsif ($k eq "mapsize") {
167 my ($x, $y) = split /x/, $v;
168
169 $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);
171
172 $setup{$k} = "${x}x${y}";
173
174 } elsif ($k eq "extendedMapInfos") {
175 $ns->ext_mapinfos ($v);
176
177 } elsif ($k eq "extendedTextInfos") {
178 $ns->has_readable_type ($v);
179
180 } elsif ($k eq "smoothing") { # cfplus-style smoothing
181 $ns->smoothing ($v);
182
183 } elsif ($k eq "fxix") {
184 $ns->fxix ($v);
185
186 } else {
187 # other commands:
188 # sexp: no idea, probably for oudated servers
189 # tick: more stupidity, server should sned a tick per tick
190
191 $setup{$k} = "FALSE";
192 }
193 }
194
195 $ns->send_packet (join " ", setup => %setup);
196
197 cf::datalog setup =>
198 request => $args,
199 reply => \%setup,
200 client => $ns->version,
201 ;
81} 202}
82 203
83sub addme { 204sub addme {
84 my ($ns) = @_; 205 my ($ns) = @_;
85 206
… …
111 $ns->flush; 232 $ns->flush;
112 return $ns->destroy; 233 return $ns->destroy;
113 } 234 }
114 235
115 # $ns->facecache = true; 236 # $ns->facecache = true;
116 } 237 }
238
239 if ($ns->mapmode < cf::Map1aCmd) {
240 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
241
242
243***
244*** WARNING:
245*** Your client is too old. Please upgrade to a newer version.
246EOF
247
248 $ns->flush;
249 return $ns->destroy;
250 }
117 251
118 $ns->pl and return $ns->destroy; 252 $ns->pl and return $ns->destroy;
119 253
120 $ns->async (sub { 254 $ns->async (sub {
121 my ($user, $pass); 255 my ($user, $pass);
… …
229 . "(check for Numlock and other semi-obvious error sources).", 363 . "(check for Numlock and other semi-obvious error sources).",
230 cf::NDI_RED 364 cf::NDI_RED
231 ); 365 );
232 next; 366 next;
233 } 367 }
368 } else {
369 # unable to load the playerfile:
370 # check wether the player dir exists, which means the file is corrupted or
371 # something very similar.
372 if (!aio_stat cf::player::playerdir $user) {
373 $ns->send_drawinfo (
374 "Unable to retrieve this player. It might be a locked or broken account. "
375 . "If this is your account, ask a dungeon master for assistance. "
376 . "Otherwise choose a different login name.",
377 cf::NDI_RED
378 );
379 next;
380 }
234 } 381 }
235 382
236 # the rest of this function is character creation 383 # the rest of this function is character creation
237 384
238 # just to make sure nothing is left over 385 # just to make sure nothing is left over
… …
371 $pl->{unclean_save} = $cf::RUNTIME; 518 $pl->{unclean_save} = $cf::RUNTIME;
372 } 519 }
373 }, 520 },
374); 521);
375 522
376sub setup {
377 my ($ns, $args) = @_;
378
379 # run through the cmds of setup
380 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
381 #
382 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
383 # The client then must sort this out
384
385 my %setup = split / +/, $args;
386 while (my ($k, $v) = each %setup) {
387
388 if ($k eq "sound") {
389 $ns->sound ($v);
390
391 } elsif ($k eq "exp64") {
392 $setup{$k} = 1;
393
394 } elsif ($k eq "spellmon") {
395 $ns->monitor_spells ($v);
396
397 } elsif ($k eq "darkness") {
398 $ns->darkness ($v);
399
400 } elsif ($k eq "map1cmd") {
401 $ns->mapmode (cf::Map1Cmd) if $v > 0;
402
403 } elsif ($k eq "map1acmd") {
404 $ns->mapmode (cf::Map1aCmd) if $v > 0;
405
406 } elsif ($k eq "newmapcmd") {
407 $ns->newmapcmd ($v);
408
409 } elsif ($k eq "mapinfocmd") {
410 $ns->mapinfocmd ($v);
411
412 } elsif ($k eq "extcmd") {
413 $ns->extcmd ($v > 0);
414
415 } elsif ($k eq "extmap") {
416 $ns->extmap ($v);
417
418 } elsif ($k eq "facecache") {
419 $ns->facecache ($v);
420
421 } elsif ($k eq "faceset") {
422 $ns->faceset (0);
423 $setup{$k} = 0;
424 # $ns->image2 (1)
425
426 } elsif ($k eq "itemcmd") {
427 # Version of the item protocol command to use. Currently,
428 # only supported versions are 1 and 2. Using a numeric
429 # value will make it very easy to extend this in the future.
430 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
431
432 $setup{$k} = $ns->itemcmd;
433
434 } elsif ($k eq "mapsize") {
435 my ($x, $y) = split /x/, $v;
436
437 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x);
438 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y);
439
440 $setup{$k} = "${x}x${y}";
441
442 } elsif ($k eq "extendedMapInfos") {
443 $ns->ext_mapinfos ($v);
444
445 } elsif ($k eq "extendedTextInfos") {
446 $ns->has_readable_type ($v);
447
448 } else {
449 # other commands:
450 # sexp: no idea, probably for oudated servers
451 # tick: more stupidity, server should sned a tick per tick
452
453 $setup{$k} = "FALSE";
454 }
455 }
456
457 $ns->send_packet (join " ", setup => %setup);
458
459 cf::datalog setup =>
460 request => $args,
461 reply => \%setup,
462 client => $ns->version,
463 ;
464}
465
466cf::client->attach ( 523cf::client->attach (
467 on_addme => \&addme, 524 on_addme => \&addme,
468 on_setup => \&setup, 525 on_setup => \&setup,
469); 526);
470 527
… …
488 or next; 545 or next;
489 $pl->valid or next; 546 $pl->valid or next;
490 547
491 eval { 548 eval {
492 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 549 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
493 $cf::WAIT_FOR_TICK_ONE->wait; 550 cf::wait_for_tick_begin;
494 $pl->save; 551 $pl->save;
495 552
496 unless ($pl->active) { 553 unless ($pl->active) {
497 # check refcounts, this is tricky and needs to be adjusted to fit server internals 554 # check refcounts, this is tricky and needs to be adjusted to fit server internals
498 my $ob = $pl->ob; 555 my $ob = $pl->ob;

Diff Legend

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