--- deliantra/server/common/arch.C 2008/04/30 06:40:28 1.76
+++ deliantra/server/common/arch.C 2009/11/05 15:43:21 1.92
@@ -5,18 +5,19 @@
* 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * 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
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -52,6 +53,8 @@
// the vector of loaded but not yet committed archetypes
static std::vector postponed_arch;
+//+GPL
+
/**
* GROS - This function retrieves an archetype given the name that appears
* during the game (for example, "writing pen" instead of "stylus").
@@ -104,7 +107,7 @@
for_all_archetypes (at)
if (at->skill == skill_cmp && (type == -1 || type == at->type))
- return arch_to_object (at);
+ return at->instance ();
return 0;
}
@@ -135,23 +138,22 @@
* - 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)
{
char tmpname[MAX_BUF];
- int i;
assign (tmpname, name);
- for (i = strlen (tmpname); i > 0; i--)
+ for (int 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);
@@ -195,6 +197,7 @@
/* unpaid is a little more specific */
if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
return 2;
+
if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
return 2;
@@ -226,30 +229,32 @@
* later. So keep it in descending order here, so we try for the best
* match first, and work downward.
*/
+ const char *qbn0, *qbn1, *qsn; // query base name/short name caches
+
if (!strcasecmp (cp, query_name (op)))
retval = 20;
- else if (!strcasecmp (cp, query_short_name (op)))
+ else if (!strcasecmp (cp, qsn = query_short_name (op)))
retval = 18;
- else if (!strcasecmp (cp, query_base_name (op, 0)))
+ else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
retval = 16;
- else if (!strcasecmp (cp, query_base_name (op, 1)))
+ else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
retval = 16;
else if (op->custom_name && !strcasecmp (cp, op->custom_name))
retval = 15;
- else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
+ else if (!strncasecmp (cp, qbn0, strlen (cp)))
retval = 14;
- else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
+ else if (!strncasecmp (cp, qbn1, strlen (cp)))
retval = 14;
/* Do substring checks, so things like 'Str+1' will match.
* retval of these should perhaps be lower - they are lower
* then the specific strcasecmp aboves, but still higher than
* some other match criteria.
*/
- else if (strstr (query_base_name (op, 1), cp))
+ else if (strstr (qbn1, cp))
retval = 12;
- else if (strstr (query_base_name (op, 0), cp))
+ else if (strstr (qbn0, cp))
retval = 12;
- else if (strstr (query_short_name (op), cp))
+ else if (strstr (qsn, cp))
retval = 12;
/* Check against plural/non plural based on count. */
else if (count > 1 && !strcasecmp (cp, op->name_pl))
@@ -260,7 +265,7 @@
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)
@@ -275,6 +280,8 @@
return 0;
}
+//-GPL
+
archetype::archetype (const char *name)
{
arch = this;
@@ -442,7 +449,7 @@
fail:
for (auto (p, parts.begin ()); p != parts.end (); ++p)
- (*p)->destroy (true);
+ (*p)->destroy ();
return 0;
}
@@ -512,42 +519,35 @@
++idx;
else
{
- LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
- assert (at->arch == at); // verify that refcnt == 1 is truely valid
+ LOG (llevDebug, "garbage collect arch %s", &at->archname);
+ assert (at->arch == at); // verify that refcnt == 1 is truly valid
allarch.erase (idx);
- at->arch = 0;
- at->more = 0;
+
+ // 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;
}
}
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 ();
- op->arch = at;
+ object *op = clone ();
op->instantiate ();
-
return op;
}
-object *
-archetype::instance ()
-{
- return arch_to_object (this);
-}
+//+GPL
/*
* Creates an object. This function is called by get_archetype()
@@ -563,11 +563,8 @@
if (!strcmp (name, "bug"))
abort ();
- char buf[MAX_BUF];
- sprintf (buf, "bug, please report (%s)", name);
-
- object *op = get_archetype ("bug");
- op->name = op->name_pl = buf;
+ object *op = archetype::get (shstr_bug);
+ op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
return op;
}
@@ -579,18 +576,18 @@
object *
get_archetype (const char *name)
{
- archetype *at = archetype::find (name);
-
- if (!at)
- return create_singularity (name);
-
- return arch_to_object (at);
+ return archetype::get (name);
}
object *
archetype::get (const char *name)
{
- return get_archetype (name);
+ archetype *at = find (name);
+
+ if (!at)
+ return create_singularity (name);
+
+ return at->instance ();
}
/*
@@ -615,17 +612,15 @@
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 ();
- op->instantiate ();
- return op;
+ return at->instance ();
}
/*
@@ -638,7 +633,7 @@
while (at)
{
- op = arch_to_object (at);
+ op = at->instance ();
op->x = at->x;
op->y = at->y;
@@ -656,3 +651,5 @@
return head;
}
+//-GPL
+