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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.34 by root, Tue Apr 3 00:21:37 2007 UTC vs.
Revision 1.41 by root, Tue Apr 17 10:06:33 2007 UTC

 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
 }
    system "cd \Q$PLAYERDIR\E "
         . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
         . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
 }
+sub send_capabilities {
+   my ($ns) = @_;
+   return unless $ns->extcmd;
+   $ns->ext_event (capabilities =>
+      # id, name, flags (1 == 2d), edge length
+      tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
+   );
+}
 sub setup {
    my ($ns, $args) = @_;
    # run through the cmds of setup
    # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
    # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
    # The client then must sort this out
    my %setup = split / +/, $args;
    while (my ($k, $v) = each %setup) {
       if ($k eq "sound") {
         $ns->sound ($v);
       } elsif ($k eq "exp64") {
         $setup{$k} = 1;
       } elsif ($k eq "mapinfocmd") {
         $ns->mapinfocmd ($v);
       } elsif ($k eq "extcmd") {
         $ns->extcmd ($v > 0);
+        send_capabilities $ns;
       } 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;
         # $ns->image2 (1)
+      } elsif ($k eq "tileset") {
+        $setup{$k} = $ns->faceset ($v & 1);
       } elsif ($k eq "itemcmd") {
         # Version of the item protocol command to use.  Currently,
         # only supported versions are 1 and 2.  Using a numeric
         # value will make it very easy to extend this in the future.
         $setup{$k} = $ns->itemcmd;
       } elsif ($k eq "mapsize") {
         my ($x, $y) = split /x/, $v;
-        $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x);
+        $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
-        $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y);
+        $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
         $setup{$k} = "${x}x${y}";
       } 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.34 by root, Tue Apr 3 00:21:37 2007 UTC vs. Revision 1.41 by root, Tue Apr 17 10:06:33 2007 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.34 by root, Tue Apr 3 00:21:37 2007 UTC vs.
Revision 1.41 by root, Tue Apr 17 10:06:33 2007 UTC