--- deliantra/server/common/arch.C 2006/08/13 17:16:00 1.1 +++ deliantra/server/common/arch.C 2006/09/03 22:45:55 1.11 @@ -1,6 +1,6 @@ /* * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.1 2006/08/13 17:16:00 elmex Exp $"; + * "$Id: arch.C,v 1.11 2006/09/03 22:45:55 root Exp $"; */ /* @@ -31,6 +31,8 @@ #include #include +#include + /* IF set, does a little timing on the archetype load. */ #define TIME_ARCH_LOAD 0 @@ -64,11 +66,11 @@ archetype *at; if (name == NULL) - return (archetype *) NULL; + return (archetype *) NULL; for(at = first_archetype;at!=NULL;at=at->next) { - if (!strcmp(at->clone.name, name)) - return at; + if (!strcmp(at->clone.name, name)) + return at; } return NULL; } @@ -101,12 +103,12 @@ archetype *at; if (skill == NULL) - return NULL; + return NULL; 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); + if ( ((type == -1) || (type == at->clone.type)) && + (!strcmp(at->clone.skill, skill))) + return arch_to_object(at); } return NULL; } @@ -122,9 +124,9 @@ archetype *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; + if ( ((type == -1) || (type == at->clone.type)) && + (subtype == -1 || subtype == at->clone.subtype)) + return at; } return NULL; } @@ -149,36 +151,16 @@ strncpy(tmpname,name,MAX_BUF-1); tmpname[MAX_BUF-1] = 0; for(i=strlen(tmpname); i>0; i--) { - tmpname[i] = 0; + 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); } - /* GROS - find_best_weapon_used_match and item_matched_string moved there */ -object *find_best_weapon_used_match(object *pl, const char *params) - { - object *tmp, *best=NULL; - int match_val=0,tmpmatch; - - for (tmp=pl->inv; tmp; tmp=tmp->below) { - if (tmp->invisible) continue; - if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val) - { - if ((QUERY_FLAG(tmp, FLAG_APPLIED))&&(tmp->type==WEAPON)) - { - match_val=tmpmatch; - best=tmp; - }; - } - } - return best; - } - /* 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) @@ -203,78 +185,78 @@ 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 */ + 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; + } + + if (!cp || cp[0]=='\0' || count<0) return 0; + - /* 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; - } - - if (!cp || cp[0]=='\0' || count<0) return 0; - - - /* 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; - - if (retval) { - if (pl->type == PLAYER) - pl->contr->count=count; - return retval; - } + /* 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; + + if (retval) { + if (pl->type == PLAYER) + pl->contr->count=count; + return retval; + } } return 0; } @@ -353,17 +335,11 @@ int i=0,f=0; for (at=first_archetype; at!=NULL; at=next) { - if (at->more) next=at->more; - else next=at->next; - if (at->name) free_string(at->name); - if (at->clone.name) free_string(at->clone.name); - if (at->clone.name_pl) free_string(at->clone.name_pl); - if (at->clone.title) free_string(at->clone.title); - if (at->clone.race) free_string(at->clone.race); - if (at->clone.slaying) free_string(at->clone.slaying); - if (at->clone.msg) free_string(at->clone.msg); - free(at); - i++; + if (at->more) next=at->more; + else next=at->next; + + delete at; + i++; } LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); } @@ -371,27 +347,16 @@ /* * Allocates, initialises and returns the pointer to an archetype structure. */ - +// TODO: should become constructor archetype *get_archetype_struct(void) { archetype *arch; - arch=(archetype *)CALLOC(1,sizeof(archetype)); - if(arch==NULL) - fatal(OUT_OF_MEMORY); - arch->next=NULL; - arch->name=NULL; - arch->clone.other_arch=NULL; - arch->clone.name=NULL; - arch->clone.name_pl=NULL; - arch->clone.title=NULL; - arch->clone.race=NULL; - arch->clone.slaying=NULL; - arch->clone.msg=NULL; - 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... */ - arch->head=NULL; - arch->more=NULL; + 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... */ + return arch; } @@ -399,72 +364,72 @@ * Reads/parses the archetype-file, and copies into a linked list * of archetype-structures. */ -void first_arch_pass(FILE *fp) { +void first_arch_pass(object_thawer &fp) { object *op; archetype *at,*head=NULL,*last_more=NULL; - int i,first=2; + int i; op=get_object(); op->arch=first_archetype=at=get_archetype_struct(); - while((i=load_object(fp,op,first,0))) { - first=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; + 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); + 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=get_archetype_struct(); - clear_object(op); - op->arch=at; + 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; } - free(at); + + delete at; free_object(op); } @@ -473,20 +438,20 @@ * archetypes. */ -void second_arch_pass(FILE *fp) { +void second_arch_pass(object_thawer &thawer) { char buf[MAX_BUF],*variable=buf,*argument,*cp; archetype *at=NULL,*other; - while(fgets(buf,MAX_BUF,fp)!=NULL) { + 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--; - } + *argument='\0',argument++; + cp = argument + strlen(argument)-1; + while (isspace(*cp)) { + *cp='\0'; + cp--; + } } if(!strcmp("Object",variable)) { if((at=find_archetype(argument))==NULL) @@ -502,7 +467,7 @@ 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); + LOG(llevError,"Failed to link treasure to arch (%s): %s\n", &at->name, argument); else at->clone.randomitems=tl; } @@ -515,8 +480,7 @@ 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); + LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", &at->name); } #endif @@ -527,56 +491,43 @@ * Then initialises treasures by calling load_treasures(). */ -void load_archetypes(void) { - FILE *fp; - char filename[MAX_BUF]; - int comp; +void +load_archetypes (void) +{ + char filename[MAX_BUF]; + int comp; #if TIME_ARCH_LOAD - struct timeval tv1,tv2; + struct timeval tv1, tv2; #endif - sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); - LOG(llevDebug,"Reading archetypes from %s...\n",filename); - if((fp=open_and_uncompress(filename,0,&comp))==NULL) { - LOG(llevError," Can't open archetype file.\n"); - return; - } - clear_archetable(); - LOG(llevDebug," arch-pass 1...\n"); -#if TIME_ARCH_LOAD - GETTIMEOFDAY(&tv1); -#endif - first_arch_pass(fp); -#if TIME_ARCH_LOAD - { int sec, usec; - GETTIMEOFDAY(&tv2); - sec = tv2.tv_sec - tv1.tv_sec; - usec = tv2.tv_usec - tv1.tv_usec; - if (usec<0) { usec +=1000000; sec--;} - LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec); - } -#endif + sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); + LOG (llevDebug, "Reading archetypes from %s:\n", filename); - LOG(llevDebug," done\n"); - init_archetable(); - warn_archetypes=1; + { + object_thawer thawer (filename); - /* do a close and reopen instead of a rewind - necessary in case the - * file has been compressed. - */ - close_and_delete(fp, comp); - fp=open_and_uncompress(filename,0,&comp); + clear_archetable (); + LOG (llevDebug, " arch-pass 1...\n"); + first_arch_pass (thawer); + LOG (llevDebug, " done\n"); - LOG(llevDebug," loading treasure...\n"); - load_treasures(); - LOG(llevDebug," done\n arch-pass 2...\n"); - second_arch_pass(fp); - LOG(llevDebug," done\n"); + init_archetable (); + warn_archetypes = 1; + } + + { + object_thawer thawer (filename); + + 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(); + check_generators (); #endif - close_and_delete(fp, comp); - LOG(llevDebug," done\n"); + } + LOG (llevDebug, " done\n"); } /* @@ -593,6 +544,7 @@ } op=get_object(); copy_object(&at->clone,op); + op->instantiate (); op->arch=at; return op; } @@ -609,8 +561,7 @@ char buf[MAX_BUF]; sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); op = get_object(); - op->name = add_string(buf); - op->name_pl = add_string(buf); + op->name = op->name_pl = buf; SET_FLAG(op,FLAG_NO_PICK); return op; } @@ -633,25 +584,29 @@ */ unsigned long -hasharch(const char *str, int tablesize) { - unsigned long hash = 0; - 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; +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; } /* @@ -676,7 +631,7 @@ return NULL; } arch_cmp++; - if (!strcmp(at->name,name)) + if (!strcmp((const char *)at->name,name)) return at; if(++index>=ARCHTABLE) index=0; @@ -688,7 +643,7 @@ */ static void add_arch(archetype *at) { - int index=hasharch(at->name, ARCHTABLE),org_index=index; + int index=hasharch((const char *)at->name, ARCHTABLE),org_index=index; for(;;) { if(arch_table[index]==NULL) { arch_table[index]=at; @@ -731,6 +686,7 @@ return NULL; } copy_object(&at->clone,op); + op->instantiate (); return op; }