--- deliantra/server/common/arch.C 2007/02/02 21:50:43 1.38 +++ deliantra/server/common/arch.C 2007/03/01 11:14:45 1.44 @@ -67,17 +67,13 @@ archetype * find_archetype_by_object_name (const char *name) { - archetype *at; + shstr_cmp name_cmp (name); - if (name == NULL) - return (archetype *) NULL; + for (archetype *at = first_archetype; at; at = at->next) + if (at->clone.name == name_cmp) + return at; - for (at = first_archetype; at != NULL; at = at->next) - { - if (!strcmp (at->clone.name, name)) - return at; - } - return NULL; + return 0; } /** @@ -88,18 +84,13 @@ archetype * find_archetype_by_object_type_name (int type, const char *name) { - archetype *at; - - if (name == NULL) - return NULL; + shstr_cmp name_cmp (name); - for (at = first_archetype; at != NULL; at = at->next) - { - if (at->clone.type == type && strcmp (at->clone.name, name) == 0) - return at; - } + for (archetype *at = first_archetype; at; at = at->next) + if (at->clone.name == name_cmp && at->clone.type == type) + return at; - return NULL; + return 0; } /* This is a lot like the above function. Instead, we are trying to match @@ -110,12 +101,11 @@ object * get_archetype_by_skill_name (const char *skill, int type) { - archetype *at; + shstr_cmp skill_cmp (skill); - if (skill) - for (at = first_archetype; at; at = at->next) - if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) - return arch_to_object (at); + for (archetype *at = first_archetype; at; at = at->next) + if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) + return arch_to_object (at); return 0; } @@ -130,15 +120,11 @@ archetype * get_archetype_by_type_subtype (int type, int subtype) { - archetype * - at; + for (archetype *at = first_archetype; at; at = at->next) + if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) + return 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; - } - return NULL; + return 0; } /** @@ -156,7 +142,6 @@ object * get_archetype_by_object_name (const char *name) { - archetype *at; char tmpname[MAX_BUF]; int i; @@ -165,9 +150,8 @@ for (i = strlen (tmpname); i > 0; i--) { tmpname[i] = 0; - at = find_archetype_by_object_name (tmpname); - if (at) + if (archetype *at = find_archetype_by_object_name (tmpname)) return arch_to_object (at); } @@ -197,7 +181,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, ",")) { @@ -318,12 +302,11 @@ void init_archetable (void) { - archetype *at; - LOG (llevDebug, " Setting up archetable...\n"); - for (at = first_archetype; at; at = at->more ? at->more : at->next) - at->hash_add (); + for (archetype *at = first_archetype; at; at = at->next) + for (archetype *bt = at; bt; bt = bt->more) + bt->hash_add (); LOG (llevDebug, "done\n"); } @@ -352,98 +335,95 @@ archetype::archetype () { + 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... */ } archetype::~archetype () { + //TODO: nuke ->more's } -/* - * 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; + assert (f.kw == KW_object); - archetype *at = new archetype; - at->clone.arch = first_archetype = at; + archetype *head = new archetype; + f.get (head->name); - while (int i = load_object (fp, &at->clone, 0)) + if (!head->clone.parse_kv (f)) { - 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)); + delete head; + return 0; + } - 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; + for (archetype *prev = head; f.kw == KW_more; ) + { + f.next (); + + assert (f.kw == KW_object); + + archetype *more = new archetype; + f.get (more->name); + if (!more->clone.parse_kv (f)) + { + delete head; + return 0; } - at = new archetype; + 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; + + more->head = head; + more->clone.head = &head->clone; + prev->more = more; + prev->clone.more = &more->clone; - at->clone.arch = at; + prev = more; } - delete at; + head->next = first_archetype; + first_archetype = head; + + return head; +} + +/* + * Reads/parses the archetype-file, and copies into a linked list + * of archetype-structures. + */ +static bool +first_arch_pass (object_thawer &f) +{ + for (;;) + { + switch (f.kw) + { + case KW_object: + if (!archetype::read (f)) + return false; + continue; + + case KW_EOF: + return true; + + default: + if (!f.parse_error ("archetypes file")) + return false; + } + + f.next (); + } } /* * Reads the archetype file once more, and links all pointers between * archetypes. */ - void second_arch_pass (object_thawer & thawer) { @@ -454,6 +434,7 @@ { if (*buf == '#') continue; + if ((argument = strchr (buf, ' ')) != NULL) { *argument = '\0', argument++; @@ -464,7 +445,8 @@ cp--; } } - if (!strcmp ("Object", variable)) + + if (!strcmp ("object", variable)) { if ((at = archetype::find (argument)) == NULL) LOG (llevError, "Warning: failed to find arch %s\n", argument); @@ -481,7 +463,7 @@ } else if (!strcmp ("randomitems", variable)) { - if (at != NULL) + if (at) { treasurelist *tl = find_treasurelist (argument); @@ -522,11 +504,13 @@ LOG (llevDebug, "Reading archetypes from %s:\n", filename); { - object_thawer - thawer (filename); + object_thawer f (filename); + + f.next (); LOG (llevDebug, " arch-pass 1...\n"); - first_arch_pass (thawer); + if (!first_arch_pass (f)) + cleanup ("errors during first arch pass are fatal"); LOG (llevDebug, " done\n"); } @@ -534,14 +518,13 @@ warn_archetypes = 1; { - object_thawer - thawer (filename); + object_thawer f (filename); LOG (llevDebug, " loading treasure...\n"); load_treasures (); LOG (llevDebug, " done\n"); LOG (llevDebug, " arch-pass 2...\n"); - second_arch_pass (thawer); + second_arch_pass (f); LOG (llevDebug, " done\n"); #ifdef DEBUG check_generators (); @@ -557,9 +540,7 @@ object * arch_to_object (archetype *at) { - object *op; - - if (at == NULL) + if (!at) { if (warn_archetypes) LOG (llevError, "Couldn't find archetype.\n"); @@ -567,7 +548,7 @@ return NULL; } - op = at->clone.clone (); + object *op = at->clone.clone (); op->arch = at; op->instantiate (); return op;