--- deliantra/server/common/arch.C 2006/09/03 22:45:55 1.11 +++ deliantra/server/common/arch.C 2007/04/17 10:06:32 1.52 @@ -1,47 +1,35 @@ /* - * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.11 2006/09/03 22:45:55 root Exp $"; + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * 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, 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 -*/ +#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 @@ -51,6 +39,21 @@ * MSW 2003-04-29 */ +bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing + +// the hashtable +typedef std::tr1::unordered_map + < + const char *, + arch_ptr, + str_hash, + str_equal, + slice_allocator< std::pair > + > HT; + +static HT ht (5000); +static std::vector archetypes; + /** * GROS - This function retrieves an archetype given the name that appears * during the game (for example, "writing pen" instead of "stylus"). @@ -62,17 +65,16 @@ * Return value: * - the archetype found or null if nothing was found. */ -archetype *find_archetype_by_object_name(const char *name) { - archetype *at; +archetype * +find_archetype_by_object_name (const char *name) +{ + shstr_cmp name_cmp (name); - if (name == NULL) - return (archetype *) NULL; + for (archetype *at = first_archetype; at; at = at->next) + if (at->clone.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; } /** @@ -80,18 +82,16 @@ * the game. It is basically the same as find_archetype_by_object_name() * except that it considers only items of the given type. */ -archetype *find_archetype_by_object_type_name(int type, const char *name) { - archetype *at; - - if (name == NULL) - return NULL; +archetype * +find_archetype_by_object_type_name (int type, const char *name) +{ + 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 (archetype *at = first_archetype; at; at = at->next) + if (at->clone.name == name_cmp && at->clone.type == type) + return at; - return NULL; + return 0; } /* This is a lot like the above function. Instead, we are trying to match @@ -99,18 +99,16 @@ * against (eg, to only match against skills or only skill objects for example). * If type is -1, ew don't match on type. */ -object *get_archetype_by_skill_name(const char *skill, int type) { - archetype *at; +object * +get_archetype_by_skill_name (const char *skill, int type) +{ + shstr_cmp skill_cmp (skill); - if (skill == NULL) - return NULL; + for (archetype *at = first_archetype; at; at = at->next) + if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.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 @@ -120,15 +118,14 @@ * subtypes are known to be unique for a particular type * (eg, skills) */ -archetype *get_archetype_by_type_subtype(int type, int subtype) { - archetype *at; +archetype * +get_archetype_by_type_subtype (int type, int subtype) +{ + for (archetype *at = first_archetype; at; at = at->next) + if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.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; } /** @@ -143,22 +140,23 @@ * doesn't malloc 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; - - 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); - } +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--) + { + tmpname[i] = 0; + + if (archetype *at = find_archetype_by_object_name (tmpname)) + return arch_to_object (at); } - return create_singularity(name); + + return create_singularity (name); } /* This is a subset of the parse_id command. Basically, name can be @@ -178,374 +176,322 @@ * 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) +int +item_matched_string (object *pl, object *op, const char *name) { - 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,",")) { - while (cp[0]==' ') ++cp; /* get rid of spaces */ - - /* LOG(llevDebug,"Trying to match %s\n", cp);*/ - /* All is a very generic match - low match value */ - if (!strcmp(cp,"all")) return 1; - - /* 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; - - if (!strcmp(cp,"unlocked") && !QUERY_FLAG(op, FLAG_INV_LOCKED)) - return 2; - - /* Allow for things like '100 arrows' */ - if ((count=atoi(cp))!=0) { - cp=strchr(cp, ' '); - while (cp && cp[0]==' ') ++cp; /* get rid of spaces */ - } - else { - if (pl->type==PLAYER) - count=pl->contr->count; - else - count = 0; - } + char *cp, local_name[MAX_BUF]; + int count, retval = 0; - if (!cp || cp[0]=='\0' || count<0) return 0; + assign (local_name, name); /* strtok is destructive to name */ + for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) + { + while (cp[0] == ' ') + ++cp; /* get rid of spaces */ - /* The code here should go from highest retval to lowest. That - * is because of the 'else' handling - we don't want to match on - * something and set a low retval, even though it may match a higher retcal - * later. So keep it in descending order here, so we try for the best - * match first, and work downward. - */ - if (!strcasecmp(cp,query_name(op))) retval=20; - else if (!strcasecmp(cp,query_short_name(op))) retval=18; - else if (!strcasecmp(cp,query_base_name(op,0))) retval=16; - else if (!strcasecmp(cp,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))) 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 - * some other match criteria. - */ - else if (strstr(query_base_name(op,1), cp)) retval = 12; - else if (strstr(query_base_name(op,0), cp)) 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; - } - else if (count==1 && !strcasecmp(op->name,cp)) { - retval=6; + /* LOG(llevDebug,"Trying to match %s\n", cp); */ + /* All is a very generic match - low match value */ + if (!strcmp (cp, "all")) + return 1; + + /* 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; + + if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) + return 2; + + /* Allow for things like '100 arrows' */ + if ((count = atoi (cp)) != 0) + { + cp = strchr (cp, ' '); + while (cp && cp[0] == ' ') + ++cp; /* get rid of spaces */ } - /* 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)) retval = 3; - - if (retval) { - if (pl->type == PLAYER) - pl->contr->count=count; - return retval; + else + { + if (pl->type == PLAYER) + count = pl->contr->count; + else + count = 0; } - } - 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. - */ + if (!cp || cp[0] == '\0' || count < 0) + return 0; -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();*/ -} -/* - * Stores debug-information about how efficient the hashtable - * used for archetypes has been in the static errmsg array. - */ + /* The code here should go from highest retval to lowest. That + * is because of the 'else' handling - we don't want to match on + * something and set a low retval, even though it may match a higher retcal + * later. So keep it in descending order here, so we try for the best + * match first, and work downward. + */ + if (!strcasecmp (cp, query_name (op))) + retval = 20; + else if (!strcasecmp (cp, query_short_name (op))) + retval = 18; + else if (!strcasecmp (cp, query_base_name (op, 0))) + retval = 16; + else if (!strcasecmp (cp, 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))) + 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 + * some other match criteria. + */ + else if (strstr (query_base_name (op, 1), cp)) + retval = 12; + else if (strstr (query_base_name (op, 0), cp)) + 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; + else if (count == 1 && !strcasecmp (op->name, cp)) + 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)) + retval = 3; -void arch_info(object *op) { - sprintf(errmsg,"%d searches and %d strcmp()'s",arch_search,arch_cmp); - new_draw_info(NDI_BLACK, 0, op,errmsg); -} + if (retval) + { + if (pl->type == PLAYER) + pl->contr->count = count; -/* - * Initialise the hashtable used by the archetypes. - */ + return retval; + } + } -void clear_archetable(void) { - memset((void *) arch_table,0,ARCHTABLE*sizeof(archetype *)); + return 0; } -/* - * An alternative way to init the hashtable which is slower, but _works_... - */ +archetype::archetype () +{ + clone.arch = this; -void init_archetable(void) { - 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"); + CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ + SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ } -/* - * Dumps an archetype to debug-level output. - */ - -void dump_arch(archetype *at) { - dump_object(&at->clone); +archetype::~archetype () +{ + //TODO: nuke ->more's } -/* - * 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. - */ +static void +unlink (archetype *at) +{ + if (at->head) + at = at->head; -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); - } + // destroy this archetype's link, making singletons out of its parts + while (at) + { + archetype *more = at->more; + at->clone.destroy_inv (); + at->head = at->more = 0; + at = more; + } } -void free_all_archs(void) +// dire hack, need to rationalise +void +overwrite (archetype *at, object *op) { - 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; + at->clone = *op; + + at->clone.arch = at; + at->clone.inv = op->inv; op->inv = 0; - delete at; - i++; - } - LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); + op->destroy (); } -/* - * Allocates, initialises and returns the pointer to an archetype structure. - */ -// TODO: should become constructor -archetype *get_archetype_struct(void) { - archetype *arch; +bool +archetype::load (object_thawer &f) +{ + assert (f.kw == KW_object); - arch = new archetype; + typedef std::pair part; + std::vector parts; - 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... */ + coroapi::cede_to_tick_every (100); - return arch; -} + for (;;) + { + archetype *at = get (f.get_str ()); + object *op = object::create (); -/* - * Reads/parses the archetype-file, and copies into a linked list - * of archetype-structures. - */ -void first_arch_pass(object_thawer &fp) { - object *op; - archetype *at,*head=NULL,*last_more=NULL; - int i; - - op=get_object(); - op->arch=first_archetype=at=get_archetype_struct(); - - while((i=load_object(fp,op,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. - * 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, &op->body_info, sizeof(op->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; -#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; + if (!op->parse_kv (f)) + goto fail; - } + parts.push_back (std::make_pair (at, op)); - at=get_archetype_struct(); - clear_object(op); - op->arch=at; + if (f.kw != KW_more) + break; + + f.next (); + assert (f.kw == KW_object); } - delete at; - free_object(op); -} + { + archetype *head = parts.front ().first; -/* - * Reads the archetype file once more, and links all pointers between - * archetypes. - */ + // check that all archetypes belong to the same object or are heads + for (auto (p, parts.begin ()); p != parts.end (); ++p) + { + archetype *at = p->first; + + if (at->head != head && at->head) + { + LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); + goto fail; + } + + if (at->next && at != head) + { + LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name); + goto fail; + } + } -void second_arch_pass(object_thawer &thawer) { - char buf[MAX_BUF],*variable=buf,*argument,*cp; - archetype *at=NULL,*other; + // sever chain of existing head object + for (archetype *more, *at = head; at; at = more) + { + more = at->more; - 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; + at->head = 0; + at->more = 0; } - } else if(!strcmp("randomitems",variable)) { - 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; + + // replace/update head + overwrite (head, parts.front ().second); + head->tail_x = 0; + head->tail_y = 0; + + // link into list of heads, if not already there + if (!head->linked) + { + head->linked = true; + head->next = first_archetype; + first_archetype = head; + } + + // reassemble new chain + archetype *prev = head; + for (auto (p, parts.begin () + 1); p != parts.end (); ++p) + { + archetype *at = p->first; + overwrite (at, p->second); + + 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; + + at->head = head; + at->clone.head = &head->clone; + prev->more = at; + prev->clone.more = &at->clone; + + prev = at; } - } } + + return true; + +fail: + for (auto (p, parts.begin ()); p != parts.end (); ++p) + p->second->destroy (true); + + return false; } -#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); +/* + * Reads/parses the archetype-file, and copies into a linked list + * of archetype-structures. + */ +static bool +load_archetypes (object_thawer &f) +{ + for (;;) + { + switch (f.kw) + { + case KW_object: + loading_arch = true; + if (!archetype::load (f)) + { + loading_arch = false; + return false; + } + + loading_arch = false; + continue; + + case KW_EOF: + return true; + + default: + if (!f.parse_error ("archetypes file")) + return false; + } + + f.next (); + } } -#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) +bool +load_archetype_file (const char *filename) { - char filename[MAX_BUF]; - int comp; -#if TIME_ARCH_LOAD - struct timeval tv1, tv2; -#endif + object_thawer f (filename); - sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); - LOG (llevDebug, "Reading archetypes from %s:\n", filename); + f.next (); - { - object_thawer thawer (filename); + if (!load_archetypes (f)) + return false; - clear_archetable (); - LOG (llevDebug, " arch-pass 1...\n"); - first_arch_pass (thawer); - LOG (llevDebug, " done\n"); + warn_archetypes = 1; - init_archetable (); - warn_archetypes = 1; - } - - { - object_thawer thawer (filename); + empty_archetype = archetype::find ("empty_archetype"); + if (!empty_archetype) + return false; - 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"); + return true; } /* * 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) +{ + if (!at) + { + if (warn_archetypes) + LOG (llevError, "Couldn't find archetype.\n"); -object *arch_to_object(archetype *at) { - 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); + return NULL; + } + + object *op = at->clone.clone (); + op->arch = at; op->instantiate (); - op->arch=at; return op; } @@ -555,14 +501,16 @@ * Thus get_archetype() will be guaranteed to always return * an object, and never NULL. */ - -object *create_singularity(const char *name) { +object * +create_singularity (const char *name) +{ object *op; char buf[MAX_BUF]; - sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); - op = get_object(); + + sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); + op = object::create (); op->name = op->name_pl = buf; - SET_FLAG(op,FLAG_NO_PICK); + SET_FLAG (op, FLAG_NO_PICK); return op; } @@ -570,104 +518,77 @@ * 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; - at = find_archetype(name); - if (at == NULL) - return create_singularity(name); - return arch_to_object(at); -} - -/* - * Hash-function used by the arch-hashtable. - */ - -unsigned long -hasharch(const char *str, int tablesize) +object * +get_archetype (const char *name) { - unsigned long hash = 0; - unsigned int i = 0; - const char *p; + archetype *at = archetype::find (name); - /* 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; + if (!at) + return create_singularity (name); - return hash % tablesize; + return arch_to_object (at); } /* * 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) +{ + if (!name) + return 0; -archetype *find_archetype(const char *name) { - archetype *at; - unsigned long index; + auto (i, ht.find (name)); - if (name == NULL) - return (archetype *) NULL; + if (i == ht.end ()) + return 0; + else + return i->second; +} - 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; +archetype * +archetype::get (const char *name) +{ + archetype *at = find (name); + + if (!at) + { + archetypes.push_back (at = new archetype); + at->name = name; + at->hash_add (); } - arch_cmp++; - if (!strcmp((const char *)at->name,name)) - return at; - if(++index>=ARCHTABLE) - index=0; - } + + return at; } /* * Adds an archetype to the hashtable. */ +void +archetype::hash_add () +{ + ht.insert (std::make_pair (name, this)); +} -static void add_arch(archetype *at) { - 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); - } +void +archetype::hash_del () +{ + ht.erase (name); } /* * 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) +archetype * +type_to_archetype (int type) +{ + for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) + if (at->clone.type == type) return at; - return NULL; + + return 0; } /* @@ -675,17 +596,18 @@ * the given type. * Used in treasure-generation. */ - -object *clone_arch(int type) { +object * +clone_arch (int type) +{ 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); - return NULL; - } - copy_object(&at->clone,op); + if ((at = type_to_archetype (type)) == NULL) + { + LOG (llevError, "Can't clone archetype %d\n", type); + return 0; + } + + object *op = at->clone.clone (); op->instantiate (); return op; } @@ -694,22 +616,27 @@ * member: make instance from class */ -object *object_create_arch (archetype * at) +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; + 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); + + return (head); } -/*** end of arch.c ***/