--- deliantra/server/socket/lowlevel.C	2010/04/08 20:05:36	1.76
+++ deliantra/server/socket/lowlevel.C	2012/10/29 23:55:57	1.85
@@ -1,22 +1,22 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * 
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -55,9 +55,9 @@
     {
       if (last_send + IDLE_PING <= NOW && pl && pl->active)
         {
-          // this is a bit ugly, but map1/map1a seem to be the only
-          // nop'able commands and they are quite small.
-          packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
+          // this is a bit ugly, but map1a seems to be the only
+          // nop'able command and it is quite small.
+          packet sl ("map1a");
           send_packet (sl);
         }
       else
@@ -179,12 +179,12 @@
   {"lock",        PC(LockItem)     PF_PLAYING },
   {"mark",        PC(MarkItem)     PF_PLAYING },
   {"move",        PC(MoveCmd)      PF_PLAYING },
-  {"ext",         PC(ExtCmd)       0 }, // CF+
+  {"ext",         PC(ExtCmd)       0 }, // CF+/Deliantra
   {"mapredraw",   PC(MapRedrawCmd) 0 },
-  {"mapinfo",     PC(MapInfoCmd)   0 }, // CF+
+  {"mapinfo",     PC(MapInfoCmd)   0 }, // CF+/Deliantra
 
   {"reply",       SC(ReplyCmd)     0 },
-  {"exti",        SC(ExtiCmd)      0 }, // CF+
+  {"exti",        SC(ExtiCmd)      0 }, // CF+/Deliantra
   {"addme",       SC(AddMeCmd)     0 },
   {"askface",     SC(AskFaceCmd)   0 },
   {"requestinfo", SC(RequestInfo)  0 },
@@ -192,7 +192,7 @@
   {"setup",       SC(SetUp)        0 },
   {"version",     SC(VersionCmd)   0 },
 
-  {"toggleextendedtext", SC(NopCmd)   0 },
+  {"toggleextendedtext", SC(NopCmd)   0 }, // deliantra: disabled
 };
 
 bool
@@ -288,7 +288,7 @@
       datalen = 0;
     }
 
-  for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
+  for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
     if (!strcmp ((char *)inbuf + 2, pkt->name))
       {
         if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
@@ -530,7 +530,7 @@
 
 packet &packet::operator <<(const ber32 v)
 {
-  enum { maxlen = 32 / 7 + 1};
+  enum { maxlen = 32 / 7 + 1 };
   uint8 buf[maxlen];
   uint8 *p = buf + maxlen;
   uint32 val = v.val;