--- deliantra/server/include/map.h	2007/01/29 16:11:48	1.63
+++ deliantra/server/include/map.h	2007/02/01 19:15:39	1.64
@@ -164,34 +164,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 */