--- deliantra/server/include/map.h	2007/03/12 01:13:10	1.72
+++ deliantra/server/include/map.h	2007/05/28 21:15:56	1.76
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /*
@@ -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 */