--- deliantra/server/ext/login.ext	2007/07/14 14:33:29	1.62
+++ deliantra/server/ext/login.ext	2007/07/23 17:53:55	1.69
@@ -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]
@@ -66,25 +68,42 @@
 
    if (my $time = delete $pl->{unclean_save}) {
       if (my $m = cf::map::find $map) {
-         if ($time < $m->{instantiate_time} || 1) {#d#
+         if ($time < $m->{instantiate_time}) {
             # the map was reset in the meantime
             my $age = $cf::RUNTIME - $time;
-            warn $ob->name, " map reset after logout, logout age $age\n";#d#
+
+            warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
 
             # for now, just go back to savebed
             ($map, $x, $y) = $pl->savebed;
 
-            $pl->ns->send_drawinfo (
-               "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...",
-               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
+               $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
+               );
+            }
          } else {
-            $pl->ns->send_drawinfo (
+            $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.",
+             . "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
             );
          }
@@ -340,10 +359,10 @@
          $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";
@@ -460,12 +479,13 @@
 
 #############################################################################
 
-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);
+   my $schedule_interval = Coro::Event->timer (after => 1);
    while () {
+      $schedule_interval->interval ($SCHEDULE_INTERVAL);
       $schedule_interval->next;
 
       # this weird form of iteration over values is used because
@@ -480,7 +500,6 @@
 
          eval {
             if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               cf::wait_for_tick_begin;
                $pl->save;
 
                unless ($pl->active || $pl->ns) {