--- deliantra/server/common/map.C	2007/02/15 15:43:36	1.86
+++ deliantra/server/common/map.C	2007/02/15 21:07:48	1.87
@@ -544,12 +544,10 @@
   if (skip_header)
     for (;;)
       {
-        keyword kw = thawer.get_kv ();
-
-        if (kw == KW_end)
+        if (thawer.kw == KW_end)
           break;
 
-        thawer.skip_kv (kw);
+        thawer.skip_kv ();
       }
 
   return _load_objects (thawer);
@@ -805,7 +803,7 @@
             return true;
 
           default:
-            if (!thawer.parse_error (kw, "map", 0))
+            if (!thawer.parse_error ("map", 0))
               return false;
             break;
         }