--- deliantra/server/common/map.C	2007/01/14 23:35:03	1.74
+++ deliantra/server/common/map.C	2007/01/19 17:50:10	1.78
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 #include <global.h>
 #include <funcpoint.h>
@@ -230,7 +230,6 @@
   return 0;
 }
 
-
 /*
  * Returns true if the given object can't fit in the given spot.
  * This is meant for multi space objects - for single space objecs,
@@ -1113,7 +1112,7 @@
 {
   object *tmp, *last = 0;
   uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
-  New_Face *top, *floor, *middle;
+  facetile *top, *floor, *middle;
   object *top_obj, *floor_obj, *middle_obj;
   MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
 
@@ -1610,14 +1609,16 @@
                   best = tmp;
                 }
             }
+
           if (best != op1)
             {
               retval->distance_x += op1->x - best->x;
               retval->distance_y += op1->y - best->y;
             }
         }
+
       retval->part = best;
-      retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
+      retval->distance = idistance (retval->distance_x, retval->distance_y);
       retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
     }
 }
@@ -1651,7 +1652,7 @@
       retval->distance_y += op2->y - y;
 
       retval->part = NULL;
-      retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
+      retval->distance = idistance (retval->distance_x, retval->distance_y);
       retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
     }
 }