--- deliantra/server/common/arch.C 2006/09/04 17:16:19 1.12 +++ deliantra/server/common/arch.C 2006/09/12 19:20:06 1.17 @@ -1,9 +1,4 @@ /* - * static char *rcsid_arch_c = - * "$Id: arch.C,v 1.12 2006/09/04 17:16:19 root Exp $"; - */ - -/* CrossFire, A Multiplayer game for X-windows Copyright (C) 2002 Mark Wedel & Crossfire Development Team @@ -38,7 +33,7 @@ /* IF set, does a little timing on the archetype load. */ #define TIME_ARCH_LOAD 0 -static void add_arch (archetype * at); +static void add_arch (archetype *at); static archetype *arch_table[ARCHTABLE]; int arch_cmp = 0; /* How many strcmp's */ @@ -55,9 +50,14 @@ #if USE_UNORDERED_MAP // the hashtable -typedef std::tr1::unordered_map HT; - -static HT ht; +typedef + std::tr1::unordered_map < +size_t, archetype *> + HT; + +static + HT + ht; #endif /** @@ -74,7 +74,8 @@ archetype * find_archetype_by_object_name (const char *name) { - archetype *at; + archetype * + at; if (name == NULL) return (archetype *) NULL; @@ -95,7 +96,8 @@ archetype * find_archetype_by_object_type_name (int type, const char *name) { - archetype *at; + archetype * + at; if (name == NULL) return NULL; @@ -167,24 +169,23 @@ 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 create_singularity (name); } @@ -206,7 +207,7 @@ * 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, @@ -214,6 +215,7 @@ int count, retval = 0; + strcpy (local_name, name); /* strtok is destructive to name */ for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) @@ -328,6 +330,7 @@ load_archetypes (); arch_init = 0; empty_archetype = find_archetype ("empty_archetype"); + /* init_blocksview();*/ } @@ -337,7 +340,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); @@ -360,7 +363,8 @@ void init_archetable (void) { - archetype *at; + archetype * + at; LOG (llevDebug, " Setting up archetable...\n"); @@ -375,7 +379,7 @@ */ void -dump_arch (archetype * at) +dump_arch (archetype *at) { dump_object (&at->clone); } @@ -391,6 +395,7 @@ { archetype * at; + for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) { dump_arch (at); @@ -416,28 +421,21 @@ 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 +445,14 @@ 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 (); + at->clone.arch = first_archetype = at = new archetype; - 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 +460,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; } /* @@ -577,6 +567,7 @@ { treasurelist * tl = find_treasurelist (argument); + if (tl == NULL) LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); else @@ -592,6 +583,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); @@ -610,8 +602,7 @@ { char filename[MAX_BUF]; - int - comp; + #if TIME_ARCH_LOAD struct timeval tv1, @@ -656,20 +647,23 @@ */ object * -arch_to_object (archetype * at) +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); - op->instantiate (); op->arch = at; + op->instantiate (); return op; } @@ -687,6 +681,7 @@ op; char buf[MAX_BUF]; + sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); op = get_object (); op->name = op->name_pl = buf; @@ -704,9 +699,11 @@ { archetype * at; + at = find_archetype (name); if (at == NULL) return create_singularity (name); + return arch_to_object (at); } @@ -757,7 +754,7 @@ if (!name) return 0; - HT::const_iterator i = ht.find ((size_t)name); + HT::const_iterator i = ht.find ((size_t) name); if (i == ht.end ()) return 0; @@ -765,8 +762,10 @@ return i->second; #endif - archetype *at; - unsigned long index; + archetype * + at; + unsigned long + index; if (name == NULL) return (archetype *) NULL; @@ -798,10 +797,11 @@ add_arch (archetype *at) { #if USE_UNORDERED_MAP - ht.insert (std::make_pair ((size_t)(const char *)at->name, at)); + 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 (;;) { @@ -866,7 +866,7 @@ */ object * -object_create_arch (archetype * at) +object_create_arch (archetype *at) { object * op, *