--- deliantra/server/common/loader.C	2007/01/19 18:06:51	1.50
+++ deliantra/server/common/loader.C	2007/02/01 19:15:38	1.52
@@ -26,65 +26,18 @@
    sub/add_weight will transcend the environment updating the carrying
    variable. */
 
-
 #include <global.h>
 #include <loader.h>
 #include <sproto.h>
 
-// future resource loader base class
-struct loader_base
-{
-  const char *filename;
-  virtual const char *type () const = 0;
-
-  virtual archetype *get_arch (const char *name);
-  virtual void put_arch       (archetype *arch);
-
-  virtual object *get_object  (const char *name);
-  virtual void put_object     (object *op);
-
-  virtual player *get_player  ();
-  virtual void put_player     (player *pl);
-
-  virtual region *get_region  (const char *name);
-  virtual void put_region     (region *region);
-
-  virtual facetile *get_face  (const char *name);
-  virtual void put_face       (facetile *face);
-
-  virtual treasurelist *get_treasure (const char *name, bool one = false);
-  virtual void put_treasure (treasurelist *treasure);
-
-  virtual animation *get_animation (const char *name);
-  virtual void put_animation (animation *anim);
-};
-
-// future generic resource loader
-// handles generic stuff valid in most files, such as
-// animations, treasures, faces and so on
-struct loader_generic : loader_base
-{
-  const char *type () const = 0;
-
-  region *get_region  ();
-  void put_region     (region *region);
-
-  facetile *get_face  (const char *name);
-  void put_face       (facetile *face);
-
-  treasurelist *get_treasure (const char *name, bool one = false);
-  void put_treasure (treasurelist *treasure);
-
-  animation *get_animation (const char *name);
-  void put_animation (animation *anim);
-};
+/////////////////////////////////////////////////////////////////////////////
 
 // the base class warns about and skips everything
 archetype *
 loader_base::get_arch (const char *name)
 {
-  LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n",
-       filename, name, type ());
+  LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
+       filename, name);
 
   return new archetype;
 }
@@ -92,8 +45,8 @@
 object *
 loader_base::get_object  (const char *name)
 {
-  LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n",
-       filename, name, type ());
+  LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
+       filename, name);
 
   return object::create ();
 }
@@ -101,8 +54,8 @@
 player *
 loader_base::get_player  ()
 {
-  LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n",
-       filename, type ());
+  LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
+       filename);
 
   return player::create ();
 }
@@ -110,8 +63,8 @@
 region *
 loader_base::get_region  (const char *name)
 {
-  LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n",
-       filename, name, type ());
+  LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
+       filename, name);
 
   return new region;
 }
@@ -119,8 +72,8 @@
 facetile *
 loader_base::get_face  (const char *name)
 {
-  LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n",
-       filename, name, type ());
+  LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
+       filename, name);
 
   return new facetile;
 }
@@ -128,8 +81,8 @@
 treasurelist *
 loader_base::get_treasure (const char *name, bool one)
 {
-  LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n",
-       filename, name, type ());
+  LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
+       filename, name);
 
   return new treasurelist;//D
 }
@@ -137,8 +90,8 @@
 animation *
 loader_base::get_animation (const char *name)
 {
-  LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n",
-       filename, name, type ());
+  LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
+       filename, name);
 
   return new animation;
 }
@@ -185,6 +138,54 @@
   delete anim;
 }
 
+/////////////////////////////////////////////////////////////////////////////
+
+bool loader_base::parse (object_thawer &thawer)
+{
+  for (;;)
+    {
+      keyword kw = thawer.get_kv ();
+
+      switch (kw)
+        {
+          case KW_region:
+            {
+              region *rgn = get_region (thawer.get_str ());
+
+              if (!parse_region (thawer, rgn))
+                {
+                  delete rgn;
+                  return false;
+                }
+
+              put_region (rgn);
+            }
+            break;
+
+          case KW_EOF:
+            return true;
+
+          default:
+            if (!thawer.parse_error (kw, "resource file"))
+              return false;
+        }
+    }
+}
+
+bool loader_base::load (const char *filename)
+{
+  this->filename = filename;
+
+  object_thawer fp (filename);
+
+  if (!fp)
+    return false;
+
+  return parse (fp);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
 /* Maps the MOVE_* values to names */
 static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
 
@@ -1191,7 +1192,8 @@
             break;
 
           default:
-            LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
+            if (!thawer.parse_error (kw, "object", op->name))
+              return false;
             break;
         }
     }