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

Comparing deliantra/server/ext/setup.ext (file contents):
Revision 1.12 by root, Sat Dec 27 01:25:00 2008 UTC vs.
Revision 1.22 by root, Tue Oct 30 15:05:27 2012 UTC

 #! perl # mandatory
 # the setup command
+use JSON::XS ();
 use List::Util qw(min max);
 sub send_capabilities {
    my ($ns) = @_;
    return unless $ns->extcmd;
    $ns->ext_msg (capabilities =>
       # id, name, flags (1 == 2d), edge length
-      tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
+      tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32], [2, "default text faceset", 2, 1]],
    );
 }
-cf::client->attach (on_setup => sub {
+sub do_setup {
-   my ($ns, $args) = @_;
+   my ($ns, $setup) = @_;
-   # run through the cmds of setup
+   my %orig = %$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) {
+   while (my ($k, $v) = each %$setup) {
       if ($k eq "sound") {
          $ns->sound ($v);
-      } elsif ($k eq "exp64") {
-         $setup{$k} = 1;
       } elsif ($k eq "spellmon") {
          $ns->monitor_spells ($v);
-      } elsif ($k eq "darkness") {
-         $setup{$k} = 1;
-      } elsif ($k eq "map1cmd") {
-         $ns->mapmode (cf::Map1Cmd) if $v > 0;
-      } elsif ($k eq "map1acmd") {
-         $ns->mapmode (cf::Map1aCmd) if $v > 0;
-      } elsif ($k eq "newmapcmd") {
-         $ns->newmapcmd ($v);
       } elsif ($k eq "mapinfocmd") {
          $ns->mapinfocmd ($v);
       } elsif ($k eq "extcmd") {
          $ns->extcmd (min 2, $v);
          send_capabilities $ns;
-      } elsif ($k eq "extmap") {
-         $ns->extmap ($v);
-      } elsif ($k eq "facecache") {
-         $setup{$k} = 1;
       } elsif ($k eq "faceset") {
          $ns->faceset (0);
-         $setup{$k} = 0;
+         $setup->{$k} = 0;
          # $ns->image2 (1)
       } elsif ($k eq "tileset") {
-         $setup{$k} = $ns->faceset ($v & 1);
+         $setup->{$k} = $ns->faceset (int cf::clamp $v, 0, 2);
       } 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.
          $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
-         $setup{$k} = $ns->itemcmd;
+         $setup->{$k} = $ns->itemcmd;
       } elsif ($k eq "mapsize") {
          my ($x, $y) = split /x/, $v;
          # we *need* to make sure we use an odd map size, as the remaining
          # code relies on this.
          $ns->mapx ($x = max 9, min +(cf::MAP_CLIENT_X - 1) | 1, ($x - 1) | 1);
          $ns->mapy ($y = max 9, min +(cf::MAP_CLIENT_Y - 1) | 1, ($y - 1) | 1);
-         $setup{$k} = "${x}x${y}";
+         $setup->{$k} = "${x}x${y}";
       } elsif ($k eq "extendedTextInfos") {
          $ns->has_readable_type ($v);
       } elsif ($k eq "smoothing") { # cfplus-style smoothing
          $ns->smoothing ($v);
-      } elsif ($k eq "fxix") {
-         $setup{$k} = 3;
-      } elsif ($k eq "msg") {
-         $ns->can_msg ($setup{$k} = min 2, $v);
       } elsif ($k eq "widget") {
          # server-side widgets
          $v = $v > 1;
          $ns->{can_widget} = $v;
          $ns->fx_want (6 => 1); # need support for RSRC
-         $setup{$k} = $v ? 2 : 0;
+         $setup->{$k} = $v ? 2 : 0;
       } elsif ($k eq "lzf") {
          # the lzf packet simply contains an lzf-compressed packet as argument
          $ns->{can_lzf} = $v == 1;
       } else {
          # other commands:
          # sexp: no idea, probably for oudated servers
          # tick: more stupidity, server should send a tick per tick
-         $setup{$k} = "FALSE";
+         $setup->{$k} = "FALSE";
       }
-    }
+   }
+   # force some mandatory protocol options, most of these
+   # are for obsolete clients only
+   $setup->{darkness}  = 1;
+   $setup->{exp64}     = 1;
+   $setup->{extmap}    = 1;
+   $setup->{facecache} = 1;
+   $setup->{fxix}      = 3;
+   $setup->{map1acmd}  = 1;
+   $setup->{map1cmd}   = 0;
+   $setup->{msg}       = 1;
+   $setup->{newmapcmd} = 1;
+   cf::datalog setup =>
+      request => \%orig,
+      reply   => $setup,
+   ;
+}
-  $ns->send_packet (join " ", setup => %setup);
+cf::client->attach (on_setup => sub {
+   my ($ns, $args) = @_;
-  cf::datalog setup =>
+   # run through the cmds of setup
-     request => $args,
+   # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
-     reply   => \%setup,
+   # or setup json-object
-     client  => $ns->version,
+   #
-  ;
+   # we send the status of the cmd back, or a FALSE is the cmd if the server unknown
+   # the client then must sort this out
+   if ($args =~ /^\s*\{/) {
+      my $setup = eval { JSON::XS::decode_json $args } || {};
+      do_setup $ns, $setup;
+      $ns->send_packet ("setup " . JSON::XS::encode_json $setup);
+   } else {
+      my %setup = split / +/, $args;
+      do_setup $ns, \%setup;
+      $ns->send_packet (join " ", setup => %setup);
+   }
 });

Diff Legend

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

Comparing deliantra/server/ext/setup.ext (file contents): Revision 1.12 by root, Sat Dec 27 01:25:00 2008 UTC vs. Revision 1.22 by root, Tue Oct 30 15:05:27 2012 UTC

Diff Legend

Comparing deliantra/server/ext/setup.ext (file contents):
Revision 1.12 by root, Sat Dec 27 01:25:00 2008 UTC vs.
Revision 1.22 by root, Tue Oct 30 15:05:27 2012 UTC