--- deliantra/server/ext/setup.ext	2008/08/31 10:05:26	1.9
+++ deliantra/server/ext/setup.ext	2010/05/04 21:45:42	1.15
@@ -36,7 +36,7 @@
          $ns->monitor_spells ($v);
 
       } elsif ($k eq "darkness") {
-         $ns->darkness ($v);
+         $setup{$k} = 1;
 
       } elsif ($k eq "map1cmd") {
          $ns->mapmode (cf::Map1Cmd) if $v > 0;
@@ -44,11 +44,6 @@
       } 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);
 
@@ -60,16 +55,10 @@
          send_capabilities $ns;
 
       } elsif ($k eq "extmap") {
-         $ns->extmap ($v);
+         $setup{$k} = 1;
 
       } 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);
+         $setup{$k} = 1;
 
       } elsif ($k eq "faceset") {
          $ns->faceset (0);
@@ -90,14 +79,13 @@
       } 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);
 
@@ -105,10 +93,10 @@
          $ns->smoothing ($v);
 
       } elsif ($k eq "fxix") {
-         $ns->fxix ($setup{$k} = min 3, $v);
+         $setup{$k} = 3;
 
       } elsif ($k eq "msg") {
-         $ns->can_msg ($setup{$k} = min 2, $v);
+         $setup{$k} = 1;
 
       } elsif ($k eq "widget") {
          # server-side widgets
@@ -143,8 +131,6 @@
   cf::datalog setup =>
      request => $args,
      reply   => \%setup,
-     client  => $ns->version,
   ;
 });
 
-