--- deliantra/server/ext/login.ext	2007/04/17 10:06:33	1.41
+++ deliantra/server/ext/login.ext	2007/04/24 00:42:02	1.45
@@ -6,8 +6,6 @@
 use Coro::AIO;
 use List::Util qw(min max);
 
-my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir;
-
 # paranoia function to overwrite a string-in-place
 sub nuke_str {
    substr $_[0], 0, (length $_[0]), "x" x length $_[0]
@@ -103,92 +101,98 @@
    my %setup = split / +/, $args;
    while (my ($k, $v) = each %setup) {
       if ($k eq "sound") {
-        $ns->sound ($v);
+         $ns->sound ($v);
 
       } elsif ($k eq "exp64") {
-        $setup{$k} = 1;
+         $setup{$k} = 1;
 
       } elsif ($k eq "spellmon") {
-        $ns->monitor_spells ($v);
+         $ns->monitor_spells ($v);
 
       } elsif ($k eq "darkness") {
-        $ns->darkness ($v);
+         $ns->darkness ($v);
 
       } elsif ($k eq "map1cmd") {
-        $ns->mapmode (cf::Map1Cmd) if $v > 0;
+         $ns->mapmode (cf::Map1Cmd) if $v > 0;
 
       } elsif ($k eq "map1acmd") {
-        $ns->mapmode (cf::Map1aCmd) if $v > 0;
+         $ns->mapmode (cf::Map1aCmd) if $v > 0;
 
       } elsif ($k eq "map2cmd") {
-        # gcfclient bug, map1acmd is sent too late
-        $ns->mapmode (cf::Map1aCmd);
-        $setup{$k} = "FALSE";
+         # gcfclient bug, map1acmd is sent too late
+         $ns->mapmode (cf::Map1aCmd);
+         $setup{$k} = "FALSE";
 
       } elsif ($k eq "newmapcmd") {
-        $ns->newmapcmd ($v);
+         $ns->newmapcmd ($v);
 
       } elsif ($k eq "mapinfocmd") {
-        $ns->mapinfocmd ($v);
+         $ns->mapinfocmd ($v);
 
       } elsif ($k eq "extcmd") {
-        $ns->extcmd ($v > 0);
-        send_capabilities $ns;
+         $ns->extcmd ($v > 0);
+         send_capabilities $ns;
 
       } elsif ($k eq "extmap") {
-        $ns->extmap ($v);
+         $ns->extmap ($v);
 
       } elsif ($k eq "facecache") {
-        if (!$v) {
-           $v = 1;
-           $setup{$k} = $v;
-           $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
-        }
+         if (!$v) {
+            $v = 1;
+            $setup{$k} = $v;
+            $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
+         }
 
-        $ns->facecache ($v);
+         $ns->facecache ($v);
 
       } elsif ($k eq "faceset") {
-        $ns->faceset (0);
-        $setup{$k} = 0;
-        # $ns->image2 (1)
+         $ns->faceset (0);
+         $setup{$k} = 0;
+         # $ns->image2 (1)
 
       } elsif ($k eq "tileset") {
-        $setup{$k} = $ns->faceset ($v & 1);
+         $setup{$k} = $ns->faceset ($v & 1);
 
       } elsif ($k eq "itemcmd") {
-        # Version of the item protocol command to use.  Currently,
-        # only supported versions are 1 and 2.  Using a numeric
-        # value will make it very easy to extend this in the future.
-        $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
+         # Version of the item protocol command to use.  Currently,
+         # only supported versions are 1 and 2.  Using a numeric
+         # value will make it very easy to extend this in the future.
+         $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
 
-        $setup{$k} = $ns->itemcmd;
+         $setup{$k} = $ns->itemcmd;
 
       } elsif ($k eq "mapsize") {
-        my ($x, $y) = split /x/, $v;
+         my ($x, $y) = split /x/, $v;
 
-        $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
-        $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
+         $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
+         $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
 
-        $setup{$k} = "${x}x${y}";
+         $setup{$k} = "${x}x${y}";
 
       } elsif ($k eq "extendedMapInfos") {
-        $ns->ext_mapinfos ($v);
+         $ns->ext_mapinfos ($v);
 
       } elsif ($k eq "extendedTextInfos") {
-        $ns->has_readable_type ($v);
+         $ns->has_readable_type ($v);
 
       } elsif ($k eq "smoothing") { # cfplus-style smoothing
-        $ns->smoothing ($v);
+         $ns->smoothing ($v);
 
       } elsif ($k eq "fxix") {
-        $ns->fxix ($v);
+         $ns->fxix ($v);
+
+      } elsif ($k eq "msg") {
+         $ns->can_msg ($v);
+
+      } elsif ($k eq "excmd") {
+         # we support it
 
       } else {
-        # other commands:
-        # sexp: no idea, probably for oudated servers
-        # tick: more stupidity, server should sned a tick per tick
+         # other commands:
+         # sexp: no idea, probably for oudated servers
+         # tick: more stupidity, server should send a tick per tick
 
-        $setup{$k} = "FALSE";
+         $setup{$k} = "FALSE";
       }
     }
 
@@ -429,12 +433,23 @@
          $ob->set_animation (2);
          $ob->add_statbonus;
 
-         $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE);
-         $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR,
-                      "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
+         while () {
+            $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
+            my $msg = $ob->msg;
+            $msg =~ s/\b\n\b/ /g;
+            $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
+
+            my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
+                         "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
+
+            last if $res =~ /[dD]/;
+
+            $pl->chargen_race_next;
+         }
+
+         $pl->chargen_race_done;
 
-         $ns->state (cf::ST_CHANGE_CLASS);
-         delete $pl->{deny_save};#d# too early
+         delete $pl->{deny_save};
 
          last;
       }