--- deliantra/server/common/arch.C 2007/02/02 22:07:51 1.39 +++ deliantra/server/common/arch.C 2007/04/17 18:59:05 1.54 @@ -31,8 +31,6 @@ #include #include -int arch_init; /* True if doing arch initialization */ - /* The naming of these functions is really poor - they are all * pretty much named '.._arch_...', but they may more may not * return archetypes. Some make the arch_to_object call, and thus @@ -41,6 +39,8 @@ * 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 < @@ -52,6 +52,7 @@ > HT; static HT ht (5000); +static std::vector archetypes; /** * GROS - This function retrieves an archetype given the name that appears @@ -181,7 +182,7 @@ char *cp, local_name[MAX_BUF]; int count, retval = 0; - strcpy (local_name, name); /* strtok is destructive to name */ + assign (local_name, name); /* strtok is destructive to name */ for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) { @@ -276,262 +277,167 @@ 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. - */ - -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 = archetype::find ("empty_archetype"); +archetype::archetype () +{ + clone.arch = this; -/* init_blocksview();*/ + CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ + SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ } -/* - * An alternative way to init the hashtable which is slower, but _works_... - */ -void -init_archetable (void) +archetype::~archetype () { - archetype *at; - - LOG (llevDebug, " Setting up archetable...\n"); - - for (at = first_archetype; at; at = at->more ? at->more : at->next) - at->hash_add (); - - LOG (llevDebug, "done\n"); + //TODO: nuke ->more's } -void -free_all_archs (void) +static void +unlink (archetype *at) { - archetype *at, *next; - int i = 0, f = 0; + if (at->head) + at = at->head; - for (at = first_archetype; at; at = next) + // destroy this archetype's link, making singletons out of its parts + while (at) { - if (at->more) - next = at->more; - else - next = at->next; - - delete - at; - - i++; + archetype *more = at->more; + at->clone.destroy_inv (); + at->head = at->more = 0; + at = more; } - - LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); } -archetype::archetype () +// dire hack, need to rationalise +void +overwrite (archetype *at, object *op) { - CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ - SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ -} + at->clone = *op; + + at->clone.arch = at; + at->clone.inv = op->inv; op->inv = 0; -archetype::~archetype () -{ + op->destroy (); } -/* - * Reads/parses the archetype-file, and copies into a linked list - * of archetype-structures. - */ -void -first_arch_pass (object_thawer & fp) +archetype * +archetype::read (object_thawer &f) { - archetype *head = 0, *last_more = 0; - - archetype *at = new archetype; - at->clone.arch = first_archetype = at; + assert (f.kw == KW_object); - while (int i = load_object (fp, &at->clone, 0)) - { - 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, &at->clone.body_info, sizeof (at->clone.body_info)); + loading_arch = true; // hack to tell parse_kv et al. to behave - 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; + typedef std::pair part; + std::vector parts; - } + coroapi::cede_to_tick_every (100); - at = new archetype; + for (;;) + { + object *op = object::create (); + archetype *at = get (f.get_str ()); + f.get (op->name); + f.next (); - at->clone.arch = at; - } + if (!op->parse_kv (f)) + goto fail; - delete at; -} + parts.push_back (std::make_pair (at, op)); -/* - * Reads the archetype file once more, and links all pointers between - * archetypes. - */ + if (f.kw != KW_more) + break; -void -second_arch_pass (object_thawer & thawer) -{ - char buf[MAX_BUF], *variable = buf, *argument, *cp; - archetype *at = NULL, *other; + f.next (); - 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 = archetype::find (argument)) == NULL) - LOG (llevError, "Warning: failed to find arch %s\n", argument); - } - else if (!strcmp ("other_arch", variable)) + if (f.kw != KW_object) { - if (at != NULL && at->clone.other_arch == 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; - } - } - 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; - } + f.parse_error ("more object"); + goto fail; } } -} -#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); -} -#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) -{ - char filename[MAX_BUF]; + { + archetype *head = parts.front ().first; - sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); - LOG (llevDebug, "Reading archetypes from %s:\n", filename); + // 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; + } + } + + // sever chain of existing head object + for (archetype *more, *at = head; at; at = more) + { + more = at->more; + + at->head = 0; + at->more = 0; + } + + // 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; - { - object_thawer - thawer (filename); + prev = at; + } - LOG (llevDebug, " arch-pass 1...\n"); - first_arch_pass (thawer); - LOG (llevDebug, " done\n"); + loading_arch = false; + return head; } - init_archetable (); - warn_archetypes = 1; +fail: + for (auto (p, parts.begin ()); p != parts.end (); ++p) + p->second->destroy (true); - { - object_thawer - thawer (filename); + loading_arch = false; + return 0; +} - LOG (llevDebug, " loading treasure...\n"); - load_treasures (); - LOG (llevDebug, " done\n"); - LOG (llevDebug, " arch-pass 2...\n"); - second_arch_pass (thawer); - LOG (llevDebug, " done\n"); -#ifdef DEBUG - check_generators (); -#endif - } - LOG (llevDebug, " done\n"); +/* + * Initialize global archtype pointers: + */ +void +init_archetype_pointers () +{ + ring_arch = archetype::find ("ring"); + amulet_arch = archetype::find ("amulet"); + staff_arch = archetype::find ("staff"); + crown_arch = archetype::find ("crown"); + empty_archetype = archetype::find ("empty_archetype"); } /* @@ -541,19 +447,16 @@ object * arch_to_object (archetype *at) { - object *op; - - if (at == NULL) + if (!at) { - if (warn_archetypes) - LOG (llevError, "Couldn't find archetype.\n"); - - return NULL; + LOG (llevError, "Couldn't find archetype.\n"); + return 0; } - op = at->clone.clone (); + object *op = at->clone.clone (); op->arch = at; op->instantiate (); + return op; } @@ -592,36 +495,6 @@ } /* - * Hash-function used by the arch-hashtable. - */ - -unsigned long -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; -} - -/* * Finds, using the hashtable, which archetype matches the given name. * returns a pointer to the found archetype, otherwise NULL. */ @@ -631,7 +504,7 @@ if (!name) return 0; - AUTODECL (i, ht.find (name)); + auto (i, ht.find (name)); if (i == ht.end ()) return 0; @@ -639,6 +512,21 @@ return i->second; } +archetype * +archetype::get (const char *name) +{ + archetype *at = find (name); + + if (!at) + { + archetypes.push_back (at = new archetype); + at->name = name; + at->hash_add (); + } + + return at; +} + /* * Adds an archetype to the hashtable. */ @@ -661,9 +549,7 @@ archetype * type_to_archetype (int type) { - archetype *at; - - for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) + for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) if (at->clone.type == type) return at; @@ -675,7 +561,6 @@ * the given type. * Used in treasure-generation. */ - object * clone_arch (int type) {