--- deliantra/Deliantra-Client/Client.xs	2006/09/19 22:02:38	1.153
+++ deliantra/Deliantra-Client/Client.xs	2006/09/19 22:23:30	1.154
@@ -317,6 +317,8 @@
               
               cell->darkness = 0;
               cell->stat_hp  = 0;
+              cell->flags    = 0;
+              cell->player   = 0;
             }
       }
 }
@@ -1246,14 +1248,14 @@
 	CODE:
 {
         if (dx > 0)
-          map_blank (self, self->x, self->y, dx - 1, self->h);
+          map_blank (self, self->x, self->y, dx, self->h);
         else if (dx < 0)
-          map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
+          map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
 
         if (dy > 0)
-          map_blank (self, self->x, self->y, self->w, dy - 1);
+          map_blank (self, self->x, self->y, self->w, dy);
         else if (dy < 0)
-          map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
+          map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
 
 	self->ox += dx; self->x += dx;
 	self->oy += dy; self->y += dy;
@@ -1289,10 +1291,8 @@
               {
                 if (!cell->darkness)
                   {
+                    memset (cell, 0, sizeof (*cell));
                     cell->darkness = 256;
-                    cell->face [0] = 0;
-                    cell->face [1] = 0;
-                    cell->face [2] = 0;
                   }
 
                 //TODO: don't trust server data to be in-range(!)
@@ -1335,6 +1335,7 @@
                       }
                     else
                       cell->darkness = *data++ + 1;
+
                   }
 
                 if (flags & 4)
@@ -1356,6 +1357,8 @@
               {
                 cell->darkness = 0;
                 cell->stat_hp = 0;
+                cell->flags = 0;
+                cell->player = 0;
               }
           }
 }