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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC vs.
Revision 1.45 by root, Fri Apr 13 07:26:29 2007 UTC

  * An alternative way to init the hashtable which is slower, but _works_...
  */
 void
 init_archetable (void)
 {
-  archetype *at;
   LOG (llevDebug, " Setting up archetable...\n");
-  for (at = first_archetype; at; at = at->more ? at->more : at->next)
+  for (archetype *at = first_archetype; at; at = at->next)
+    for (archetype *bt = at; bt; bt = bt->more)
-    at->hash_add ();
+      bt->hash_add ();
   LOG (llevDebug, "done\n");
 }
 void
   LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
 }
 archetype::archetype ()
 {
+  clone.arch = this;
   CLEAR_FLAG (&clone, FLAG_FREED);      /* This shouldn't matter, since copy_to */
   SET_FLAG (&clone, FLAG_REMOVED);      /* doesn't copy these flags... */
 }
 archetype::~archetype ()
 {
+  //TODO: nuke ->more's
+}
+archetype *
+archetype::read (object_thawer &f)
+{
+  assert (f.kw == KW_object);
+  archetype *head = new archetype;
+  f.get (head->name);
+  if (!head->clone.parse_kv (f))
+    {
+      delete head;
+      return 0;
+    }
+  for (archetype *prev = head; f.kw == KW_more; )
+    {
+      f.next ();
+      assert (f.kw == KW_object);
+      archetype *more = new archetype;
+      f.get (more->name);
+      if (!more->clone.parse_kv (f))
+        {
+          delete head;
+          return 0;
+        }
+      if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
+      if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
+      more->head       = head;
+      more->clone.head = &head->clone;
+      prev->more       = more;
+      prev->clone.more = &more->clone;
+      prev = more;
+    }
+  head->next = first_archetype;
+  first_archetype = head;
+  return head;
 }
 /*
  * Reads/parses the archetype-file, and copies into a linked list
  * of archetype-structures.
  */
-void
+static bool
-first_arch_pass (object_thawer & fp)
+first_arch_pass (object_thawer &f)
 {
-  archetype *head = 0, *last_more = 0;
+  for (;;)
-  archetype *at = new archetype;
-  at->clone.arch = first_archetype = at;
-  while (int i = load_object (fp, &at->clone, 0))
     {
-      at->clone.speed_left = (float) (-0.1);
-      /* copy the body_info to the body_used - this is only really
-       * need for monsters, but doesn't hurt to do it for everything.
-       * by doing so, when a monster is created, it has good starting
-       * values for the body_used info, so when items are created
-       * for it, they can be properly equipped.
-       */
-      memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
-      switch (i)
+      switch (f.kw)
-        {
-            case LL_NORMAL:    /* A new archetype, just link it with the previous */
-              if (last_more != NULL)
-                last_more->next = at;
-              if (head != NULL)
-                head->next = at;
-              head = last_more = at;
-#if 0
-              if (!op->type)
-                LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
-#endif
-              at->tail_x = 0;
-              at->tail_y = 0;
-              break;
-            case LL_MORE:      /* Another part of the previous archetype, link it correctly */
-              at->head = head;
-              at->clone.head = &head->clone;
-              if (last_more != NULL)
-                {
-                  last_more->more = at;
-                  last_more->clone.more = &at->clone;
-                }
-              last_more = at;
-              /* If this multipart image is still composed of individual small
-               * images, don't set the tail_.. values.  We can't use them anyways,
-               * and setting these to zero makes the map sending to the client much
-               * easier as just looking at the head, we know what to do.
-               */
-              if (at->clone.face != head->clone.face)
-                {
-                  head->tail_x = 0;
-                  head->tail_y = 0;
-                }
-              else
-                {
-                  if (at->clone.x > head->tail_x)
-                    head->tail_x = at->clone.x;
-                  if (at->clone.y > head->tail_y)
-                    head->tail_y = at->clone.y;
-                }
-              break;
-        }
+        {
+          case KW_object:
+            if (!archetype::read (f))
+              return false;
+            continue;
-      at = new archetype;
+          case KW_EOF:
+            return true;
-      at->clone.arch = at;
+          default:
-    }
+            if (!f.parse_error ("archetypes file"))
+              return false;
+        }
-  delete at;
+        f.next ();
+    }
 }
 /*
  * Reads the archetype file once more, and links all pointers between
  * archetypes.
  */
 void
 second_arch_pass (object_thawer & thawer)
 {
   char buf[MAX_BUF], *variable = buf, *argument, *cp;
   archetype *at = NULL, *other;
   while (fgets (buf, MAX_BUF, thawer) != NULL)
     {
       if (*buf == '#')
         continue;
       if ((argument = strchr (buf, ' ')) != NULL)
         {
           *argument = '\0', argument++;
           cp = argument + strlen (argument) - 1;
           while (isspace (*cp))
             {
               *cp = '\0';
               cp--;
             }
         }
-      if (!strcmp ("Object", variable))
+      if (!strcmp ("object", variable))
         {
           if ((at = archetype::find (argument)) == NULL)
             LOG (llevError, "Warning: failed to find arch %s\n", argument);
         }
       else if (!strcmp ("other_arch", variable))
                 at->clone.other_arch = other;
             }
         }
       else if (!strcmp ("randomitems", variable))
         {
-          if (at != NULL)
+          if (at)
             {
               treasurelist *tl = find_treasurelist (argument);
               if (tl == NULL)
                 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
             }
         }
     }
 }
-#ifdef DEBUG
-void
-check_generators (void)
-{
-  archetype *at;
-  for (at = first_archetype; at != NULL; at = at->next)
-    if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
-      LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
-}
-#endif
 /*
  * 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
 load_archetypes (void)
 {
   char filename[MAX_BUF];
   sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
   LOG (llevDebug, "Reading archetypes from %s:\n", filename);
   {
-    object_thawer
-    thawer (filename);
+    object_thawer f (filename);
+    f.next ();
     LOG (llevDebug, " arch-pass 1...\n");
-    first_arch_pass (thawer);
+    if (!first_arch_pass (f))
+      cleanup ("errors during first arch pass are fatal");
     LOG (llevDebug, " done\n");
   }
   init_archetable ();
   warn_archetypes = 1;
   {
-    object_thawer
-    thawer (filename);
+    object_thawer f (filename);
     LOG (llevDebug, " loading treasure...\n");
     load_treasures ();
     LOG (llevDebug, " done\n");
     LOG (llevDebug, " arch-pass 2...\n");
-    second_arch_pass (thawer);
+    second_arch_pass (f);
     LOG (llevDebug, " done\n");
-#ifdef DEBUG
-    check_generators ();
-#endif
   }
   LOG (llevDebug, " done\n");
 }
 /*
  * This function returns NULL on failure.
  */
 object *
 arch_to_object (archetype *at)
 {
-  object *op;
+  if (!at)
-  if (at == NULL)
     {
       if (warn_archetypes)
         LOG (llevError, "Couldn't find archetype.\n");
       return NULL;
     }
-  op = at->clone.clone ();
+  object *op = at->clone.clone ();
   op->arch = at;
   op->instantiate ();
   return op;
 }

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC vs. Revision 1.45 by root, Fri Apr 13 07:26:29 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC vs.
Revision 1.45 by root, Fri Apr 13 07:26:29 2007 UTC