[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.123 by root, Thu Aug 30 07:28:24 2007 UTC vs.
Revision 1.124 by root, Tue Sep 4 05:43:20 2007 UTC

   return true;
 }
 bool
-maptile::_load_objects (const char *path, bool skip_header)
-{
-  object_thawer f (path);
-  if (!f)
-    return false;
-  f.next ();
-  if (skip_header)
-    for (;;)
-      {
-        keyword kw = f.kw;
-        f.skip ();
-        if (kw == KW_end)
-          break;
-      }
-  return _load_objects (f);
-}
-bool
 maptile::_save_objects (const char *path, int flags)
 {
   object_freezer freezer;
   if (!_save_objects (freezer, flags))
 bool
 maptile::_load_header (object_thawer &thawer)
 {
   for (;;)
     {
-      thawer.next ();
       switch (thawer.kw)
         {
           case KW_msg:
             thawer.get_ml (KW_endmsg, msg);
             break;
           case KW_ERROR:
             set_key_text (thawer.kw_str, thawer.value);
             break;
           case KW_end:
+            thawer.next ();
             return true;
           default:
             if (!thawer.parse_error ("map", 0))
               return false;
             break;
         }
+      thawer.next ();
     }
   abort ();
-}
-bool
-maptile::_load_header (const char *path)
-{
-  object_thawer thawer (path);
-  if (!thawer)
-    return false;
-  return _load_header (thawer);
 }
 /******************************************************************************
  * This is the start of unique map handling code
  *****************************************************************************/

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines