--- deliantra/server/include/map.h	2007/01/15 21:06:19	1.53
+++ deliantra/server/include/map.h	2007/01/29 14:46:01	1.61
@@ -49,13 +49,6 @@
 
 #define MAP_LAYERS		3
 
-/* options passed to ready_map_name and load_original_map */
-#define MAP_FLUSH	    0x01
-#define MAP_PLAYER_UNIQUE   0x02
-#define MAP_BLOCK	    0x04
-#define MAP_STYLE	    0x08
-#define MAP_OVERLAY	    0x10
-
 /* Values for in_memory below.  Should probably be an enumerations */
 enum {
   MAP_IN_MEMORY,
@@ -85,7 +78,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 +120,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 */
@@ -171,16 +164,16 @@
 INTERFACE_CLASS (region)
 struct region : zero_initialised
 {
-  struct region *ACC (RW, next);          /* pointer to next region, NULL for the last one */
-  char *ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  char *ACC (RW, parent_name);            /* 
+  region *ACC (RW, next);          /* pointer to next region, NULL for the last one */
+  shstr ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
+  shstr ACC (RW, parent_name);            /* 
                                            * So that parent and child regions can be defined in
                                            * any order, we keep hold of the parent_name during
                                            * initialisation, and the children get assigned to their
                                            * parents later. (before runtime on the server though)
                                            * nothing outside the init code should ever use this value.
                                            */
-  struct region *ACC (RW, parent);        /* 
+  region *ACC (RW, parent);        /* 
                                            * Pointer to the region that is a parent of the current
                                            * region, if a value isn't defined in the current region
                                            * we traverse this series of pointers until it is.
@@ -191,8 +184,12 @@
   uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
   sint8 ACC (RW, fallback);               /* whether, in the event of a region not existing,
                                            * this should be the one we fall back on as the default */
-  char *ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
+  shstr ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
   sint16 ACC (RW, jailx), ACC (RW, jaily);          /* The coodinates in jailmap to which the player should be sent. */
+
+  static region *default_region ();
+  static region *find (const char *name);
+  static region *find_fuzzy (const char *name);
 };
 
 struct shopitems : zero_initialised
@@ -225,11 +222,13 @@
 {
   sint32 ACC (RW, width), ACC (RW, height);        /* Width and height of map. */
   struct mapspace *spaces;         /* Array of spaces on this map */
+  uint8 *regions;                  /* region index per mapspace, if != 0 */
+  struct region **regionmap;       /* index to region */
 
   tstamp ACC (RW, last_access);    /* last time this map was accessed somehow */
 
   shstr ACC (RW, name);    /* Name of map as given by its creator */
-  struct region *ACC (RW, region); /* What jurisdiction in the game world this map is ruled by 
+  struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by 
                                     * points to the struct containing all the properties of 
                                     * the region */
   double ACC (RW, reset_time);
@@ -251,6 +250,7 @@
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
+  bool ACC (RW, nodrop);   /* avoid dropping anything on this map */
   uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
 
   uint16 ACC (RW, enter_x);        /* enter_x and enter_y are default entrance location */
@@ -299,6 +299,8 @@
   MTH void clear_header ();
   MTH void clear_links_to (maptile *m);
 
+  MTH struct region *region (int x, int y) const;
+
   // loas the header pseudo-object
   bool _load_header (object_thawer &thawer);
   MTH bool _load_header (const char *path);