--- deliantra/server/common/arch.C 2006/09/12 19:20:06 1.17
+++ deliantra/server/common/arch.C 2007/09/04 18:20:35 1.69
@@ -1,44 +1,34 @@
/*
- 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 Crossfire TRT, the Roguelike Realtime MORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * Crossfire TRT 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.
+ *
+ * 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 .
+ *
+ * The authors can be reached via e-mail to
+ */
#include
-#include
-
#include
-#include
#include
#include
-/* IF set, does a little timing on the archetype load. */
-#define TIME_ARCH_LOAD 0
-
-static void add_arch (archetype *at);
-
-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 */
+#include
+#include
/* The naming of these functions is really poor - they are all
* pretty much named '.._arch_...', but they may more may not
@@ -48,17 +38,20 @@
* MSW 2003-04-29
*/
-#if USE_UNORDERED_MAP
+archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
+
// the hashtable
-typedef
- std::tr1::unordered_map <
-size_t, archetype *>
- HT;
-
-static
- HT
- ht;
-#endif
+typedef std::tr1::unordered_map
+ <
+ const char *,
+ arch_ptr,
+ str_hash,
+ str_equal,
+ slice_allocator< std::pair >
+ > HT;
+
+static HT ht (5000);
+archvec archetypes;
/**
* GROS - This function retrieves an archetype given the name that appears
@@ -74,18 +67,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;
}
/**
@@ -96,19 +84,13 @@
archetype *
find_archetype_by_object_type_name (int type, const char *name)
{
- archetype *
- at;
+ shstr_cmp name_cmp (name);
- if (name == NULL)
- return NULL;
-
- 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
@@ -119,18 +101,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 arch_to_object (at);
- 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
@@ -143,15 +120,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;
}
/**
@@ -169,7 +142,6 @@
object *
get_archetype_by_object_name (const char *name)
{
- archetype *at;
char tmpname[MAX_BUF];
int i;
@@ -178,45 +150,38 @@
for (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 arch_to_object (at);
}
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, ","))
{
@@ -276,7 +241,6 @@
retval = 14;
else if (!strncasecmp (cp, query_base_name (op, 1), 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
@@ -288,16 +252,11 @@
retval = 12;
else if (strstr (query_short_name (op), 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;
@@ -309,361 +268,253 @@
{
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.
- */
-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 = find_archetype ("empty_archetype");
-
-/* init_blocksview();*/
+ return 0;
}
-/*
- * 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);
+ stub = true;
+ 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);
+ ht.insert (std::make_pair (archname, this));
- LOG (llevDebug, "done\n");
+ if (!archetypes.contains (this))
+ archetypes.insert (this);
}
-/*
- * Dumps an archetype to debug-level output.
- */
-
void
-dump_arch (archetype *at)
+archetype::unlink ()
{
- dump_object (&at->clone);
+ ht.erase (archname);
+
+ if (archetypes.contains (this))
+ archetypes.erase (this);
}
/*
- * 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 *
+archetype::get (const char *name)
{
- archetype *
- at, *
- next;
- int
- i = 0, f = 0;
-
- for (at = first_archetype; at != NULL; at = next)
+ if (!name)
{
- if (at->more)
- next = at->more;
- else
- next = at->next;
+ LOG (llevError, "null archetype requested\n");
+ name = "(null)";
+ }
+
+ if (loading_arch && !strcmp (&loading_arch->archname, name))
+ return loading_arch;
- delete
- at;
+ archetype *at = find (name);
- i++;
+ if (!at)
+ {
+ at = new archetype (name);
+ at->link ();
}
- LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
-}
-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... */
+ return at;
}
-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_every (10);
- 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));
+ // the archetype might have been referenced earlier
+ // so try to find an existing stub archetype first
+ archetype *at = find (f.get_str ());
+
+ if (!at || !at->stub)
+ 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 laoded (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 = find_archetype (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 = find_archetype (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))
+ f.next ();
+
+ if (f.kw != KW_object)
{
- if (at != NULL)
- {
- treasurelist *
- tl = find_treasurelist (argument);
-
- if (tl == NULL)
- LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
- else
- at->clone.randomitems = tl;
- }
+ 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];
+ {
+ auto (at, parts.begin ());
-#if TIME_ARCH_LOAD
- struct timeval
- tv1,
- tv2;
-#endif
+ archetype *new_head = parts.front ();
+ archetype *old_head = find (new_head->archname);
- sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
- LOG (llevDebug, "Reading archetypes from %s:\n", filename);
+ 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.begin ()); at != parts.end (); ++at)
+ {
+ 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;
+ }
+ }
+
+ // deactivate existing archetype
+ for (archetype *at = old_head; at; at = (archetype *)at->more)
+ at->unlink ();
+
+ // assemble new chain
+ new_head->min_x = new_head->max_x = new_head->x;
+ new_head->min_y = new_head->max_y = new_head->y;
+
+ archetype *less = new_head;
+ for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
+ {
+ archetype *at = *p;
+
+ // some flags get inherited formt he 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];
+
+ if (at->x < new_head->min_x) new_head->min_x = at->x;
+ if (at->y < new_head->min_y) new_head->min_y = at->y;
+ if (at->x > new_head->max_x) new_head->max_x = at->x;
+ if (at->y > new_head->max_y) new_head->max_y = at->y;
+
+ at->head = new_head;
+ less->more = at;
+ less = at;
+ }
+
+ // now activate it
+ for (auto (p, parts.begin ()); p != parts.end (); ++p)
+ {
+ archetype *at = *p;
+ at->stub = false;
+ at->link ();
+ }
- {
- object_thawer
- thawer (filename);
-
- clear_archetable ();
- LOG (llevDebug, " arch-pass 1...\n");
- first_arch_pass (thawer);
- LOG (llevDebug, " done\n");
+ return new_head;
}
- init_archetable ();
- warn_archetypes = 1;
+fail:
+ for (auto (p, parts.begin ()); p != parts.end (); ++p)
+ (*p)->destroy (true);
- {
- object_thawer
- thawer (filename);
+ return 0;
+}
- 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
- }
- LOG (llevDebug, " done\n");
+/*
+ * Initialize global archtype pointers:
+ */
+void
+init_archetype_pointers ()
+{
+ ring_arch = archetype::find ("ring");
+ amulet_arch = archetype::find ("amulet");
+ staff_arch = archetype::find ("staff");
+ crown_arch = archetype::find ("crown");
+ empty_archetype = archetype::find ("empty_archetype");
}
/*
* 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;
-
- if (at == NULL)
+ if (!at)
{
- if (warn_archetypes)
- LOG (llevError, "Couldn't find archetype.\n");
-
- return NULL;
+ LOG (llevError, "Couldn't find archetype.\n");
+ return 0;
}
- op = get_object ();
- copy_object (&at->clone, op);
+ object *op = at->clone ();
op->arch = at;
op->instantiate ();
+
return op;
}
@@ -673,19 +524,20 @@
* Thus get_archetype() will be guaranteed to always return
* an object, and never NULL.
*/
-
object *
create_singularity (const char *name)
{
- object *
- op;
- char
- buf[MAX_BUF];
+ 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);
- sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
- op = get_object ();
+ object *op = get_archetype ("bug");
op->name = op->name_pl = buf;
- SET_FLAG (op, FLAG_NO_PICK);
+
return op;
}
@@ -693,147 +545,29 @@
* Finds which archetype matches the given name, and returns a new
* object containing a copy of the archetype.
*/
-
object *
get_archetype (const char *name)
{
- archetype *
- at;
+ archetype *at = archetype::find (name);
- at = find_archetype (name);
- if (at == NULL)
+ if (!at)
return create_singularity (name);
return arch_to_object (at);
}
/*
- * Hash-function used by the arch-hashtable.
- */
-
-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++)
- {
- hash += *p;
- hash += hash << 10;
- hash ^= hash >> 6;
- }
-
- hash += hash << 3;
- hash ^= hash >> 11;
- hash += hash << 15;
-
- return hash % tablesize;
-}
-
-/*
- * Finds, using the hashtable, which archetype matches the given name.
- * returns a pointer to the found archetype, otherwise NULL.
- */
-
-archetype *
-find_archetype (const char *name)
-{
-#if USE_UNORDERED_MAP
- name = shstr::find (name);
-
- if (!name)
- return 0;
-
- HT::const_iterator i = ht.find ((size_t) name);
-
- if (i == ht.end ())
- return 0;
- else
- return i->second;
-#endif
-
- archetype *
- at;
- unsigned long
- index;
-
- if (name == NULL)
- return (archetype *) NULL;
-
- index = hasharch (name, ARCHTABLE);
- arch_search++;
- for (;;)
- {
- at = arch_table[index];
- if (at == NULL)
- {
- if (warn_archetypes)
- LOG (llevError, "Couldn't find archetype %s\n", name);
- return NULL;
- }
- arch_cmp++;
- if (!strcmp ((const char *) at->name, name))
- return at;
- if (++index >= ARCHTABLE)
- index = 0;
- }
-}
-
-/*
- * Adds an archetype to the hashtable.
- */
-
-static void
-add_arch (archetype *at)
-{
-#if USE_UNORDERED_MAP
- ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
-#endif
-
- int
- index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
-
- for (;;)
- {
- if (arch_table[index] == NULL)
- {
- arch_table[index] = at;
- return;
- }
-
- if (++index == ARCHTABLE)
- index = 0;
-
- if (index == org_index)
- fatal (ARCHTABLE_TOO_SMALL);
- }
-}
-
-/*
* Returns the first archetype using the given type.
* Used in treasure-generation.
*/
-
archetype *
type_to_archetype (int type)
{
- archetype *
- at;
-
- for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
- if (at->clone.type == type)
+ for_all_archetypes (at)
+ if (at->type == type && at->head_ () != at)
return at;
- return NULL;
+
+ return 0;
}
/*
@@ -841,22 +575,18 @@
* the given type.
* Used in treasure-generation.
*/
-
object *
clone_arch (int type)
{
- archetype *
- at;
- object *
- op = get_object ();
+ archetype *at;
if ((at = type_to_archetype (type)) == NULL)
{
LOG (llevError, "Can't clone archetype %d\n", type);
- free_object (op);
- return NULL;
+ return 0;
}
- copy_object (&at->clone, op);
+
+ object *op = at->clone ();
op->instantiate ();
return op;
}
@@ -864,27 +594,28 @@
/*
* member: make instance from class
*/
-
object *
object_create_arch (archetype *at)
{
- object *
- op, *
- prev = NULL, *head = NULL;
+ object *op, *prev = 0, *head = 0;
while (at)
{
op = arch_to_object (at);
- op->x = at->clone.x;
- op->y = at->clone.y;
+
+ op->x = at->x;
+ op->y = at->y;
+
if (head)
op->head = head, prev->more = op;
+
if (!head)
head = op;
+
prev = op;
- at = at->more;
+ at = (archetype *)at->more;
}
- return (head);
+
+ return head;
}
-/*** end of arch.c ***/