--- deliantra/server/common/region.C	2007/02/16 19:43:41	1.26
+++ deliantra/server/common/region.C	2007/05/28 21:21:40	1.32
@@ -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) 2001-2003 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 (©) 2001-2003,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>
  */
 
 #include <global.h>
@@ -198,31 +198,25 @@
             rgn->parent = region::find (f.get_str ());
             break;
 
-          case KW_longname:
-            f.get (rgn->longname);
-            break;
-
-          case KW_jail_map:
-            f.get (rgn->jailmap);
-            break;
-
-          case KW_jail_x:
-            f.get (rgn->jailx);
-            break;
+          case KW_msg:        f.get_ml (KW_endmsg, rgn->msg); break;
+          case KW_longname:   f.get (rgn->longname); break;
+          case KW_match:      f.get (rgn->match);    break;
+          case KW_jail_map:   f.get (rgn->jailmap);  break;
+          case KW_jail_x:     f.get (rgn->jailx);    break;
+          case KW_jail_y:     f.get (rgn->jaily);    break;
+          case KW_portal_map: f.get (rgn->portalmap);break;
+          case KW_portal_x:   f.get (rgn->portalx);  break;
+          case KW_portal_y:   f.get (rgn->portaly);  break;
+          case KW_fallback:   f.get (rgn->fallback); break;
+          case KW_chance:     f.get (rgn->treasure_density); break;
 
-          case KW_jail_y:
-            f.get (rgn->jaily);
-            break;
-
-          case KW_msg:
-            f.get_ml (KW_endmsg, rgn->msg);
-            break;
-
-          case KW_fallback:
-            f.get (rgn->fallback);
+          case KW_randomitems:
+            rgn->treasure = treasurelist::get (f.get_str ());
             break;
 
           case KW_end:
+            f.next ();
+
             for_all_regions (old)
               if (old->name == rgn->name)
                 {
@@ -255,7 +249,6 @@
  * First initialises the archtype hash-table (init_archetable()).
  * Reads and parses the archetype file (with the first and second-pass
  * functions).
- * Then initialises treasures by calling load_treasures().
  */
 void
 init_regions (void)