[ViewVC] Diff of: cvs/deliantra/server/ext/login.ext

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.71 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.76 by root, Fri Dec 28 19:40:22 2007 UTC

    );
    1
 }
+sub safe_spot($$$) {
+   my ($m, $x, $y) = @_;
+   scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
+}
 sub enter_map {
    my ($pl) = @_;
    my $ob = $pl->ob;
             # the map was reset in the meantime
             my $age = $cf::RUNTIME - $time;
             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;
+            if (safe_spot $m, $x, $y) {
+               # do nothing, this is simply ok without a special scary message
-            if ($age >= $MAX_DISCONNECT_TIME) {
+            } elsif ($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.>",
                 . "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
                );
             }
+         } elsif (safe_spot $m, $x, $y) {
+            # do nothing, this is simply ok without a special scary message
          } 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. "
    }
    $ns->pl and return $ns->destroy;
    $ns->async (sub {
+      $Coro::current->{desc} = "addme init";
       my ($user, $pass);
       $ns->send_packet ("addme_success");
       for (;;) {
             }
             Coro::Timer::sleep 0.4;
          }
          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. "
           . "Anything your client lets you enter is fine.",
          }
          local $cf::LOGIN_LOCK{$user} = 1;
          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;
             my $mtime = (stat _)[9];
             my $hash = $pl->password;
                next;
             }
          }
          # 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;
          my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
                last;
             }
             Coro::Timer::sleep 0.2;
          }
-         $ob->reply (undef, "Welcome to Crossfire!");
+         $ob->reply (undef, "Welcome to Deliantra!");
          delete $pl->{deny_save};
          last;
       }
 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);
+   $Coro::current->{desc} = "player scheduler";
    while () {
-      $schedule_interval->interval ($SCHEDULE_INTERVAL);
+      Coro::EV::timer_once $SCHEDULE_INTERVAL;
-      $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.

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.71 by root, Sun Sep 2 12:45:44 2007 UTC vs. Revision 1.76 by root, Fri Dec 28 19:40:22 2007 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.71 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.76 by root, Fri Dec 28 19:40:22 2007 UTC