--- deliantra/server/common/object.C	2006/12/20 11:36:38	1.75
+++ deliantra/server/common/object.C	2006/12/21 23:37:05	1.77
@@ -748,7 +748,7 @@
       return;
     }
 
-  mapspace &m = op->map->at (op->x, op->y);
+  mapspace &m = op->ms ();
 
   if (m.flags_ & P_NEED_UPDATE)
     /* nop */;
@@ -1094,7 +1094,7 @@
                   tmp->container = 0;
                 }
 
-              tmp->contr->socket->floorbox_update ();
+              tmp->contr->ns->floorbox_update ();
             }
 
           /* See if player moving off should effect something */
@@ -1318,7 +1318,7 @@
       if (op->below)
         op->below->above = op;
       else
-        op->map->at (op->x, op->y).bottom = op;
+        op->ms ().bottom = op;
 
       /* since *below* originator, no need to update top */
       originator->below = op;
@@ -1407,7 +1407,7 @@
             op->above->below = op;
 
           op->below = NULL;
-          op->map->at (op->x, op->y).bottom = op;
+          op->ms ().bottom = op;
         }
       else
         {                       /* get inserted into the stack above top */
@@ -1421,7 +1421,7 @@
         }
 
       if (op->above == NULL)
-        op->map->at (op->x, op->y).top = op;
+        op->ms ().top = op;
     }                           /* else not INS_BELOW_ORIGINATOR */
 
   if (op->type == PLAYER)
@@ -1431,8 +1431,8 @@
    * it, so save a few ticks and start from there.
    */
   if (!(flag & INS_MAP_LOAD))
-    if (object *pl = op->map->at (op->x, op->y).player ())
-      pl->contr->socket->floorbox_update ();
+    if (object *pl = op->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