--- deliantra/server/common/arch.C 2007/02/16 19:43:40 1.43 +++ deliantra/server/common/arch.C 2007/04/16 12:37:08 1.49 @@ -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 @@ -276,122 +277,140 @@ 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 () { - LOG (llevDebug, " Setting up archetable...\n"); - - for (archetype *at = first_archetype; at; at = at->next) - for (archetype *bt = at; bt; bt = bt->more) - bt->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) { - clone.arch = this; - - 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 () -{ - //TODO: nuke ->more's + op->destroy (); } -archetype * -archetype::read (object_thawer &f) +bool +archetype::load (object_thawer &f) { assert (f.kw == KW_object); - archetype *head = new archetype; - f.get (head->name); + typedef std::pair part; + std::vector parts; - if (!head->clone.parse_kv (f)) + for (;;) { - delete head; - return 0; - } + archetype *at = get (f.get_str ()); + object *op = object::create (); - for (archetype *prev = head; f.kw == KW_more; ) - { - f.next (); + if (!op->parse_kv (f)) + goto fail; - assert (f.kw == KW_object); + parts.push_back (std::make_pair (at, op)); - archetype *more = new archetype; - f.get (more->name); + if (f.kw != KW_more) + break; - if (!more->clone.parse_kv (f)) - { - delete head; - return 0; - } + f.next (); + assert (f.kw == KW_object); + } - assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face)); + { + archetype *head = parts.front ().first; - if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; - if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; + // check that all archetypes belong to the same object or are heads + for (AUTODECL (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->next) + { + head->next = first_archetype; + first_archetype = head; + } + + // reassemble new chain + archetype *prev = head; + for (AUTODECL (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; - more->head = head; - more->clone.head = &head->clone; - prev->more = more; - prev->clone.more = &more->clone; + prev = at; + } + } - prev = more; - } + return true; - head->next = first_archetype; - first_archetype = head; +fail: + for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) + p->second->destroy (true); - return head; + return false; } /* @@ -399,15 +418,21 @@ * of archetype-structures. */ static bool -first_arch_pass (object_thawer &f) +load_archetypes (object_thawer &f) { for (;;) { switch (f.kw) { case KW_object: - if (!archetype::read (f)) - return false; + loading_arch = true; + if (!archetype::load (f)) + { + loading_arch = false; + return false; + } + + loading_arch = false; continue; case KW_EOF: @@ -423,116 +448,32 @@ } /* - * Reads the archetype file once more, and links all pointers between - * archetypes. - */ -void -second_arch_pass (object_thawer & thawer) -{ - char buf[MAX_BUF], *variable = buf, *argument, *cp; - archetype *at = NULL, *other; - - 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 (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) - { - 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; - } - } - } -} - -#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) +bool +load_archetype_file (const char *filename) { - char filename[MAX_BUF]; - - sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); - LOG (llevDebug, "Reading archetypes from %s:\n", filename); + object_thawer f (filename); - { - object_thawer f (filename); + f.next (); - f.next (); + // make sure the next - long - step is only done after a tick + coroapi::wait_for_tick_begin (); - LOG (llevDebug, " arch-pass 1...\n"); - if (!first_arch_pass (f)) - cleanup ("errors during first arch pass are fatal"); - LOG (llevDebug, " done\n"); - } + if (!load_archetypes (f)) + return false; - init_archetable (); warn_archetypes = 1; - { - object_thawer f (filename); + empty_archetype = archetype::find ("empty_archetype"); + if (!empty_archetype) + return false; - LOG (llevDebug, " loading treasure...\n"); - load_treasures (); - LOG (llevDebug, " done\n"); - LOG (llevDebug, " arch-pass 2...\n"); - second_arch_pass (f); - LOG (llevDebug, " done\n"); -#ifdef DEBUG - check_generators (); -#endif - } - LOG (llevDebug, " done\n"); + coroapi::cede (); + + return true; } /* @@ -638,6 +579,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. */ @@ -660,9 +616,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; @@ -674,7 +628,6 @@ * the given type. * Used in treasure-generation. */ - object * clone_arch (int type) {