--- deliantra/server/include/map.h	2007/01/10 01:16:54	1.50
+++ deliantra/server/include/map.h	2007/01/19 17:50:11	1.55
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002-2005 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) 2002-2005 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
+ */
 
 /*
  * The maptile is allocated each time a new map is opened.
@@ -85,7 +85,7 @@
  * should almost always be using out_of_map instead, which takes into account
  * map tiling.
  */
-#define OUT_OF_REAL_MAP(M,X,Y) ((X)<0 || (Y)<0 || (X)>=(M)->width || (Y)>=(M)->height)
+#define OUT_OF_REAL_MAP(M,X,Y) !(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))
 
 /* These are used in the MapLook flags element.  They are not used in
  * in the object flags structure.
@@ -127,7 +127,7 @@
 struct mapspace
 {
   object *bot, *top;            /* lowest/highest object on this space */
-  New_Face *faces[MAP_LAYERS];  /* faces for the 3 layers */
+  facetile *faces[MAP_LAYERS];  /* faces for the 3 layers */
   object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
   uint8 flags_;                 /* flags about this space (see the P_ values above) */
   sint8 light;                  /* How much light this space provides */
@@ -300,20 +300,20 @@
   MTH void clear_links_to (maptile *m);
 
   // loas the header pseudo-object
-  bool load_header (object_thawer &thawer);
-  MTH bool load_header (const char *path);
+  bool _load_header (object_thawer &thawer);
+  MTH bool _load_header (const char *path);
 
   // load objects into the map
-  bool load_objects (object_thawer &thawer);
-  MTH bool load_objects (const char *path, bool skip_header = true);
+  bool _load_objects (object_thawer &thawer);
+  MTH bool _load_objects (const char *path, bool skip_header = true);
 
   // save objects into the given file (uses IO_ flags)
-  bool save_objects (object_freezer &freezer, int flags);
-  MTH bool save_objects (const char *path, int flags);
+  bool _save_objects (object_freezer &freezer, int flags);
+  MTH bool _save_objects (const char *path, int flags);
 
   // save the header pseudo object _only_
-  bool save_header (object_freezer &freezer);
-  MTH bool save_header (const char *path);
+  bool _save_header (object_freezer &freezer);
+  MTH bool _save_header (const char *path);
 
   maptile ();
   maptile (int w, int h);
@@ -345,6 +345,9 @@
       do_load_sync ();
   }
 
+  void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
+  bool generate_random_map (random_map_params *RP);
+
   static maptile *find_sync (const char *path, maptile *original = 0);//PERL
   // async prefetch
   static maptile *find_async (const char *path, maptile *original = 0);//PERL
@@ -371,6 +374,26 @@
   object *part;
 };
 
+//TODO: these should be refactored into things like xy_normalise
+// and so on.
+int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
+int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y);
+int out_of_map(maptile *m, int x, int y);
+maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y);
+void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags);
+void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
+int on_same_map(const object *op1, const object *op2);
+
+// adjust map, x and y for tiled maps and return true if the position is valid at all
+inline bool
+xy_normalise (maptile *&map, sint16 &x, sint16 &y)
+{
+  // when in range, do a quick return, otherwise go the slow route
+  return
+    (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
+    || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
+}
+
 inline mapspace &
 object::ms () const
 {