--- deliantra/server/socket/request.C	2007/03/12 01:13:10	1.71
+++ deliantra/server/socket/request.C	2007/03/12 02:07:43	1.72
@@ -1353,10 +1353,9 @@
 void
 draw_client_map1 (object *pl)
 {
-  int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
+  int x, y, ax, ay, startlen, max_x, max_y, oldlen;
   sint16 nx, ny;
   int estartlen, eoldlen;
-  uint16 mask, emask;
   uint8 eentrysize;
   uint16 ewhatstart, ewhatflag;
   uint8 extendedinfos;
@@ -1417,12 +1416,11 @@
       ax = 0;
       for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
         {
+          int emask, mask;
           emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
 
           MapCell &lastcell = socket.lastmap.cells[ax][ay];
 
-          d = pl->contr->blocked_los[ax][ay];
-
           /* If the coordinates are not valid, or it is too dark to see,
            * we tell the client as such
            */
@@ -1441,10 +1439,16 @@
                   sl << uint16 (mask);
                   map_clearcell (&lastcell, -1);
                 }
+
+              continue;
             }
-          else if (d > 3)
+            
+          m->touch ();
+
+          int d = pl->contr->blocked_los[ax][ay];
+
+          if (d > 3)
             {
-              m->touch ();
 
               int need_send = 0, count;
 
@@ -1462,7 +1466,7 @@
               count = -1;
 
               /* properly clear a previously sent big face */
-              if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
+              if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
                   || lastcell.stat_hp || lastcell.flags || lastcell.player)
                 need_send = 1;
 
@@ -1475,8 +1479,6 @@
             }
           else
             {
-              m->touch ();
-
               /* In this block, the space is visible.
                */
 
@@ -1490,10 +1492,9 @@
                * what if anything we need to send, setting the bits, then
                * doing those checks again to add the real data.
                */
-              oldlen = sl.length ();
-              mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
+              oldlen  = sl.length ();
               eoldlen = esl.length ();
-              emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
+
               sl << uint16 (mask);
 
               if (socket.ext_mapinfos)
@@ -1656,7 +1657,7 @@
           /* No map data will follow, so don't say the client
            * it doesn't need draw!
            */
-          ewhatflag &= (~EMI_NOREDRAW);
+          ewhatflag &= ~EMI_NOREDRAW;
           esl[ewhatstart + 1] = ewhatflag & 0xff;
         }