--- deliantra/server/ext/login.ext	2008/09/22 01:33:09	1.92
+++ deliantra/server/ext/login.ext	2010/04/22 12:50:24	1.104
@@ -1,4 +1,4 @@
-#! perl # mandatory
+#! perl # mandatory depends=highscore
 
 # login handling
 
@@ -15,11 +15,8 @@
 sub query {
    my ($ns, $flags, $text) = @_;
 
-   my $current = $Coro::current;
-   $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
-   Coro::schedule while ref $current;
-
-   $current
+   $ns->query ($flags, $text, Coro::rouse_cb);
+   Coro::rouse_wait
 }
 
 sub can_cleanup {
@@ -75,7 +72,6 @@
 sub enter_map {
    my ($pl) = @_;
 
-   warn $pl->ob->name, ": enter map 1\n";#d#
    my $ob = $pl->ob;
 
    my ($map, $x, $y)
@@ -83,13 +79,10 @@
         ? @{delete $ob->{_link_pos}}
         : ($pl->maplevel, $ob->x, $ob->y);
 
-   warn $pl->ob->name, ": enter map 2\n";#d#
    $ob->enter_link;
-   warn $pl->ob->name, ": enter map 3\n";#d#
 
    my $m = cf::map::find $map;
    my $time = delete $pl->{unclean_save};
-   warn $pl->ob->name, ": enter map 4\n";#d#
 
    if ($time && $m) {
       if ($time < $m->{instantiate_time}) {
@@ -132,20 +125,11 @@
       }
    }
 
-   warn $pl->ob->name, ": enter map 5\n";#d#
-   #$ob->goto ($map, $x, $y);
-   $ob->goto ($map, $x, $y, sub {
-      warn $pl->ob->name, ": enter map check\n";#d#
-      $_[0]
-   }, sub {
-      warn $pl->ob->name, ": enter map done\n";#d#
-   });
-   warn $pl->ob->name, ": enter map 6\n";#d#
-
+   $ob->goto ($map, $x, $y);
 }
 
 # delete a player directory, be non-blocking AND synchronous...
-# (thats hard, so we crap out and fork).
+# (that's hard, so we crap out and fork).
 sub nuke_playerdir {
    my ($user) = @_;
 
@@ -160,51 +144,6 @@
 cf::client->attach (on_addme => sub {
    my ($ns) = @_;
 
-   if (!$ns->facecache)
-     {
-       $ns->send_drawinfo (<<EOF, cf::NDI_RED);
-
-
-***
-*** WARNING:
-*** Your client does not support face/image caching,
-*** or it has been disabled. Face caching is mandatory
-*** so please enable it or use a newer client.
-***
-*** Look at your client preferences:
-***
-*** deliantra: all known versions automatically enable the facecache.
-*** cfclient: use the -cache commandline option.
-*** cfclient: map will not redraw automatically (bug).
-*** gcfclient: use -cache commandline option, or enable
-*** gcfclient: Client => Configure => Map & Image => Cache Images.
-*** jcrossclient: your client is broken, use deliantra or gcfclient.
-***
-***
-EOF
-      if ($ns->version =~ /jcrossclient/) {
-         # let them, for now
-      } else {
-        $ns->flush;
-        return $ns->destroy;
-      }
-
-      # $ns->facecache = true;
-   }
-
-   if ($ns->mapmode < cf::Map1aCmd) {
-      $ns->send_drawinfo (<<EOF, cf::NDI_RED);
-
-
-***
-*** WARNING:
-*** Your client is too old. Please upgrade to a newer version.
-EOF
-
-      $ns->flush;
-      return $ns->destroy;
-   }
-
    $ns->pl and return $ns->destroy;
 
    $ns->async (sub {
@@ -294,7 +233,6 @@
                # password matches, wonderful
                my $pl = cf::player::find $user or next;
                $pl->connect ($ns);
-               $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
                enter_map $pl;
                last;
             } elsif (can_cleanup $pl, $mtime) {
@@ -367,7 +305,7 @@
          nuke_str $pass2;
 
          my $pl = cf::player::new $user;
-         $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
+         $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]);
          nuke_str $pass;
          $pl->connect ($ns);
          my $ob = $pl->ob;
@@ -411,7 +349,7 @@
             last if $res =~ /[dD]/;
 
             $pl->chargen_race_next;
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
 
          # create the playerdir, if necessary, as chargen_race_done did it before
@@ -430,25 +368,32 @@
                $pl->gender (0);
                last;
             }
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
 
          $ob->reply (undef, "Welcome to Deliantra!");
 
+         # XXX: Workaround for delayed client ext protocol handshake
+         $pl->esrv_new_player;
+
          delete $pl->{deny_save};
 
          last;
       }
+
+      if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
+         $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
+      }
    });
 });
 
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
 
-   $ob->reply (undef,
-               "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
-               . "If you are sure you want to do this, then use the quit_character command instead of quit.",
-               cf::NDI_UNIQUE | cf::NDI_RED);
+   $ob->send_msg (undef,
+                  "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
+                  . "If you are sure you want to do this, then use the quit_character command instead of quit.",
+                  cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
 };
 
 cf::register_command quit_character => sub {
@@ -458,13 +403,9 @@
 
    $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
       if ($_[0] !~ /^[yY]/) {
-         $ob->reply (undef,
-                     "Ok, not not quitting then.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
+         $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
       } else {
-         $ob->reply (undef,
-                     "Ok, quitting, hope to see you again.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
+         $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
          $pl->ns->flush;
          cf::async { $pl->quit_character };
       }
@@ -485,9 +426,9 @@
       cf::async { $pl->save };
 
       my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
-      $ob->check_score;
+      ext::highscore::check $ob;
 
-      $ob->reply (undef, "In the future, you will wake up here when you die.");
+      $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
 
       $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
          if ($_[0] !~ /^[yY]/) {