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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.46 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.48 by root, Mon Apr 16 11:09:30 2007 UTC

     }
   return 0;
 }
-void
-init_archetypes (void)
-{
-  load_archetypes ();
-  empty_archetype = archetype::find ("empty_archetype");
-}
 archetype::archetype ()
 {
   clone.arch = this;
   CLEAR_FLAG (&clone, FLAG_FREED);      /* This shouldn't matter, since copy_to */
 /*
  * First initialises the archtype hash-table (init_archetable()).
  * Reads and parses the archetype file (with the first and second-pass
  * functions).
- * Then initialises treasures by calling load_treasures().
  */
-void
+bool
-load_archetypes (void)
+load_archetype_file (const char *filename)
 {
-  char filename[MAX_BUF];
-  sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
-  LOG (llevDebug, "Reading archetypes from %s:\n", filename);
   object_thawer f (filename);
   f.next ();
+  // make sure the next - long - step is only done after a tick
+  coroapi::wait_for_tick_begin ();
   if (!load_archetypes (f))
-    cleanup ("unable to load archetypes");
+    return false;
   warn_archetypes = 1;
+  empty_archetype = archetype::find ("empty_archetype");
+  if (!empty_archetype)
+    return false;
+  coroapi::cede ();
+  return true;
 }
 /*
  * Creates and returns a new object which is a copy of the given archetype.
  * This function returns NULL on failure.

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