--- deliantra/server/socket/lowlevel.C	2010/04/11 23:32:10	1.77
+++ deliantra/server/socket/lowlevel.C	2010/10/25 11:35:15	1.81
@@ -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
+          // this is a bit ugly, but map1a seem to be the only
           // nop'able commands and they are quite small.
-          packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
+          packet sl ("map1a");
           send_packet (sl);
         }
       else
@@ -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;