--- deliantra/server/common/arch.C 2007/04/13 07:26:29 1.45 +++ deliantra/server/common/arch.C 2007/04/16 06:23:39 1.46 @@ -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,74 +277,51 @@ 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"); -/* init_blocksview();*/ + empty_archetype = archetype::find ("empty_archetype"); } -/* - * 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 (); + clone.arch = this; - 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... */ } -void -free_all_archs (void) +archetype::~archetype () { - archetype *at, *next; - int i = 0, f = 0; - - for (at = first_archetype; at; at = next) - { - if (at->more) - next = at->more; - else - next = at->next; - - delete - at; - - i++; - } - - LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); + //TODO: nuke ->more's } -archetype::archetype () +static void +unlink (archetype *at) { - clone.arch = this; + if (at->head) + at = at->head; - CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ - SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ + // 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; + } } -archetype::~archetype () +// dire hack, need to rationalise +void +overwrite (archetype *at, object *op) { - //TODO: nuke ->more's + at->clone = *op; + + at->clone.arch = at; + //TODO: inv et al. } archetype * @@ -351,30 +329,39 @@ { assert (f.kw == KW_object); - archetype *head = new archetype; - f.get (head->name); + archetype *head = get (f.get_str ()); + unlink (head); + object *op = object::create (); - if (!head->clone.parse_kv (f)) + if (!op->parse_kv (f)) { - delete head; + op->destroy (true); + // leak head return 0; } + overwrite (head, op); + op->destroy (); + for (archetype *prev = head; f.kw == KW_more; ) { f.next (); - assert (f.kw == KW_object); - archetype *more = new archetype; - f.get (more->name); + archetype *more = get (f.get_str ()); + unlink (more); + object *op = object::create (); - if (!more->clone.parse_kv (f)) + if (!op->parse_kv (f)) { - delete head; + op->destroy (true); + // leak head more* return 0; } + overwrite (more, op); + op->destroy (); + 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; @@ -386,8 +373,11 @@ prev = more; } - head->next = first_archetype; - first_archetype = head; + if (!head->next) + { + head->next = first_archetype; + first_archetype = head; + } return head; } @@ -397,15 +387,21 @@ * of archetype-structures. */ static bool -first_arch_pass (object_thawer &f) +load_archetypes (object_thawer &f) { for (;;) { switch (f.kw) { case KW_object: + loading_arch = true; if (!archetype::read (f)) - return false; + { + loading_arch = false; + return false; + } + + loading_arch = false; continue; case KW_EOF: @@ -421,62 +417,6 @@ } /* - * 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; - } - } - } -} - -/* * First initialises the archtype hash-table (init_archetable()). * Reads and parses the archetype file (with the first and second-pass * functions). @@ -490,31 +430,14 @@ 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 (); - 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)) + cleanup ("unable to load archetypes"); - init_archetable (); warn_archetypes = 1; - - { - object_thawer f (filename); - - 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"); - } - LOG (llevDebug, " done\n"); } /* @@ -620,6 +543,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. */ @@ -642,9 +580,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; @@ -656,7 +592,6 @@ * the given type. * Used in treasure-generation. */ - object * clone_arch (int type) {