--- deliantra/server/socket/request.C	2008/12/19 22:47:30	1.141
+++ deliantra/server/socket/request.C	2008/12/23 06:58:24	1.143
@@ -100,25 +100,21 @@
   my = ns->mapy;
 
   /* the x and y here are coordinates for the new map, i.e. if we moved
-   * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy].  For this reason,
+   * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
    * if the destination x or y coordinate is outside the viewable
    * area, we clear the values - otherwise, the old values
    * are preserved, and the check_head thinks it needs to clear them.
    */
   for (x = 0; x < mx; x++)
-    {
-      for (y = 0; y < my; y++)
-        {
-          if (x >= ns->mapx || y >= ns->mapy)
-            /* clear cells outside the viewable area */
-            memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
-          else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
-            /* clear newly visible tiles within the viewable area */
-            memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
-          else
-            memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
-        }
-    }
+    for (y = 0; y < my; y++)
+      if (x >= ns->mapx || y >= ns->mapy)
+        /* clear cells outside the viewable area */
+        memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
+      else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
+        /* clear newly visible tiles within the viewable area */
+        memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
+      else
+        memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
 
   memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
 
@@ -1058,12 +1054,11 @@
   prefetch_surrounding_maps (pl->ob);
 
   /* do LOS after calls to update_position */
-  if (ob != pl->ob)
-    clear_los (pl);
-  else if (pl->do_los)
+  /* unfortunately, we need to udpate los when observing, currently */
+  if (pl->do_los || pl->observe != pl->ob)
     {
-      update_los (ob);
       pl->do_los = 0;
+      pl->update_los ();
     }
 
   /**