--- deliantra/server/common/region.C	2007/02/15 21:07:48	1.25
+++ deliantra/server/common/region.C	2007/02/16 19:43:41	1.26
@@ -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 (;;)
     {
@@ -247,7 +247,7 @@
             break;
         }
 
-      f.next_kv ();
+      f.next ();
     }
 }