--- deliantra/server/common/arch.C 2006/09/07 09:37:11 1.13 +++ deliantra/server/common/arch.C 2006/12/12 20:53:02 1.28 @@ -1,9 +1,4 @@ /* - * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.13 2006/09/07 09:37:11 pippijn Exp $"; - */ - -/* CrossFire, A Multiplayer game for X-windows Copyright (C) 2002 Mark Wedel & Crossfire Development Team @@ -23,24 +18,22 @@ 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 -#include - #include -#include #include #include -/* IF set, does a little timing on the archetype load. */ -#define TIME_ARCH_LOAD 0 +#define USE_UNORDERED_MAP 0 -static void add_arch (archetype * at); +#if USE_UNORDERED_MAP +# include +# include +#endif -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 */ @@ -55,9 +48,19 @@ #if USE_UNORDERED_MAP // the hashtable -typedef std::tr1::unordered_map HT; +typedef std::tr1::unordered_map + < + std::size_t, + arch_ptr, + std::tr1::hash, + std::equal_to, + slice_allocator< std::pair > + true, + > HT; static HT ht; +#else +static arch_ptr arch_table[ARCHTABLE]; #endif /** @@ -167,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); } @@ -206,14 +206,11 @@ * Last, make a check on the full name. */ int -item_matched_string (object * pl, object * op, const char *name) +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 */ for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) @@ -274,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 @@ -286,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; @@ -307,9 +298,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; } @@ -324,10 +317,12 @@ { /* 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();*/ } @@ -337,7 +332,7 @@ */ void -arch_info (object * op) +arch_info (object *op) { sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); new_draw_info (NDI_BLACK, 0, op, errmsg); @@ -365,47 +360,16 @@ LOG (llevDebug, " Setting up archetable...\n"); for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - add_arch (at); + at->hash_add (); LOG (llevDebug, "done\n"); } -/* - * Dumps an archetype to debug-level output. - */ - -void -dump_arch (archetype * at) -{ - dump_object (&at->clone); -} - -/* - * 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. - */ - -void -dump_all_archetypes (void) -{ - archetype * - at; - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - { - dump_arch (at); - fprintf (logfile, "%s\n", errmsg); - } -} - 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) { @@ -416,28 +380,22 @@ delete at; + i++; } + LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); } -/* - * Allocates, initialises and returns the pointer to an archetype structure. - */ -// TODO: should become constructor -archetype * -get_archetype_struct (void) +archetype::archetype () { - archetype * - arch; - - arch = new archetype; - - clear_object (&arch->clone); /* to initial state other also */ - CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ - SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */ + 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 arch; +archetype::~archetype () +{ } /* @@ -447,20 +405,13 @@ void first_arch_pass (object_thawer & fp) { - object * - op; - archetype * - at, * - head = NULL, *last_more = NULL; - int - i; + archetype *head = 0, *last_more = 0; - op = get_object (); - op->arch = first_archetype = at = get_archetype_struct (); + archetype *at = new archetype; + at->clone.arch = first_archetype = at; - while ((i = load_object (fp, op, 0))) + while (int i = load_object (fp, &at->clone, 0)) { - copy_object (op, &at->clone); 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. @@ -468,64 +419,62 @@ * values for the body_used info, so when items are created * for it, they can be properly equipped. */ - memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info)); + memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info)); 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; + 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); + 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; + 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; } - at = get_archetype_struct (); - clear_object (op); - op->arch = at; + at = new archetype; + + at->clone.arch = at; } - delete - at; - free_object (op); + delete at; } /* @@ -536,11 +485,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) { @@ -558,14 +504,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; @@ -575,8 +521,8 @@ { 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); else @@ -590,8 +536,8 @@ 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) LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name); @@ -608,13 +554,7 @@ void load_archetypes (void) { - char - filename[MAX_BUF]; -#if TIME_ARCH_LOAD - struct timeval - tv1, - tv2; -#endif + char filename[MAX_BUF]; sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); LOG (llevDebug, "Reading archetypes from %s:\n", filename); @@ -654,20 +594,22 @@ */ object * -arch_to_object (archetype * at) +arch_to_object (archetype *at) { - object * - op; + object *op; + if (at == NULL) { if (warn_archetypes) LOG (llevError, "Couldn't find archetype.\n"); + return NULL; } + op = get_object (); copy_object (&at->clone, op); - op->instantiate (); op->arch = at; + op->instantiate (); return op; } @@ -681,10 +623,9 @@ 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 (); op->name = op->name_pl = buf; @@ -700,11 +641,11 @@ object * get_archetype (const char *name) { - archetype * - at; - at = find_archetype (name); - if (at == NULL) + archetype *at = archetype::find (name); + + if (!at) return create_singularity (name); + return arch_to_object (at); } @@ -715,12 +656,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 @@ -747,15 +685,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; @@ -766,23 +702,25 @@ 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; } @@ -791,22 +729,21 @@ /* * Adds an archetype to the hashtable. */ - -static void -add_arch (archetype *at) +void +archetype::hash_add () { #if USE_UNORDERED_MAP - ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); -#endif + ht.insert (std::make_pair ((size_t) (const char *) name, this)); +#else - int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; + int index = hasharch ((const char *) name, ARCHTABLE), org_index = index; for (;;) { - if (arch_table[index] == NULL) + if (!arch_table[index]) { - arch_table[index] = at; - return; + arch_table[index] = this; + break; } if (++index == ARCHTABLE) @@ -815,6 +752,33 @@ if (index == org_index) fatal (ARCHTABLE_TOO_SMALL); } +#endif +} + +void +archetype::hash_del () +{ +#if USE_UNORDERED_MAP +# error remove this from HT +#else + + int index = hasharch ((const char *) name, ARCHTABLE), org_index = index; + + for (;;) + { + if (arch_table[index] == this) + { + arch_table[index] = 0; + break; + } + + if (++index == ARCHTABLE) + index = 0; + + if (index == org_index) + break; + } +#endif } /* @@ -825,13 +789,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; } /* @@ -843,17 +807,16 @@ object * clone_arch (int type) { - archetype * - at; - object * - op = get_object (); + archetype *at; + object *op = get_object (); if ((at = type_to_archetype (type)) == NULL) { LOG (llevError, "Can't clone archetype %d\n", type); - free_object (op); + op->destroy (0); return NULL; } + copy_object (&at->clone, op); op->instantiate (); return op; @@ -864,25 +827,26 @@ */ object * -object_create_arch (archetype * at) +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 ***/