--- deliantra/server/include/region.h	2010/03/26 00:59:21	1.16
+++ deliantra/server/include/region.h	2010/04/29 12:24:04	1.20
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -30,8 +30,6 @@
 #ifndef REGION_H
 #define REGION_H
 
-typedef refptr<region> region_ptr;
-
 //+GPL
 
 /*
@@ -53,7 +51,6 @@
   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);
   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 */
@@ -62,8 +59,8 @@
 
 //-GPL
 
-  static region *default_region ();
-  static region *find (shstr_cmp name);
+  MTH static region *default_region ();
+  MTH static region *find (shstr_cmp name);
   static region *read (object_thawer &f);
 
   void do_destroy ();