--- deliantra/server/server/move.C	2017/01/29 02:47:05	1.48
+++ deliantra/server/server/move.C	2017/09/16 22:17:42	1.49
@@ -30,8 +30,8 @@
 int
 object::move (int dir, object *originator)
 {
-  sint16 newx = x + freearr_x[dir];
-  sint16 newy = y + freearr_y[dir];
+  sint16 newx = x + DIRX (dir);
+  sint16 newy = y + DIRY (dir);
 
   mapxy pos (this);
   pos.move (dir);
@@ -122,8 +122,8 @@
 
   for (object *tmp = op; tmp; tmp = tmp->more)
     {
-      tmp->x = x + freearr_x[i] + tmp->arch->x;
-      tmp->y = y + freearr_y[i] + tmp->arch->y;
+      tmp->x = x + DIRX (i) + tmp->arch->x;
+      tmp->y = y + DIRY (i) + tmp->arch->y;
     }
 
   op = insert_ob_in_map (op, op->map, originator, 0);
@@ -198,7 +198,7 @@
               sint16 sx, sy;
 
               if (get_map_flags (other_teleporter->map, &m,
-                                 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP)
+                                 other_teleporter->x + DIRX (k), other_teleporter->y + DIRY (k), &sx, &sy) & P_OUT_OF_MAP)
                 continue;
 
               if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy)))
@@ -217,7 +217,7 @@
     }
 
   return !other_teleporter->map->insert (
-            user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
+            user, other_teleporter->x + DIRX (k), other_teleporter->y + DIRY (k)
          );
 }
 
@@ -282,8 +282,8 @@
   if (op->head)
     op = op->head;
 
-  x = op->x + freearr_x[dir];
-  y = op->y + freearr_y[dir];
+  x = op->x + DIRX (dir);
+  y = op->y + DIRY (dir);
 
   if (!op->flag [FLAG_CAN_ROLL]
       || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)