--- deliantra/server/server/move.C	2006/09/14 22:34:04	1.8
+++ deliantra/server/server/move.C	2006/12/12 20:53:03	1.10
@@ -61,7 +61,7 @@
   sint16 newx = op->x + freearr_x[dir];
   sint16 newy = op->y + freearr_y[dir];
   object *tmp;
-  mapstruct *m;
+  maptile *m;
   int mflags;
 
   if (op == NULL)
@@ -123,7 +123,7 @@
   if (op->head)
     return 1;
 
-  remove_ob (op);
+  op->remove ();
 
   /* we already have newx, newy, and m, so lets use them.
    * In addition, this fixes potential crashes, because multipart object was
@@ -171,7 +171,7 @@
 
   if (op->head != NULL)
     op = op->head;
-  remove_ob (op);
+  op->remove ();
   for (tmp = op; tmp != NULL; tmp = tmp->more)
     tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x),
       tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
@@ -201,7 +201,7 @@
   object *altern;
   int i, j, k, nrofalt = 0;
   object *other_teleporter, *tmp;
-  mapstruct *m;
+  maptile *m;
   sint16 sx, sy;
 
   if (user == NULL)
@@ -274,7 +274,7 @@
         return 0;
     }
 
-  remove_ob (user);
+  user->remove ();
 
   /* Update location for the object */
   for (tmp = user; tmp != NULL; tmp = tmp->more)
@@ -309,12 +309,12 @@
  */
 
 int
-try_fit (object *op, mapstruct *m, int x, int y)
+try_fit (object *op, maptile *m, int x, int y)
 {
   object *tmp, *more;
   sint16 tx, ty;
   int mflags;
-  mapstruct *m2;
+  maptile *m2;
 
   if (op->head)
     op = op->head;
@@ -357,7 +357,7 @@
   object *tmp;
   sint16 x, y;
   int flags;
-  mapstruct *m;
+  maptile *m;
   MoveType move_block;
 
   if (op->head)
@@ -391,7 +391,7 @@
   if (try_fit (op, m, x, y))
     return 0;
 
-  remove_ob (op);
+  op->remove ();
   for (tmp = op; tmp != NULL; tmp = tmp->more)
     tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
   insert_ob_in_map (op, op->map, pusher, 0);
@@ -423,10 +423,10 @@
     )
     {
       int temp;
-      mapstruct *m;
+      maptile *m;
 
-      remove_ob (who);
-      remove_ob (pusher);
+      who->remove ();
+      pusher->remove ();
       temp = pusher->x;
       pusher->x = who->x;
       who->x = temp;