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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.74 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.89 by root, Mon Oct 12 14:00:57 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <cassert>
 #include <global.h>
-#include <funcpoint.h>
 #include <loader.h>
 #include <tr1/functional>
 #include <tr1/unordered_map>
 {
   shstr_cmp skill_cmp (skill);
   for_all_archetypes (at)
     if (at->skill == skill_cmp && (type == -1 || type == at->type))
-      return arch_to_object (at);
+      return at->instance ();
   return 0;
 }
 /* similiar to above - this returns the first archetype
  * - name: The name we're searching for (ex: "writing pen");
  * Return value:
  * - a corresponding object if found; a singularity object if not found.
  * Note by MSW - it appears that it takes the full name and keeps
  * shortening it until it finds a match.  I re-wrote this so that it
- * doesn't malloc it each time - not that this function is used much,
+ * doesn't allocate it each time - not that this function is used much,
  * but it otherwise had a big memory leak.
  */
 object *
 get_archetype_by_object_name (const char *name)
 {
   for (i = strlen (tmpname); i > 0; i--)
     {
       tmpname[i] = 0;
       if (archetype *at = find_archetype_by_object_name (tmpname))
-        return arch_to_object (at);
+        return at->instance ();
     }
   return create_singularity (name);
 }
         retval = 6;
       /* base name matched - not bad */
       else if (strcasecmp (cp, op->name) == 0 && !count)
         retval = 4;
       /* Check for partial custom name, but give a real low priority */
-      else if (op->custom_name && strstr (op->custom_name, cp))
+      else if (op->custom_name.contains (cp))
         retval = 3;
       if (retval)
         {
           if (pl->type == PLAYER)
     return new_head;
   }
 fail:
   for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy (true);
+    (*p)->destroy ();
   return 0;
 }
 void
       if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
         ++idx;
       else
         {
-          LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
+          LOG (llevDebug, "garbage collect arch %s", &at->archname);
-          assert (at->arch == at); // verify that refcnt == 1 is truely valid
+          assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
+          // break chain
+          for (object *op = at->head_ (); op; )
+            {
+              object *next = op->more;
+              op->head = 0;
+              op->more = 0;
+              op = next;
+            }
+          at->destroy ();
           at->arch = 0;
-          at->more = 0;
-          at->destroy ();
         }
     }
   while (--cnt);
 }
-/*
- * Creates and returns a new object which is a copy of the given archetype.
- * This function returns NULL on failure.
- */
 object *
-arch_to_object (archetype *at)
+archetype::instance ()
 {
-  if (!at)
-    {
-      LOG (llevError, "Couldn't find archetype.\n");
-      return 0;
-    }
-  object *op = at->clone ();
+  object *op = clone ();
-  op->arch = at;
   op->instantiate ();
   return op;
-}
-object *
-archetype::instance ()
-{
-  return arch_to_object (this);
 }
 /*
  * Creates an object.  This function is called by get_archetype()
  * if it fails to find the appropriate archetype.
   LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
   if (!strcmp (name, "bug"))
     abort ();
-  char buf[MAX_BUF];
-  sprintf (buf, "bug, please report (%s)", name);
-  object *op = get_archetype ("bug");
+  object *op = archetype::get (shstr_bug);
-  op->name = op->name_pl = buf;
+  op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
   return op;
 }
 /*
  * object containing a copy of the archetype.
  */
 object *
 get_archetype (const char *name)
 {
+  return archetype::get (name);
+}
+object *
+archetype::get (const char *name)
+{
-  archetype *at = archetype::find (name);
+  archetype *at = find (name);
   if (!at)
     return create_singularity (name);
-  return arch_to_object (at);
+  return at->instance ();
 }
 /*
  * Returns the first archetype using the given type.
  * Used in treasure-generation.
  * Used in treasure-generation.
  */
 object *
 clone_arch (int type)
 {
-  archetype *at;
+  archetype *at = type_to_archetype (type);
-  if ((at = type_to_archetype (type)) == NULL)
+  if (!at)
     {
       LOG (llevError, "Can't clone archetype %d\n", type);
       return 0;
     }
-  object *op = at->clone ();
+  return at->instance ();
-  op->instantiate ();
-  return op;
 }
 /*
  * member: make instance from class
  */
 {
   object *op, *prev = 0, *head = 0;
   while (at)
     {
-      op = arch_to_object (at);
+      op = at->instance ();
       op->x = at->x;
       op->y = at->y;
       if (head)

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.74 by root, Sun Apr 20 05:24:55 2008 UTC vs. Revision 1.89 by root, Mon Oct 12 14:00:57 2009 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.74 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.89 by root, Mon Oct 12 14:00:57 2009 UTC