--- deliantra/server/include/region.h	2007/07/13 15:54:40	1.8
+++ deliantra/server/include/region.h	2012/10/29 23:55:53	1.23
@@ -1,24 +1,25 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
- * 
- * 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
- * 
- * 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 3 of the License, or
- * (at your option) any later version.
- * 
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 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.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ *
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /*
@@ -29,7 +30,7 @@
 #ifndef REGION_H
 #define REGION_H
 
-typedef refptr<region> region_ptr;
+//+GPL
 
 /*
  * Each map is in a given region of the game world and links to a region definition, so
@@ -50,17 +51,16 @@
   shstr ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
   sint16 ACC (RW, jailx), ACC (RW, jaily);/* The coodinates in jailmap to which the player should be sent. */
   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
   treasurelist *treasure;                 // treasure to generate (mostly monsters)
 
-  static region *default_region ();
-  static region *find (const char *name);
-  static region *find_fuzzy (const char *name);
+//-GPL
+
+  MTH static region *default_region ();
+  MTH static region *find (shstr_cmp name);
   static region *read (object_thawer &f);
 
   void do_destroy ();