--- deliantra/server/include/region.h	2007/07/01 05:00:18	1.6
+++ deliantra/server/include/region.h	2007/08/10 05:25:16	1.9
@@ -29,16 +29,17 @@
 #ifndef REGION_H
 #define REGION_H
 
+typedef refptr<region> region_ptr;
+
 /*
- * Each map is in a given region of the game world and links to a region definiton, so
+ * Each map is in a given region of the game world and links to a region definition, so
  * they have to appear here in the headers, before the mapdef
  */
 INTERFACE_CLASS (region)
-struct region : zero_initialised
+struct region : zero_initialised, attachable
 {
   shstr ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  shstr ACC (RW, match);                  // a perl regex that matches map paths
-  region *ACC (RW, parent);        	  /* 
+  region_ptr 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.
@@ -51,7 +52,6 @@
   shstr ACC (RW, portalmap);
   sint16 ACC (RW, portalx), ACC (RW, portaly);
   object_vector_index ACC (RW, index);
-  uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
   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 */
   float treasure_density;                 // chance of treasure per mapspace
@@ -61,6 +61,8 @@
   static region *find (const char *name);
   static region *find_fuzzy (const char *name);
   static region *read (object_thawer &f);
+
+  void do_destroy ();
 };
 
 typedef object_vector<region, &region::index> regionvec;