--- deliantra/server/ext/setup.ext	2007/08/17 21:18:01	1.5
+++ deliantra/server/ext/setup.ext	2010/10/16 22:51:51	1.19
@@ -11,7 +11,7 @@
 
    $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]],
    );
 }
 
@@ -29,29 +29,9 @@
       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") {
-         $ns->darkness ($v);
-
-      } 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 "map2cmd") {
-         # gcfclient bug, map1acmd is sent too late
-         $ns->mapmode (cf::Map1aCmd);
-         $setup{$k} = "FALSE";
-
-      } elsif ($k eq "newmapcmd") {
-         $ns->newmapcmd ($v);
-
       } elsif ($k eq "mapinfocmd") {
          $ns->mapinfocmd ($v);
 
@@ -59,25 +39,13 @@
          $ns->extcmd (min 2, $v);
          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);
+         $setup{$k} = $ns->faceset (int cf::clamp $v, 0, 2);
 
       } elsif ($k eq "itemcmd") {
          # Version of the item protocol command to use.  Currently,
@@ -90,29 +58,34 @@
       } elsif ($k eq "mapsize") {
          my ($x, $y) = split /x/, $v;
 
-         $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
-         $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
+         # 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}";
 
-      } 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 ($setup{$k} = min 3, $v);
-
-      } elsif ($k eq "msg") {
-         $ns->can_msg ($setup{$k} = min 2, $v);
-
-      } elsif ($k eq "xwidget1") {
-         # eXperimental server-side widgets
-         $ns->{can_widget} = 1;
+      } 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;
+
+      } elsif ($k eq "lzf") {
+         # the lzf packet simply contains an lzf-compressed packet as argument
+         $ns->{can_lzf} = $v == 1;
+
+      } elsif ($k eq "frag") {
+         # the frag packet contains data which gets appended to the existing packet buffer.
+         # empty frag packet means end of packet.
+         $ns->{can_frag} = $v == 1;
 
       } elsif ($k eq "excmd") {
          # we support it
@@ -124,15 +97,26 @@
 
          $setup{$k} = "FALSE";
       }
-    }
-
-  $ns->send_packet (join " ", setup => %setup);
-
-  cf::datalog setup =>
-     request => $args,
-     reply   => \%setup,
-     client  => $ns->version,
-  ;
+   }
+  
+   # 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;
+  
+  
+   $ns->send_packet (join " ", setup => %setup);
+  
+   cf::datalog setup =>
+      request => $args,
+      reply   => \%setup,
+   ;
 });
 
-