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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.69 by root, Tue Apr 17 18:24:29 2007 UTC vs.
Revision 1.70 by root, Tue Apr 17 18:40:31 2007 UTC

 }
 /////////////////////////////////////////////////////////////////////////////
 // generic resource file load,
-// currently supports: region, treasures
+// currently supports: region, treasures, archetypes
 bool load_resource_file (const char *filename)
 {
   object_thawer f (filename);
+  bool success   = false;
+  bool seen_arch = false;
   f.next ();
   for (;;)
     {
       switch (f.kw)
         {
           case KW_region:
             if (!region::read (f))
-              return false;
+              goto finish;
             break;
           case KW_treasure:
           case KW_treasureone:
             if (!treasurelist::read (f))
-              return false;
+              goto finish;
+            break;
+          case KW_object:
+            seen_arch = true;
+            if (!archetype::read (f))
+              goto finish;
             break;
           case KW_EOF:
-            return true;
+            success = true;
+            goto finish;
           default:
             if (!f.parse_error ("resource file"))
-              return false;
+              goto finish;
         }
     }
+finish:
+  if (seen_arch)
+    init_archetype_pointers ();
+  return success;
 }

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