--- deliantra/server/common/region.C	2007/02/15 21:07:48	1.25
+++ deliantra/server/common/region.C	2007/05/22 10:49:59	1.31
@@ -1,6 +1,6 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
- * 
+ * CrossFire, A Multiplayer 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
@@ -25,8 +25,6 @@
 #include <global.h>
 #include <unistd.h>
 
-#include "loader.h"
-
 regionvec regions;
 
 region *
@@ -184,11 +182,13 @@
 }
 
 region *
-region::load (object_f &f)
+region::read (object_thawer &f)
 {
+  assert (f.kw == KW_region);
+
   region *rgn = new region;
   f.get (rgn->name);
-  f.next_kv ();
+  f.next ();
 
   for (;;)
     {
@@ -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_jail_y:
-            f.get (rgn->jaily);
-            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_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)
                 {
@@ -247,7 +241,7 @@
             break;
         }
 
-      f.next_kv ();
+      f.next ();
     }
 }
 
@@ -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)