--- deliantra/server/common/region.C	2007/02/02 00:42:03	1.24
+++ deliantra/server/common/region.C	2007/02/15 21:07:48	1.25
@@ -183,75 +183,71 @@
   return 0;
 }
 
-region *loader_region::get_region (const char *name)
+region *
+region::load (object_f &f)
 {
   region *rgn = new region;
-  rgn->name = name;
-  return rgn;
-}
-
-void loader_region::put_region (region *rgn)
-{
-  for_all_regions (old)
-    if (old->name == rgn->name)
-      {
-        // replace, copy new values (ugly)
-        rgn->index = old->index;
-        *old = *rgn;
-        delete rgn;
-
-        return;
-      }
+  f.get (rgn->name);
+  f.next_kv ();
 
-  // just append
-  regions.push_back (rgn);
-}
-
-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 ());
+            rgn->parent = region::find (f.get_str ());
             break;
 
           case KW_longname:
-           thawer.get (rgn->longname);
-           break;
+            f.get (rgn->longname);
+            break;
 
           case KW_jail_map:
-           thawer.get (rgn->jailmap);
-           break;
+            f.get (rgn->jailmap);
+            break;
 
           case KW_jail_x:
-           thawer.get (rgn->jailx);
-           break;
+            f.get (rgn->jailx);
+            break;
 
           case KW_jail_y:
-           thawer.get (rgn->jaily);
-           break;
+            f.get (rgn->jaily);
+            break;
 
           case KW_msg:
-            thawer.get_ml (KW_endmsg, rgn->msg);
+            f.get_ml (KW_endmsg, rgn->msg);
             break;
 
           case KW_fallback:
-            thawer.get (rgn->fallback);
+            f.get (rgn->fallback);
             break;
 
           case KW_end:
-            return true;
+            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_kv ();
     }
 }