--- deliantra/server/common/arch.C 2006/09/14 21:16:11 1.20
+++ deliantra/server/common/arch.C 2018/11/27 18:50:22 1.118
@@ -1,67 +1,79 @@
/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- Copyright (C) 1992 Frank Tore Johansen
-
- This program 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 2 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- The authors can be reached via e-mail at crossfire-devel@real-time.com
-*/
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
+ * 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 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
+ */
#include
+#include
-#include
+#include
#include
-#include
-#include
-#include
-/* IF set, does a little timing on the archetype load. */
-#define TIME_ARCH_LOAD 0
+archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
+arch_ptr archetype::empty;
+
+// the hashtable
+typedef ska::flat_hash_map
+ <
+ const char *,
+ arch_ptr,
+ str_hash,
+ str_equal,
+ slice_allocator< std::pair >
+ > HT;
+
+static HT ht (10000);
+archvec archetypes;
+static unordered_vector allarch;
+static int dirtycnt;
-static void add_arch (archetype *at);
+// the vector of other_arch references to be resolved
+static std::vector< std::pair > postponed_arch_ref;
+// the vector of loaded but not yet committed archetypes
+static std::vector postponed_arch;
-static archetype *arch_table[ARCHTABLE];
-int arch_cmp = 0; /* How many strcmp's */
-int arch_search = 0; /* How many searches */
-int arch_init; /* True if doing arch initialization */
+//+GPL
-/* The naming of these functions is really poor - they are all
- * pretty much named '.._arch_...', but they may more may not
- * return archetypes. Some make the arch_to_object call, and thus
- * return an object. Perhaps those should be called 'archob' functions
- * to denote they return an object derived from the archetype.
- * MSW 2003-04-29
+/*
+ * Creates an object. This function is called by archetype::get ()
+ * if it fails to find the appropriate archetype.
+ * Thus archetype::get() will be guaranteed to always return
+ * an object, and never NULL.
*/
+static object *
+create_singularity (const char *name)
+{
+ LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
-#if USE_UNORDERED_MAP
-// the hashtable
-typedef std::tr1::unordered_map
- <
- std::size_t,
- archetype *,
- std::hash,
- std::equal_to,
- slice_allocator< std::pair >
- true,
- > HT;
+ if (!strcmp (name, "bug"))
+ abort ();
-static HT ht;
-#endif
+ object *op = archetype::get (shstr_bug);
+ op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
+
+ return op;
+}
/**
* GROS - This function retrieves an archetype given the name that appears
@@ -77,17 +89,13 @@
archetype *
find_archetype_by_object_name (const char *name)
{
- archetype *at;
+ shstr_cmp name_cmp (name);
- if (name == NULL)
- return (archetype *) NULL;
+ for_all_archetypes (at)
+ if (at->name == name_cmp)
+ return at;
- for (at = first_archetype; at != NULL; at = at->next)
- {
- if (!strcmp (at->clone.name, name))
- return at;
- }
- return NULL;
+ return 0;
}
/**
@@ -98,18 +106,13 @@
archetype *
find_archetype_by_object_type_name (int type, const char *name)
{
- archetype *at;
-
- if (name == NULL)
- return NULL;
+ shstr_cmp name_cmp (name);
- for (at = first_archetype; at != NULL; at = at->next)
- {
- if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
- return at;
- }
+ for_all_archetypes (at)
+ if (at->name == name_cmp && at->type == type)
+ return at;
- return NULL;
+ return 0;
}
/* This is a lot like the above function. Instead, we are trying to match
@@ -120,18 +123,13 @@
object *
get_archetype_by_skill_name (const char *skill, int type)
{
- archetype *
- at;
+ shstr_cmp skill_cmp (skill);
- if (skill == NULL)
- return NULL;
+ for_all_archetypes (at)
+ if (at->skill == skill_cmp && (type == -1 || type == at->type))
+ return at->instance ();
- for (at = first_archetype; at != NULL; at = at->next)
- {
- if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
- return arch_to_object (at);
- }
- return NULL;
+ return 0;
}
/* similiar to above - this returns the first archetype
@@ -144,15 +142,11 @@
archetype *
get_archetype_by_type_subtype (int type, int subtype)
{
- archetype *
- at;
+ for_all_archetypes (at)
+ if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
+ return at;
- for (at = first_archetype; at != NULL; at = at->next)
- {
- if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype))
- return at;
- }
- return NULL;
+ return 0;
}
/**
@@ -164,58 +158,51 @@
* - 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)
{
- archetype *at;
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;
- at = find_archetype_by_object_name (tmpname);
- if (at != NULL)
- return arch_to_object (at);
+ if (archetype *at = find_archetype_by_object_name (tmpname))
+ return at->instance ();
}
return create_singularity (name);
}
- /* This is a subset of the parse_id command. Basically, name can be
- * a string seperated lists of things to match, with certain keywords.
- * pl is the player (only needed to set count properly)
- * op is the item we are trying to match. Calling function takes care
- * of what action might need to be done and if it is valid
- * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
- * value means a better match. 0 means no match.
- *
- * Brief outline of the procedure:
- * We take apart the name variable into the individual components.
- * cases for 'all' and unpaid are pretty obvious.
- * Next, we check for a count (either specified in name, or in the
- * player object.)
- * If count is 1, make a quick check on the name.
- * IF count is >1, we need to make plural name. Return if match.
- * Last, make a check on the full name.
- */
+/* This is a subset of the parse_id command. Basically, name can be
+ * a string seperated lists of things to match, with certain keywords.
+ * pl is the player (only needed to set count properly)
+ * op is the item we are trying to match. Calling function takes care
+ * of what action might need to be done and if it is valid
+ * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
+ * value means a better match. 0 means no match.
+ *
+ * Brief outline of the procedure:
+ * We take apart the name variable into the individual components.
+ * cases for 'all' and unpaid are pretty obvious.
+ * Next, we check for a count (either specified in name, or in the
+ * player object.)
+ * If count is 1, make a quick check on the name.
+ * IF count is >1, we need to make plural name. Return if match.
+ * Last, make a check on the full name.
+ */
int
item_matched_string (object *pl, object *op, const char *name)
{
- char *
- cp,
- local_name[MAX_BUF];
- int
- count,
- retval = 0;
+ char *cp, local_name[MAX_BUF];
+ int count, retval = 0;
- strcpy (local_name, name); /* strtok is destructive to name */
+ assign (local_name, name); /* strtok is destructive to name */
for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
{
@@ -228,12 +215,13 @@
return 1;
/* unpaid is a little more specific */
- if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
+ if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
return 2;
- if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
+
+ if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
return 2;
- if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
+ if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
return 2;
/* Allow for things like '100 arrows' */
@@ -261,566 +249,359 @@
* 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))
- {
- retval = 6;
- }
+ retval = 6;
else if (count == 1 && !strcasecmp (op->name, cp))
- {
- retval = 6;
- }
+ 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)
pl->contr->count = count;
+
return retval;
}
}
+
return 0;
}
-/*
- * Initialises the internal linked list of archetypes (read from file).
- * Then the global "empty_archetype" pointer is initialised.
- * Then the blocksview[] array is initialised.
- */
+//-GPL
void
-init_archetypes (void)
-{ /* called from add_player() and edit() */
- if (first_archetype != NULL) /* Only do this once */
- return;
-
- arch_init = 1;
- load_archetypes ();
- arch_init = 0;
- empty_archetype = archetype::find ("empty_archetype");
-
-/* init_blocksview();*/
+archetype::do_delete ()
+{
+ delete this;
}
-/*
- * Stores debug-information about how efficient the hashtable
- * used for archetypes has been in the static errmsg array.
- */
-
-void
-arch_info (object *op)
+archetype::archetype (const char *name)
{
- sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
- new_draw_info (NDI_BLACK, 0, op, errmsg);
+ arch = this;
+ this->archname = this->name = this->name_pl = name;
}
-/*
- * Initialise the hashtable used by the archetypes.
- */
-
-void
-clear_archetable (void)
+archetype::~archetype ()
{
- memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
+ unlink ();
}
-/*
- * An alternative way to init the hashtable which is slower, but _works_...
- */
-
void
-init_archetable (void)
+archetype::link ()
{
- archetype *
- at;
-
- LOG (llevDebug, " Setting up archetable...\n");
-
- for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
- add_arch (at);
-
- LOG (llevDebug, "done\n");
+ if (!archetypes.contains (this))
+ {
+ archetypes.insert (this);
+ ht.insert (std::make_pair (archname, this));
+ }
}
-/*
- * Dumps an archetype to debug-level output.
- */
-
void
-dump_arch (archetype *at)
+archetype::unlink ()
{
- dump_object (&at->clone);
+ if (archetypes.contains (this))
+ {
+ archetypes.erase (this);
+ ht.erase (archname);
+ }
}
/*
- * Dumps _all_ archetypes to debug-level output.
- * If you run crossfire with debug, and enter DM-mode, you can trigger
- * this with the O key.
+ * Finds, using the hashtable, which archetype matches the given name.
+ * returns a pointer to the found archetype, otherwise NULL.
*/
-
-void
-dump_all_archetypes (void)
+archetype *
+archetype::find (const char *name)
{
- archetype *
- at;
+ if (!name)
+ return 0;
- for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
- {
- dump_arch (at);
- fprintf (logfile, "%s\n", errmsg);
- }
+ auto (i, ht.find (name));
+
+ if (i == ht.end ())
+ return 0;
+ else
+ return i->second;
}
void
-free_all_archs (void)
+archetype::post_load_check ()
{
- archetype *
- at, *
- next;
- int
- i = 0, f = 0;
-
- for (at = first_archetype; at != NULL; at = next)
- {
- if (at->more)
- next = at->more;
- else
- next = at->next;
+ assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
- delete
- at;
+ if (type == SKILL)
+ add_skill_archetype (this);
- i++;
- }
- LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
+ object::post_load_check ();
}
-archetype::archetype ()
-{
- clear_object (&clone); /* to initial state other also */
- CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
- SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
-}
-
-archetype::~archetype ()
+archetype *
+archetype::read (object_thawer &f)
{
-}
+ assert (f.kw == KW_object);
-/*
- * Reads/parses the archetype-file, and copies into a linked list
- * of archetype-structures.
- */
-void
-first_arch_pass (object_thawer & fp)
-{
- archetype *
- at, *
- head = NULL, *last_more = NULL;
+ std::vector parts;
- at->clone.arch = first_archetype = at = new archetype;
+ coroapi::cede_to_tick ();
- while (int i = load_object (fp, &at->clone, 0))
+ for (;;)
{
- 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));
+ archetype *at = new archetype (f.get_str ());
+
+ f.next ();
- switch (i)
- {
- 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;
+ // implementing it here in the server does neither allow multiple inheritence
+ // nor does it cleanly "just override". it would allow use in map files, though,
+ // and other resource files dynamically loaded (as opposed to being preprocessed).
+ // not that any of this is relevant as of yet...
+ if (f.kw == KW_inherit)
+ {
+ if (archetype *at = find (f.get_str ()))
+ *op = at->clone;
+ else
+ LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
+ &at->archname, f.get_str ());
+ f.next ();
}
+#endif
- at = new archetype;
+ loading_arch = at; // hack to tell parse_kv et al. to behave
+ bool parse_ok = at->parse_kv (f);
+ loading_arch = 0;
- at->clone.arch = at;
- }
+ if (!parse_ok)
+ goto fail;
- delete at;
-}
+ loading_arch = at; // hack to tell parse_kv et al. to behave
+ at->post_load_check ();
+ loading_arch = 0;
-/*
- * Reads the archetype file once more, and links all pointers between
- * archetypes.
- */
+ parts.push_back (at);
-void
-second_arch_pass (object_thawer & thawer)
-{
- char
- buf[MAX_BUF], *
- variable = buf, *argument, *cp;
- archetype *
- at = NULL, *other;
+ if (f.kw != KW_more)
+ break;
- 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 ((at = archetype::find (argument)) == NULL)
- LOG (llevError, "Warning: failed to find arch %s\n", argument);
- }
- else if (!strcmp ("other_arch", variable))
- {
- if (at != NULL && at->clone.other_arch == NULL)
- {
- if ((other = archetype::find (argument)) == NULL)
- LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
- else if (at != NULL)
- at->clone.other_arch = other;
- }
- }
- else if (!strcmp ("randomitems", variable))
- {
- if (at != NULL)
- {
- treasurelist *
- tl = find_treasurelist (argument);
+ f.next ();
- if (tl == NULL)
- LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
- else
- at->clone.randomitems = tl;
- }
+ if (f.kw != KW_object)
+ {
+ f.parse_error ("more object");
+ goto fail;
}
}
-}
-
-#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];
-
-#if TIME_ARCH_LOAD
- struct timeval
- tv1,
- tv2;
-#endif
-
- sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
- LOG (llevDebug, "Reading archetypes from %s:\n", filename);
{
- object_thawer
- thawer (filename);
-
- clear_archetable ();
- LOG (llevDebug, " arch-pass 1...\n");
- first_arch_pass (thawer);
- LOG (llevDebug, " done\n");
- }
+ archetype *new_head = parts.front ();
+ archetype *old_head = find (new_head->archname);
- init_archetable ();
- warn_archetypes = 1;
+ if (old_head && !old_head->is_head ())
+ {
+ LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
+ &new_head->archname, &old_head->archname);
+ goto fail;
+ }
+
+ // check that all archetypes belong to the same old object or are new
+ for (auto &&at : parts)
+ {
+ archetype *new_part = at;
+ archetype *old_part = find (new_part->archname);
+
+ if (old_part && old_part->head_ () != old_head)
+ {
+ LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
+ &new_part->archname, &((archetype *)old_part->head_ ())->archname);
+ goto fail;
+ }
+ }
+
+ // assemble new chain
+ new_head->max_x = new_head->x;
+
+ archetype *less = new_head;
+ for (auto &&p = parts.begin () + 1; p != parts.end (); ++p)
+ {
+ archetype *at = *p;
+
+ // some flags get inherited from the head (probably a lot more)
+ // doing it here doesn't feel too cozy, but it allows code
+ // to ignore head checks for these flags, which saves time
+ at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
+ at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
+ at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
+ at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
+
+ new_head->max_x = max (new_head->max_x, at->x);
+
+ at->head = new_head;
+ less->more = at;
+ less = at;
+ }
- {
- object_thawer
- thawer (filename);
+ postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
- LOG (llevDebug, " loading treasure...\n");
- load_treasures ();
- LOG (llevDebug, " done\n arch-pass 2...\n");
- second_arch_pass (thawer);
- LOG (llevDebug, " done\n");
-#ifdef DEBUG
- check_generators ();
-#endif
+ return new_head;
}
- LOG (llevDebug, " done\n");
-}
-
-/*
- * 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)
-{
- object *
- op;
+fail:
+ for (auto &&at : parts)
+ at->destroy ();
- if (at == NULL)
- {
- if (warn_archetypes)
- LOG (llevError, "Couldn't find archetype.\n");
-
- return NULL;
- }
-
- op = get_object ();
- copy_object (&at->clone, op);
- op->arch = at;
- op->instantiate ();
- return op;
+ return 0;
}
-/*
- * Creates an object. This function is called by get_archetype()
- * if it fails to find the appropriate archetype.
- * Thus get_archetype() will be guaranteed to always return
- * an object, and never NULL.
- */
-
-object *
-create_singularity (const char *name)
+void
+archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
{
- object * op;
- char buf[MAX_BUF];
-
- sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
- op = get_object ();
- op->name = op->name_pl = buf;
- SET_FLAG (op, FLAG_NO_PICK);
- return op;
+ ref = 0;
+ postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch)));
}
-/*
- * Finds which archetype matches the given name, and returns a new
- * object containing a copy of the archetype.
- */
-
-object *
-get_archetype (const char *name)
+void
+archetype::commit_load ()
{
- archetype *at = archetype::find (name);
+ // unlink old archetypes and link in new ones */
+ for (auto &&at : postponed_arch)
+ {
+ if (archetype *old = find (at->archname))
+ old->unlink ();
- if (!at)
- return create_singularity (name);
+ allarch.push_back (at);
- return arch_to_object (at);
-}
+ at->link ();
+ ++dirtycnt;
+ }
-/*
- * Hash-function used by the arch-hashtable.
- */
+ postponed_arch.clear ();
-unsigned long
-hasharch (const char *str, int tablesize)
-{
- unsigned long hash = 0;
- unsigned int i = 0;
- const char *p;
-
- /* use the one-at-a-time hash function, which supposedly is
- * better than the djb2-like one used by perl5.005, but
- * certainly is better then the bug used here before.
- * see http://burtleburtle.net/bob/hash/doobs.html
- */
- for (p = str; i < MAXSTRING && *p; p++, i++)
+ // now resolve arch references
+ for (auto &&p : postponed_arch_ref) // not yet C++17
{
- hash += *p;
- hash += hash << 10;
- hash ^= hash >> 6;
+ arch_ptr *ap = p.first;
+ archetype *at = find (p.second);
+
+ if (!at)
+ LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p.second);
+
+ *ap = at;
}
- hash += hash << 3;
- hash ^= hash >> 11;
- hash += hash << 15;
+ postponed_arch_ref.clear ();
- return hash % tablesize;
+ empty = find (shstr_empty_archetype);
}
-/*
- * Finds, using the hashtable, which archetype matches the given name.
- * returns a pointer to the found archetype, otherwise NULL.
- */
-
-archetype *
-archetype::find (const char *name)
+void
+archetype::gc ()
{
- if (!name)
- return 0;
-
-#if USE_UNORDERED_MAP
- AUTODECL (i, ht.find ((size_t) name));
+ int cnt = max (1, min (allarch.size () / 128, dirtycnt));
+ dirtycnt = max (0, dirtycnt - cnt);
- if (i == ht.end ())
- return 0;
- else
- return i->second;
-#endif
-
- archetype *at;
- unsigned long index;
-
- index = hasharch (name, ARCHTABLE);
- arch_search++;
- for (;;)
+ do
{
- at = arch_table[index];
+ static int idx;
- if (at == NULL)
- {
- if (warn_archetypes)
- LOG (llevError, "Couldn't find archetype %s\n", name);
+ if (idx >= allarch.size ())
+ if (idx)
+ idx = 0;
+ else
+ return;
- return NULL;
- }
+ archetype *at = allarch [idx];
- arch_cmp++;
+ if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
+ ++idx;
+ else
+ {
+ //LOG (llevDebug, "garbage collect arch %s", &at->archname);
+ assert (at->arch == at); // verify that refcnt == 1 is truly valid
+ allarch.erase (idx);
- if (!strcmp ((const char *) at->name, name))
- return at;
+ // break chain
+ for (object *op = at->head_ (); op; )
+ {
+ object *next = op->more;
+ op->head = 0;
+ op->more = 0;
+ op = next;
+ }
- if (++index >= ARCHTABLE)
- index = 0;
+ at->destroy ();
+ at->arch = 0;
+ }
}
+ while (--cnt);
}
-/*
- * Adds an archetype to the hashtable.
- */
-
-static void
-add_arch (archetype *at)
+object *
+archetype::instance ()
{
-#if USE_UNORDERED_MAP
- ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
-#endif
+ object *op = clone ();
+ op->instantiate ();
+ return op;
+}
- int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
+//+GPL
- for (;;)
- {
- if (arch_table[index] == NULL)
- {
- arch_table[index] = at;
- return;
- }
+/*
+ * Finds which archetype matches the given name, and returns a new
+ * object containing a copy of the archetype.
+ */
+object *
+archetype::get (const char *name)
+{
+ archetype *at = find (name);
- if (++index == ARCHTABLE)
- index = 0;
+ if (!at)
+ return create_singularity (name);
- if (index == org_index)
- fatal (ARCHTABLE_TOO_SMALL);
- }
+ return at->instance ();
}
/*
* Returns the first archetype using the given type.
* Used in treasure-generation.
*/
-
-archetype *
+static archetype *
type_to_archetype (int type)
{
- archetype *at;
-
- for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
- if (at->clone.type == type)
+ for_all_archetypes (at)
+ if (at->type == type && at->head_ () != at)
return at;
return 0;
@@ -831,29 +612,23 @@
* the given type.
* Used in treasure-generation.
*/
-
object *
clone_arch (int type)
{
- archetype *at;
- object *op = get_object ();
+ archetype *at = type_to_archetype (type);
- if ((at = type_to_archetype (type)) == NULL)
+ if (!at)
{
LOG (llevError, "Can't clone archetype %d\n", type);
- free_object (op);
- return NULL;
+ return 0;
}
- copy_object (&at->clone, op);
- op->instantiate ();
- return op;
+ return at->instance ();
}
/*
* member: make instance from class
*/
-
object *
object_create_arch (archetype *at)
{
@@ -861,9 +636,10 @@
while (at)
{
- op = arch_to_object (at);
- op->x = at->clone.x;
- op->y = at->clone.y;
+ op = at->instance ();
+
+ op->x = at->x;
+ op->y = at->y;
if (head)
op->head = head, prev->more = op;
@@ -872,9 +648,11 @@
head = op;
prev = op;
- at = at->more;
+ at = (archetype *)at->more;
}
- return (head);
+ return head;
}
+//-GPL
+