--- deliantra/server/common/region.C	2007/02/01 19:40:42	1.23
+++ deliantra/server/common/region.C	2007/04/17 18:24:30	1.29
@@ -25,8 +25,6 @@
 #include <global.h>
 #include <unistd.h>
 
-#include "loader.h"
-
 regionvec regions;
 
 region *
@@ -183,75 +181,59 @@
   return 0;
 }
 
-region *loader_region::get_region (const char *name)
-{
-  region *rgn = new region;
-  rgn->name = name;
-  return rgn;
-}
-
-void loader_region::put_region (region *rgn)
+region *
+region::read (object_thawer &f)
 {
-  for_all_regions (old)
-    if (old->name == rgn->name)
-      {
-        // replace, copy new values (ugly)
-        rgn->index = old->index;
-        *old = *rgn;
-        delete rgn;
+  assert (f.kw == KW_region);
 
-        return;
-      }
-
-  // just append
-  regions.push_back (rgn);
-}
+  region *rgn = new region;
+  f.get (rgn->name);
+  f.next ();
 
-bool
-loader_base::parse_region (object_thawer &thawer, region *rgn)
-{
   for (;;)
     {
-      keyword kw = thawer.get_kv ();
-
-      switch (kw)
+      switch (f.kw)
         {
           case KW_parent:
-            rgn->parent = region::find (thawer.get_str ());
-            break;
-
-          case KW_longname:
-           thawer.get (rgn->longname);
-           break;
-
-          case KW_jail_map:
-           thawer.get (rgn->jailmap);
-           break;
-
-          case KW_jail_x:
-           thawer.get (rgn->jailx);
-           break;
-
-          case KW_jail_y:
-           thawer.get (rgn->jaily);
-           break;
-
-          case KW_msg:
-            thawer.get_ml (KW_endmsg, rgn->msg);
+            rgn->parent = region::find (f.get_str ());
             break;
 
-          case KW_fallback:
-            thawer.get (rgn->fallback);
-            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_fallback: f.get (rgn->fallback); break;
+          case KW_msg:      f.get_ml (KW_endmsg, rgn->msg); break;
 
           case KW_end:
-            return true;
+            f.next ();
+
+            for_all_regions (old)
+              if (old->name == rgn->name)
+                {
+                  // replace, copy new values (ugly)
+                  rgn->index = old->index;
+                  *old = *rgn;
+                  delete rgn;
+
+                  return old;
+                }
+
+            // just append
+            regions.push_back (rgn);
+            return rgn;
 
           default:
-            if (!thawer.parse_error (kw, "region", rgn->name))
-              return false;
+            if (!f.parse_error ("region", rgn->name))
+              {
+                delete rgn;
+                return 0;
+              }
             break;
         }
+
+      f.next ();
     }
 }
 
@@ -259,7 +241,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)
@@ -273,3 +254,4 @@
       regions.push_back (rgn);
     }
 }
+