--- deliantra/server/ext/login.ext	2007/07/20 16:11:10	1.67
+++ deliantra/server/ext/login.ext	2009/06/29 06:11:01	1.99
@@ -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 {
@@ -54,9 +51,28 @@
    1
 }
 
+sub safe_spot($) {
+   my ($pl) = @_;
+   
+   my $ob = $pl->ob;
+
+   my $m = $ob->map
+      or return;
+   my $x = $ob->x;
+   my $y = $ob->y;
+
+#   return 0;#d#
+#   warn join ":", $m->at ($x, $y);#d#
+#   warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
+#   return 0;
+
+   scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
+}
+
 sub enter_map {
    my ($pl) = @_;
 
+   warn $pl->ob->name, ": enter map 1\n";#d#
    my $ob = $pl->ob;
 
    my ($map, $x, $y)
@@ -64,117 +80,88 @@
         ? @{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#
 
-   if (my $time = delete $pl->{unclean_save}) {
-      if (my $m = cf::map::find $map) {
-         if ($time < $m->{instantiate_time}) {
-            # the map was reset in the meantime
-            my $age = $cf::RUNTIME - $time;
+   my $m = cf::map::find $map;
+   my $time = delete $pl->{unclean_save};
+   warn $pl->ob->name, ": enter map 4\n";#d#
 
-            warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
+   if ($time && $m) {
+      if ($time < $m->{instantiate_time}) {
+         # the map was reset in the meantime
+         my $age = $cf::RUNTIME - $time;
 
-            # for now, just go back to savebed
-            ($map, $x, $y) = $pl->savebed;
+         warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
 
-            if ($age >= $MAX_DISCONNECT_TIME) {
-               $ob->message (
-                  "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-                . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
-                . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
-                . "H<You disconnected too long without having used a savebed.>",
-                  cf::NDI_RED
-               );
-               # kill them.
-               # reminds me of the famous badness 10000 syndrome...
-               $ob->stats->hp (-10000); #] if they survive this they deserved to live
-               $pl->killer ("a cave-in");
-            } else {
-               $ob->message (
-                  "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-                . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
-                . "Better use a savebed next time, much worse things could have happened... "
-                . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
-                  cf::NDI_RED
-               );
-            }
+         if ($age >= $MAX_DISCONNECT_TIME) {
+            $ob->message (
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
+             . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
+             . "H<You disconnected too long without having used a savebed.>",
+               cf::NDI_RED
+            );
+            # kill them.
+            # reminds me of the famous badness 10000 syndrome...
+            $ob->stats->hp (-10000); #] if they survive this they deserved to live
+            my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
          } else {
+            ($map, $x, $y) = $pl->savebed;
+
             $ob->message (
-               "You didn't use a bed to reality to leave this realm. This is very dangerous, "
-             . "as lots of things could happen when you leave by other means, such as cave-ins, "
-             . "or monsters suddenly snapping your body. Better use a savebed next time. "
-             . "H<Always apply a bed of reality to disconnect from the server.>",
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
+             . "Better use a savebed next time, much worse things could have happened... "
+             . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
                cf::NDI_RED
             );
          }
+      } else {
+         $ob->message (
+            "You didn't use a bed to reality to leave this realm. This is very dangerous, "
+          . "as lots of things could happen when you leave by other means, such as cave-ins, "
+          . "or monsters suddenly snapping your body. Better use a savebed next time. "
+          . "H<Always apply a bed of reality to disconnect from the server.>",
+            cf::NDI_RED
+         );
       }
    }
 
-   $ob->goto ($map, $x, $y);
+   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#
+
 }
 
 # 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) = @_;
 
-   aio_stat "$PLAYERDIR/$user";
-   system "cd \Q$PLAYERDIR\E "
-        . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
-        . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
+   my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
+
+   cf::fork_call {
+      rename "$PLAYERDIR/$user", $temp;
+      system "rm", "-rf", $temp;
+   };
 }
 
 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:
-***
-*** CFPlus: 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 CFPlus 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 {
+      $Coro::current->{desc} = "addme init";
+
       my ($user, $pass);
 
       $ns->send_packet ("addme_success");
@@ -189,7 +176,7 @@
 
          # read username
          while () {
-            $user = query $ns, 0, "What is your name?\n:";
+            $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
 
             if ($cf::LOGIN_LOCK{$user}) {
                $ns->send_drawinfo (
@@ -197,13 +184,13 @@
                 . "Chose another, or wait till the other session has ended.",
                   cf::NDI_RED
                );
-            } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
+            } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
                last;
             } else {
                $ns->send_drawinfo (
                   "Your username contains illegal characters "
                 . "(only a-z, A-Z and 0-9 are allowed), "
-                . "or is not between 3 and 18 characters in length.",
+                . "or is not between 3 and 20 characters in length.",
                   cf::NDI_RED
                );
             }
@@ -212,6 +199,8 @@
 
          check_playing $ns, $user and next;
 
+         $Coro::current->{desc} = "addme($user) pass";
+
          $ns->send_drawinfo (
             "Welcome $user, please enter your password now. "
           . "New users should now choose a password. "
@@ -244,6 +233,8 @@
 
          check_playing $ns, $user and next;
 
+         $Coro::current->{desc} = "addme($user) check";
+
          # try to read the user file and check the password
          if (my $pl = cf::player::find $user) {
             aio_stat $pl->path and next;
@@ -255,6 +246,7 @@
                # 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) {
@@ -306,6 +298,7 @@
          }
 
          # the rest of this function is character creation
+         $Coro::current->{desc} = "addme($user) chargen";
 
          # just to make sure nothing is left over
          nuke_playerdir $user;
@@ -352,7 +345,7 @@
                $ob->roll_stats;
             }
 
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
 
          $ob->set_animation (2);
@@ -373,6 +366,9 @@
             Coro::Timer::sleep 0.2;
          }
 
+         # create the playerdir, if necessary, as chargen_race_done did it before
+         # presumably because of unique maps
+         aio_mkdir playerdir $pl, 0770;
          $pl->chargen_race_done;
 
          while () {
@@ -389,7 +385,10 @@
             Coro::Timer::sleep 0.2;
          }
 
-         $ob->reply (undef, "Welcome to Crossfire!");
+         $ob->reply (undef, "Welcome to Deliantra!");
+
+         # XXX: Workaround for delayed client ext protocol handshake
+         $pl->esrv_new_player;
 
          delete $pl->{deny_save};
 
@@ -401,10 +400,10 @@
 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 {
@@ -414,13 +413,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 };
       }
@@ -440,10 +435,10 @@
       $pl->savebed ($bed->map->path, $bed->x, $bed->y);
       cf::async { $pl->save };
 
-      $pl->killer ("left");
+      my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
       $ob->check_score;
 
-      $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]/) {
@@ -472,67 +467,10 @@
          $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
       } else {
          $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
-         $pl->{unclean_save} = $cf::RUNTIME;
+         $pl->{unclean_save} = $cf::RUNTIME
+            unless safe_spot $pl;
       }
    },
 );
 
-#############################################################################
-
-our $SCHEDULE_INTERVAL  =  10; # time the player scheduler sleeps between runs
-our $SAVE_TIMEOUT       =  20; # save players every n seconds
-
-our $SCHEDULER = cf::async_ext {
-   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
-   while () {
-      $schedule_interval->next;
-
-      # this weird form of iteration over values is used because
-      # the hash changes underneath us frequently, and for
-      # keeps a direct reference to the value without (in 5.8 perls)
-      # keeping a reference, so this is prone to crashes or worse.
-      my @players = keys %cf::PLAYER;
-      for (@players) {
-         my $pl = $cf::PLAYER{$_}
-            or next;
-         $pl->valid or next;
-
-         eval {
-            if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               cf::wait_for_tick_begin;
-               $pl->save;
-
-               unless ($pl->active || $pl->ns) {
-                  # check refcounts, this is tricky and needs to be adjusted to fit server internals
-                  my $ob = $pl->ob;
-
-                  my $pl_ref = $pl->refcnt_cnt;
-                  my $ob_ref = $ob->refcnt_cnt;
-
-                  ## pl_ref == $pl + ob->contr   + %cf::PLAYER
-                  ## ob_ref == $ob + pl->observe + simply being an object
-                  if ($pl_ref == 3 && $ob_ref == 3) {
-                     warn "player-scheduler destroy ", $ob->name;#d#
-
-                     # remove from sight and get fresh "copies"
-                     $pl = delete $cf::PLAYER{$ob->name};
-                     $ob = $pl->ob;
-
-                     $pl->destroy; # destroys $ob
-                  } else {
-                     my $a_ = $pl->refcnt;#d#
-                     my $b_ = $ob->refcnt;#d#
-
-                     warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
-                  }
-               }
-            }
-         };
-         warn $@ if $@;
-         Coro::cede;
-      };
-   }
-};
-
-$SCHEDULER->prio (1);