--- deliantra/server/ext/login.ext	2007/07/10 06:12:13	1.61
+++ deliantra/server/ext/login.ext	2008/08/17 22:46:26	1.88
@@ -5,6 +5,8 @@
 use Fcntl;
 use Coro::AIO;
 
+our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
+
 # paranoia function to overwrite a string-in-place
 sub nuke_str {
    substr $_[0], 0, (length $_[0]), "x" x length $_[0]
@@ -52,44 +54,94 @@
    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)
-      = $pl->ob->{_link_pos}
-        ? @{delete $pl->ob->{_link_pos}}
-        : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
-
-   $pl->ob->enter_link;
-
-   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;
-            warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
+      = $ob->{_link_pos}
+        ? @{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}) {
+         # 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#
 
-            $pl->ns->send_drawinfo (
+         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. "
-             . "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...",
+             . "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 {
-            $pl->ns->send_drawinfo (
-               "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.",
+            ($map, $x, $y) = $pl->savebed;
+
+            $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
             );
          }
+      } 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
+         );
       }
    }
 
-   $pl->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...
@@ -97,10 +149,12 @@
 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 {
@@ -119,12 +173,12 @@
 ***
 *** Look at your client preferences:
 ***
-*** CFPlus: all known versions automatically enable the facecache.
+*** 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 CFPlus or gcfclient.
+*** gcfclient: Client => Configure => Map & Image => Cache Images.
+*** jcrossclient: your client is broken, use deliantra or gcfclient.
 ***
 ***
 EOF
@@ -154,6 +208,8 @@
    $ns->pl and return $ns->destroy;
 
    $ns->async (sub {
+      $Coro::current->{desc} = "addme init";
+
       my ($user, $pass);
 
       $ns->send_packet ("addme_success");
@@ -191,6 +247,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. "
@@ -223,6 +281,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;
@@ -285,6 +345,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;
@@ -331,17 +392,17 @@
                $ob->roll_stats;
             }
 
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
 
          $ob->set_animation (2);
          $ob->add_statbonus;
 
          while () {
-            $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
+            $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
             my $msg = $ob->msg;
             $msg =~ s/(?<=\S)\n(?=\S)/ /g;
-            $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
+            $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
 
             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";
@@ -352,6 +413,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 () {
@@ -368,7 +432,7 @@
             Coro::Timer::sleep 0.2;
          }
 
-         $ob->reply (undef, "Welcome to Crossfire!");
+         $ob->reply (undef, "Welcome to Deliantra!");
 
          delete $pl->{deny_save};
 
@@ -419,7 +483,7 @@
       $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.");
@@ -451,20 +515,22 @@
          $_->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 $SCHEDULE_INTERVAL  = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
+our $SAVE_TIMEOUT       = $cf::CFG{player_save_interval}     || 20; # save players every n seconds
 
 our $SCHEDULER = cf::async_ext {
-   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
+   $Coro::current->{desc} = "player scheduler";
+
    while () {
-      $schedule_interval->next;
+      Coro::EV::timer_once $SCHEDULE_INTERVAL;
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for
@@ -478,7 +544,6 @@
 
          eval {
             if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               cf::wait_for_tick_begin;
                $pl->save;
 
                unless ($pl->active || $pl->ns) {
@@ -502,13 +567,13 @@
                      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 "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
                   }
                }
             }
          };
          warn $@ if $@;
-         Coro::cede;
+         cf::cede_to_tick;
       };
    }
 };