--- deliantra/Deliantra-Client/Client.xs	2008/07/20 02:51:40	1.266
+++ deliantra/Deliantra-Client/Client.xs	2008/07/20 02:55:36	1.267
@@ -369,6 +369,14 @@
   self->rows = 0;
 }
 
+#define CELL_CLEAR(cell)	\
+  do {				\
+    (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 +400,7 @@
 
               cell = row->col + x - row->c0;
               
-              cell->darkness = 0;
-              cell->stat_hp  = 0;
-              cell->flags    = 0;
-              cell->player   = 0;
+              CELL_CLEAR (cell);
             }
       }
 }
@@ -1782,12 +1787,7 @@
                     }
               }
             else
-              {
-                cell->darkness = 0;
-                cell->stat_hp  = 0;
-                cell->flags    = 0;
-                cell->player   = 0;
-              }
+              CELL_CLEAR (cell);
           }
 }
 	OUTPUT: