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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.79 by root, Sun Jan 13 09:19:56 2008 UTC vs.
Revision 1.93 by elmex, Fri Oct 31 16:13:41 2008 UTC

 }
 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;
    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;
          warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
-         ($map, $x, $y) = $pl->savebed;
          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. "
                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");
+            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
          );
       }
    }
+   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 {
             cf::NDI_BLUE
          );
          # 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 (
                   "That username is currently used in another login session. "
                 . "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
                );
             }
             Coro::Timer::sleep 0.4;
          }
             if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
                nuke_str $pass;
                # 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) {
                Coro::Timer::sleep 1;
                }
             } 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";
             }
             Coro::Timer::sleep 0.2;
          }
          $ob->reply (undef, "Welcome to Deliantra!");
+         # XXX: Workaround for delayed client ext protocol handshake
+         $pl->esrv_new_player;
          delete $pl->{deny_save};
          last;
       }
       # 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;
-         warn "unclean\n" unless safe_spot $pl;#d#
          $pl->{unclean_save} = $cf::RUNTIME
             unless safe_spot $pl;
       }
    },
 );
-#############################################################################
-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 {
-   $Coro::current->{desc} = "player scheduler";
-   while () {
-      Coro::EV::timer_once $SCHEDULE_INTERVAL;
-      # 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) {
-               $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);

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.79 by root, Sun Jan 13 09:19:56 2008 UTC vs. Revision 1.93 by elmex, Fri Oct 31 16:13:41 2008 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.79 by root, Sun Jan 13 09:19:56 2008 UTC vs.
Revision 1.93 by elmex, Fri Oct 31 16:13:41 2008 UTC