--- deliantra/server/include/map.h	2007/01/29 15:04:21	1.62
+++ deliantra/server/include/map.h	2007/02/07 02:04:46	1.65
@@ -155,6 +155,9 @@
 
     return 0;
   }
+
+  // return the item volume on this mapspace in kg/m³
+  uint64 volume ();
 };
 
 /*
@@ -164,34 +167,35 @@
 INTERFACE_CLASS (region)
 struct region : zero_initialised
 {
-  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.
-                                           */
   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.
                                            */
-  char *ACC (RW, longname);               /* Official title of the region, this might be defined
+  shstr ACC (RW, longname);               /* Official title of the region, this might be defined
                                            * to be the same as name*/
   shstr ACC (RW, msg);                    /* the description of the region */
-  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 */
   shstr ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
+  int ACC (RW, index);
+  uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
   sint16 ACC (RW, jailx), ACC (RW, jaily);          /* The coodinates in jailmap to which the player should be sent. */
+  bool ACC (RW, fallback);               /* whether, in the event of a region not existing,
+                                           * this should be the one we fall back on as the default */
 
   static region *default_region ();
   static region *find (const char *name);
   static region *find_fuzzy (const char *name);
 };
 
+typedef object_vector<region, &region::index> regionvec;
+
+extern regionvec regions;
+
+#define for_all_regions(var)			\
+  for (int _i = 0; _i < regions.size (); ++_i)	\
+    declvar (region *, var, regions [_i])
+
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
@@ -378,13 +382,14 @@
 
 //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);
+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);
+int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
 
 // adjust map, x and y for tiled maps and return true if the position is valid at all
 inline bool