--- deliantra/server/ext/login.ext	2007/06/16 00:12:20	1.54
+++ deliantra/server/ext/login.ext	2007/07/10 06:12:13	1.61
@@ -4,9 +4,6 @@
 
 use Fcntl;
 use Coro::AIO;
-use List::Util qw(min max);
-
-our %EXT_SETUP;
 
 # paranoia function to overwrite a string-in-place
 sub nuke_str {
@@ -43,8 +40,8 @@
    $ns->send_drawinfo (
       "That player is already logged in on this server. "
     . "If you want to create a new player, choose another name. "
-    . "If you are already a registered player, make sure nobody "
-    . "else is using your account at this time. If you lost your conenction "
+    . "If you have already a registered, make sure nobody "
+    . "else is using your account at this time. If you lost your connection "
     . "then the server will likely timeout within a minute. If you still "
     . "cannot log-in after a minute, you are still logged in. Make sure "
     . "you do not have another client running. If you use windows, reboot, "
@@ -106,139 +103,12 @@
         . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
 }
 
-sub send_capabilities {
+cf::client->attach (on_addme => sub {
    my ($ns) = @_;
 
-   return unless $ns->extcmd;
-
-   $ns->ext_event (capabilities =>
-      # id, name, flags (1 == 2d), edge length
-      tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
-   );
-}
-
-sub setup {
-   my ($ns, $args) = @_;
-
-   # run through the cmds of setup
-   # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
-   # 
-   # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
-   # The client then must sort this out
-
-   my %setup = split / +/, $args;
-   while (my ($k, $v) = each %setup) {
-      if ($k eq "sound") {
-         $ns->sound ($v);
-
-      } elsif ($k eq "exp64") {
-         $setup{$k} = 1;
-
-      } elsif ($k eq "spellmon") {
-         $ns->monitor_spells ($v);
-
-      } elsif ($k eq "darkness") {
-         $ns->darkness ($v);
-
-      } elsif ($k eq "map1cmd") {
-         $ns->mapmode (cf::Map1Cmd) if $v > 0;
-
-      } elsif ($k eq "map1acmd") {
-         $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";
-
-      } elsif ($k eq "newmapcmd") {
-         $ns->newmapcmd ($v);
-
-      } elsif ($k eq "mapinfocmd") {
-         $ns->mapinfocmd ($v);
-
-      } elsif ($k eq "extcmd") {
-         $ns->extcmd ($v > 0);
-         send_capabilities $ns;
-
-      } elsif ($k eq "extmap") {
-         $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);
-         }
-
-         $ns->facecache ($v);
-
-      } elsif ($k eq "faceset") {
-         $ns->faceset (0);
-         $setup{$k} = 0;
-         # $ns->image2 (1)
-
-      } elsif ($k eq "tileset") {
-         $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;
-
-         $setup{$k} = $ns->itemcmd;
-
-      } elsif ($k eq "mapsize") {
-         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);
-
-         $setup{$k} = "${x}x${y}";
-
-      } elsif ($k eq "extendedMapInfos") {
-         $ns->ext_mapinfos ($v);
-
-      } elsif ($k eq "extendedTextInfos") {
-         $ns->has_readable_type ($v);
-
-      } elsif ($k eq "smoothing") { # cfplus-style smoothing
-         $ns->smoothing ($v);
-
-      } elsif ($k eq "fxix") {
-         $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 send a tick per tick
-
-         $setup{$k} = "FALSE";
-      }
-    }
-
-  $ns->send_packet (join " ", setup => %setup);
-
-  cf::datalog setup =>
-     request => $args,
-     reply   => \%setup,
-     client  => $ns->version,
-  ;
-}
-
-sub addme {
-   my ($ns) = @_;
-
-  if (!$ns->facecache)
-    {
-      $ns->send_drawinfo (<<EOF, cf::NDI_RED);
+   if (!$ns->facecache)
+     {
+       $ns->send_drawinfo (<<EOF, cf::NDI_RED);
 
 
 ***
@@ -316,6 +186,7 @@
                   cf::NDI_RED
                );
             }
+            Coro::Timer::sleep 0.4;
          }
 
          check_playing $ns, $user and next;
@@ -336,6 +207,7 @@
              . "that cannot be too much to ask for :)",
                cf::NDI_RED
             );
+            Coro::Timer::sleep 0.4;
          }
 
          # lock this username for the remainder of this login session
@@ -426,6 +298,7 @@
                "The passwords do not match, please try again.",
                cf::NDI_RED
             );
+            Coro::Timer::sleep 0.5;
             next;
          }
 
@@ -457,6 +330,8 @@
             } else {
                $ob->roll_stats;
             }
+
+            Coro::Timer::sleep 0.2;
          }
 
          $ob->set_animation (2);
@@ -474,16 +349,33 @@
             last if $res =~ /[dD]/;
 
             $pl->chargen_race_next;
+            Coro::Timer::sleep 0.2;
          }
 
          $pl->chargen_race_done;
 
+         while () {
+            my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
+                         "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
+
+            if ($res =~ /^[fF]/) {
+               $pl->gender (1);
+               last;
+            } elsif ($res =~ /^[mM]/) {
+               $pl->gender (0);
+               last;
+            }
+            Coro::Timer::sleep 0.2;
+         }
+
+         $ob->reply (undef, "Welcome to Crossfire!");
+
          delete $pl->{deny_save};
 
          last;
       }
    });
-}
+});
 
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
@@ -564,11 +456,6 @@
    },
 );
 
-cf::client->attach (
-   on_addme => \&addme,
-   on_setup => \&setup,
-);
-
 #############################################################################
 
 our $SCHEDULE_INTERVAL  =  10; # time the player scheduler sleeps between runs