--- deliantra/Deliantra-Client/Client.xs	2008/07/20 02:51:40	1.266
+++ deliantra/Deliantra-Client/Client.xs	2008/07/20 15:09:29	1.271
@@ -369,6 +369,16 @@
   self->rows = 0;
 }
 
+#define CELL_CLEAR(cell)	\
+  do {				\
+    if ((cell)->player)		\
+      (cell)->tile [2] = 0;	\
+    (cell)->darkness = 0;	\
+    (cell)->stat_hp  = 0;	\
+    (cell)->flags    = 0;	\
+    (cell)->player   = 0;	\
+  } while (0)
+
 static void
 map_blank (DC__Map self, int x0, int y0, int w, int h)
 {
@@ -392,10 +402,7 @@
 
               cell = row->col + x - row->c0;
               
-              cell->darkness = 0;
-              cell->stat_hp  = 0;
-              cell->flags    = 0;
-              cell->player   = 0;
+              CELL_CLEAR (cell);
             }
       }
 }
@@ -666,7 +673,9 @@
         const_iv (SDL_GL_MULTISAMPLEBUFFERS),
         const_iv (SDL_GL_MULTISAMPLESAMPLES),
         const_iv (SDL_GL_ACCELERATED_VISUAL),
-        const_iv (SDL_GL_SWAP_CONTROL)
+        const_iv (SDL_GL_SWAP_CONTROL),
+
+        const_iv (FOW_DARKNESS)
 #	undef const_iv
   };
     
@@ -1782,12 +1791,7 @@
                     }
               }
             else
-              {
-                cell->darkness = 0;
-                cell->stat_hp  = 0;
-                cell->flags    = 0;
-                cell->player   = 0;
-              }
+              CELL_CLEAR (cell);
           }
 }
 	OUTPUT:
@@ -2234,7 +2238,7 @@
         mx += self->x - 1;
         my += self->y - 1;
 
-        memset (darkness1, 255, sw1 * sh1);
+        memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
 
         for (y = 0; y < sh1; y++)
           if (0 <= y + my && y + my < self->rows)