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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.75 by root, Wed Dec 26 21:38:02 2007 UTC vs.
Revision 1.88 by root, Sun Aug 17 22:46:26 2008 UTC

    );
    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)
       = $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;
-   if (my $time = delete $pl->{unclean_save}) {
+   my $time = delete $pl->{unclean_save};
-      if (my $m = cf::map::find $map) {
+   warn $pl->ob->name, ": enter map 4\n";#d#
+   if ($time && $m) {
-         if ($time < $m->{instantiate_time}) {
+      if ($time < $m->{instantiate_time}) {
-            # the map was reset in the meantime
+         # the map was reset in the meantime
-            my $age = $cf::RUNTIME - $time;
+         my $age = $cf::RUNTIME - $time;
-            warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\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;
-            if ($age >= $MAX_DISCONNECT_TIME) {
+         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 {
             $ob->message (
-               "You didn't use a bed to reality to leave this realm. This is very dangerous, "
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-             . "as lots of things could happen when you leave by other means, such as cave-ins, "
+             . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
-             . "or monsters suddenly snapping your body. Better use a savebed next time. "
+             . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
-             . "H<Always apply a bed of reality to disconnect from the server.>",
+             . "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, 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
-         }
+         );
       }
    }
+   warn $pl->ob->name, ": enter map 5\n";#d#
-   $ob->goto ($map, $x, $y);
+   #$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).
 sub nuke_playerdir {
 *** 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.
+*** 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.
+*** jcrossclient: your client is broken, use deliantra or gcfclient.
 ***
 ***
 EOF
       if ($ns->version =~ /jcrossclient/) {
          # let them, for now
                }
             } else {
                $ob->roll_stats;
             }
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
          $ob->set_animation (2);
          $ob->add_statbonus;
             $pl->chargen_race_next;
             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 () {
             my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
                          "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
       # update respawn position
       $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.");
       $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
       if ($cleanly) {
          $_->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;
       }
    },
 );
 #############################################################################
                      $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 "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;
       };
    }
 };
 $SCHEDULER->prio (1);

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.75 by root, Wed Dec 26 21:38:02 2007 UTC vs. Revision 1.88 by root, Sun Aug 17 22:46:26 2008 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.75 by root, Wed Dec 26 21:38:02 2007 UTC vs.
Revision 1.88 by root, Sun Aug 17 22:46:26 2008 UTC