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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.36 by root, Wed Apr 4 02:20:27 2007 UTC vs.
Revision 1.42 by root, Wed Apr 18 17:32:06 2007 UTC

 use Fcntl;
 use Coro::AIO;
 use List::Util qw(min max);
-my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir;
 # paranoia function to overwrite a string-in-place
 sub nuke_str {
    substr $_[0], 0, (length $_[0]), "x" x length $_[0]
 }
 sub query {
    my ($ns, $flags, $text) = @_;
    my $current = $Coro::current;
-   $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; });
+   $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
    Coro::schedule while ref $current;
    $current
 }
       } elsif ($k eq "extmap") {
         $ns->extmap ($v);
       } elsif ($k eq "facecache") {
+        if (!$v) {
+           $v = 1;
+           $setup{$k} = $v;
+           $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
+        }
         $ns->facecache ($v);
       } elsif ($k eq "faceset") {
         $ns->faceset (0);
         $setup{$k} = 0;
       } elsif ($k eq "extendedMapInfos") {
         $ns->ext_mapinfos ($v);
       } elsif ($k eq "extendedTextInfos") {
         $ns->has_readable_type ($v);
+      } elsif ($k eq "smoothing") { # cfplus-style smoothing
+        $ns->smoothing ($v);
       } elsif ($k eq "fxix") {
         $ns->fxix ($v);
       } else {
                 . "(check for Numlock and other semi-obvious error sources).",
                   cf::NDI_RED
                );
                next;
             }
+         } else {
+            # unable to load the playerfile:
+            # check wether the player dir exists, which means the file is corrupted or
+            # something very similar.
+            if (!aio_stat cf::player::playerdir $user) {
+               $ns->send_drawinfo (
+                  "Unable to retrieve this player. It might be a locked or broken account. "
+                . "If this is your account, ask a dungeon master for assistance. "
+                . "Otherwise choose a different login name.",
+                  cf::NDI_RED
+               );
+               next;
+            }
          }
          # the rest of this function is character creation
          # just to make sure nothing is left over
             or next;
          $pl->valid or next;
          eval {
             if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               $cf::WAIT_FOR_TICK_ONE->wait;
+               cf::wait_for_tick_begin;
                $pl->save;
                unless ($pl->active) {
                   # check refcounts, this is tricky and needs to be adjusted to fit server internals
                   my $ob = $pl->ob;

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.36 by root, Wed Apr 4 02:20:27 2007 UTC vs. Revision 1.42 by root, Wed Apr 18 17:32:06 2007 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.36 by root, Wed Apr 4 02:20:27 2007 UTC vs.
Revision 1.42 by root, Wed Apr 18 17:32:06 2007 UTC