--- deliantra/server/include/region.h	2007/04/19 16:23:47	1.1
+++ deliantra/server/include/region.h	2007/06/24 00:33:54	1.5
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game
+ * 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>
  */
 
 /*
@@ -48,9 +48,11 @@
                                            * 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. */
+  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
@@ -68,7 +70,7 @@
 
 #define for_all_regions(var)			\
   for (unsigned _i = 0; _i < regions.size (); ++_i)	\
-    declvar (region *, var, regions [_i])
+    statementvar (region *, var, regions [_i])
 
 #endif