--- deliantra/server/include/map.h	2007/03/12 01:13:10	1.72
+++ deliantra/server/include/map.h	2007/04/21 16:56:32	1.75
@@ -158,43 +158,6 @@
   uint64 volume () const;
 };
 
-/*
- * Each map is in a given region of the game world and links to a region definiton, so
- * they have to appear here in the headers, before the mapdef
- */
-INTERFACE_CLASS (region)
-struct region : zero_initialised
-{
-  shstr ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  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.
-                                           */
-  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 */
-  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);
-  static region *read (object_thawer &f);
-};
-
-typedef object_vector<region, &region::index> regionvec;
-
-extern regionvec regions;
-
-#define for_all_regions(var)			\
-  for (unsigned _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 */
@@ -250,6 +213,7 @@
   sint16 players;        /* How many players are on this map right now */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
 
+  bool ACC (RW, active);           // wether this map is active or not
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */