--- deliantra/server/common/arch.C 2006/09/10 16:00:23 1.16 +++ deliantra/server/common/arch.C 2006/09/16 22:24:12 1.24 @@ -1,9 +1,3 @@ - -/* - * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.16 2006/09/10 16:00:23 root Exp $"; - */ - /* CrossFire, A Multiplayer game for X-windows @@ -24,7 +18,7 @@ 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 + The authors can be reached via e-mail at */ #include @@ -56,14 +50,17 @@ #if USE_UNORDERED_MAP // the hashtable -typedef - std::tr1::unordered_map < -size_t, archetype *> - HT; - -static - HT - ht; +typedef std::tr1::unordered_map + < + std::size_t, + archetype *, + std::hash, + std::equal_to, + slice_allocator< std::pair > + true, + > HT; + +static HT ht; #endif /** @@ -80,8 +77,7 @@ archetype * find_archetype_by_object_name (const char *name) { - archetype * - at; + archetype *at; if (name == NULL) return (archetype *) NULL; @@ -102,8 +98,7 @@ archetype * find_archetype_by_object_type_name (int type, const char *name) { - archetype * - at; + archetype *at; if (name == NULL) return NULL; @@ -175,24 +170,21 @@ object * get_archetype_by_object_name (const char *name) { - archetype * - at; - char - tmpname[MAX_BUF]; - int - i; + archetype *at; + char tmpname[MAX_BUF]; + int i; + + assign (tmpname, name); - strncpy (tmpname, name, MAX_BUF - 1); - tmpname[MAX_BUF - 1] = 0; 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); - } + return arch_to_object (at); } + return create_singularity (name); } @@ -216,12 +208,8 @@ 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 */ @@ -283,7 +271,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 @@ -295,16 +282,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; @@ -316,9 +298,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; } @@ -333,10 +317,11 @@ { /* 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"); + empty_archetype = archetype::find ("empty_archetype"); /* init_blocksview();*/ } @@ -370,8 +355,7 @@ void init_archetable (void) { - archetype * - at; + archetype *at; LOG (llevDebug, " Setting up archetable...\n"); @@ -400,8 +384,7 @@ void dump_all_archetypes (void) { - archetype * - at; + archetype *at; for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) { @@ -413,11 +396,8 @@ void free_all_archs (void) { - archetype * - at, * - next; - int - i = 0, f = 0; + archetype *at, *next; + int i = 0, f = 0; for (at = first_archetype; at != NULL; at = next) { @@ -452,9 +432,7 @@ void first_arch_pass (object_thawer & fp) { - archetype * - at, * - head = NULL, *last_more = NULL; + archetype *at, *head = NULL, *last_more = NULL; at->clone.arch = first_archetype = at = new archetype; @@ -533,11 +511,8 @@ void second_arch_pass (object_thawer & thawer) { - char - buf[MAX_BUF], * - variable = buf, *argument, *cp; - archetype * - at = NULL, *other; + char buf[MAX_BUF], *variable = buf, *argument, *cp; + archetype *at = NULL, *other; while (fgets (buf, MAX_BUF, thawer) != NULL) { @@ -555,14 +530,14 @@ } if (!strcmp ("Object", variable)) { - if ((at = find_archetype (argument)) == NULL) + 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 = find_archetype (argument)) == 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; @@ -572,8 +547,7 @@ { if (at != NULL) { - treasurelist * - tl = find_treasurelist (argument); + treasurelist *tl = find_treasurelist (argument); if (tl == NULL) LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); @@ -588,8 +562,7 @@ void check_generators (void) { - archetype * - at; + archetype *at; for (at = first_archetype; at != NULL; at = at->next) if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL) @@ -607,8 +580,7 @@ void load_archetypes (void) { - char - filename[MAX_BUF]; + char filename[MAX_BUF]; #if TIME_ARCH_LOAD struct timeval @@ -656,8 +628,7 @@ object * arch_to_object (archetype *at) { - object * - op; + object *op; if (at == NULL) { @@ -684,10 +655,8 @@ object * create_singularity (const char *name) { - object * - op; - char - buf[MAX_BUF]; + object *op; + char buf[MAX_BUF]; sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); op = get_object (); @@ -704,11 +673,9 @@ 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); @@ -721,12 +688,9 @@ unsigned long hasharch (const char *str, int tablesize) { - unsigned long - hash = 0; - unsigned int - i = 0; - const char * - p; + 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 @@ -753,15 +717,13 @@ */ archetype * -find_archetype (const char *name) +archetype::find (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 USE_UNORDERED_MAP + AUTODECL (i, ht.find ((size_t) name)); if (i == ht.end ()) return 0; @@ -769,28 +731,28 @@ return i->second; #endif - archetype * - at; - unsigned long - index; - - if (name == NULL) - return (archetype *) NULL; + archetype *at; + unsigned long index; 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; } @@ -807,8 +769,7 @@ ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); #endif - int - index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; + int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; for (;;) { @@ -834,13 +795,13 @@ archetype * type_to_archetype (int type) { - archetype * - at; + archetype *at; - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) + for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) if (at->clone.type == type) return at; - return NULL; + + return 0; } /* @@ -852,10 +813,8 @@ object * clone_arch (int type) { - archetype * - at; - object * - op = get_object (); + archetype *at; + object *op = get_object (); if ((at = type_to_archetype (type)) == NULL) { @@ -863,6 +822,7 @@ free_object (op); return NULL; } + copy_object (&at->clone, op); op->instantiate (); return op; @@ -875,23 +835,24 @@ 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; + if (head) op->head = head, prev->more = op; + if (!head) head = op; + prev = op; at = at->more; } + return (head); } -/*** end of arch.c ***/