--- deliantra/server/common/object.C	2007/09/15 15:58:06	1.190
+++ deliantra/server/common/object.C	2007/09/30 20:22:15	1.191
@@ -1292,7 +1292,7 @@
       top = ms.bot;
 
       /* If there are other objects, then */
-      if ((!(flag & INS_MAP_LOAD)) && top)
+      if (top)
         {
           object *last = 0;
 
@@ -1354,8 +1354,6 @@
                 top = last->below;
             }
         }                       /* If objects on this space */
-      if (flag & INS_MAP_LOAD)
-        top = ms.top;
 
       if (flag & INS_ABOVE_FLOOR_ONLY)
         top = floor;
@@ -1398,9 +1396,8 @@
 
   op->map->dirty = true;
 
-  if (!(flag & INS_MAP_LOAD))
-    if (object *pl = ms.player ())
-      pl->contr->ns->floorbox_update ();
+  if (object *pl = ms.player ())
+    pl->contr->ns->floorbox_update ();
 
   /* If this object glows, it may affect lighting conditions that are
    * visible to others on this map.  But update_all_los is really