--- deliantra/server/common/arch.C 2006/09/14 18:13:01 1.19 +++ deliantra/server/common/arch.C 2007/04/13 07:26:29 1.45 @@ -1,43 +1,36 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The authors can be reached via e-mail at crossfire-devel@real-time.com -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The authors can be reached via e-mail at + */ #include -#include - #include -#include #include #include -/* IF set, does a little timing on the archetype load. */ -#define TIME_ARCH_LOAD 0 - -static void add_arch (archetype *at); +#include +#include -static archetype *arch_table[ARCHTABLE]; -int arch_cmp = 0; /* How many strcmp's */ -int arch_search = 0; /* How many searches */ int arch_init; /* True if doing arch initialization */ /* The naming of these functions is really poor - they are all @@ -48,20 +41,17 @@ * MSW 2003-04-29 */ -#if USE_UNORDERED_MAP // the hashtable typedef std::tr1::unordered_map < - std::size_t, - archetype *, - std::hash, - std::equal_to, - slice_allocator< std::pair > - true, + const char *, + arch_ptr, + str_hash, + str_equal, + slice_allocator< std::pair > > HT; -static HT ht; -#endif +static HT ht (5000); /** * GROS - This function retrieves an archetype given the name that appears @@ -77,18 +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; } /** @@ -99,19 +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 @@ -122,18 +101,13 @@ object * get_archetype_by_skill_name (const char *skill, int type) { - archetype * - at; + shstr_cmp skill_cmp (skill); - if (skill == NULL) - return NULL; + 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); - for (at = first_archetype; at != NULL; at = at->next) - { - if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) - return arch_to_object (at); - } - return NULL; + return 0; } /* similiar to above - this returns the first archetype @@ -146,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; } /** @@ -172,7 +142,6 @@ object * get_archetype_by_object_name (const char *name) { - archetype *at; char tmpname[MAX_BUF]; int i; @@ -181,12 +150,9 @@ 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); - } + if (archetype *at = find_archetype_by_object_name (tmpname)) + return arch_to_object (at); } return create_singularity (name); @@ -212,14 +178,10 @@ int item_matched_string (object *pl, object *op, const char *name) { - char * - cp, - local_name[MAX_BUF]; - int - count, - retval = 0; + 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, ",")) { @@ -279,7 +241,6 @@ retval = 14; else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) retval = 14; - /* Do substring checks, so things like 'Str+1' will match. * retval of these should perhaps be lower - they are lower * then the specific strcasecmp aboves, but still higher than @@ -291,16 +252,11 @@ retval = 12; else if (strstr (query_short_name (op), cp)) retval = 12; - /* Check against plural/non plural based on count. */ else if (count > 1 && !strcasecmp (cp, op->name_pl)) - { - retval = 6; - } + retval = 6; else if (count == 1 && !strcasecmp (op->name, cp)) - { - retval = 6; - } + retval = 6; /* base name matched - not bad */ else if (strcasecmp (cp, op->name) == 0 && !count) retval = 4; @@ -312,9 +268,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; } @@ -329,93 +287,37 @@ { /* 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 = find_archetype ("empty_archetype"); + empty_archetype = archetype::find ("empty_archetype"); /* init_blocksview();*/ } /* - * Stores debug-information about how efficient the hashtable - * used for archetypes has been in the static errmsg array. - */ - -void -arch_info (object *op) -{ - sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); - new_draw_info (NDI_BLACK, 0, op, errmsg); -} - -/* - * Initialise the hashtable used by the archetypes. - */ - -void -clear_archetable (void) -{ - memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *)); -} - -/* * An alternative way to init the hashtable which is slower, but _works_... */ - void init_archetable (void) { - archetype * - at; - LOG (llevDebug, " Setting up archetable...\n"); - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - add_arch (at); + for (archetype *at = first_archetype; at; at = at->next) + for (archetype *bt = at; bt; bt = bt->more) + bt->hash_add (); LOG (llevDebug, "done\n"); } -/* - * Dumps an archetype to debug-level output. - */ - -void -dump_arch (archetype *at) -{ - dump_object (&at->clone); -} - -/* - * Dumps _all_ archetypes to debug-level output. - * If you run crossfire with debug, and enter DM-mode, you can trigger - * this with the O key. - */ - -void -dump_all_archetypes (void) -{ - archetype * - at; - - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) - { - dump_arch (at); - fprintf (logfile, "%s\n", errmsg); - } -} - void free_all_archs (void) { - archetype * - at, * - next; - int - i = 0, f = 0; + archetype *at, *next; + int i = 0, f = 0; - for (at = first_archetype; at != NULL; at = next) + for (at = first_archetype; at; at = next) { if (at->more) next = at->more; @@ -427,118 +329,112 @@ i++; } + LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); } archetype::archetype () { - clear_object (&clone); /* to initial state other also */ - CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */ + 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 +} + +archetype * +archetype::read (object_thawer &f) +{ + assert (f.kw == KW_object); + + archetype *head = new archetype; + f.get (head->name); + + if (!head->clone.parse_kv (f)) + { + delete head; + return 0; + } + + 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; + } + + 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; + + prev = more; + } + + head->next = first_archetype; + first_archetype = head; + + return head; } /* * Reads/parses the archetype-file, and copies into a linked list * of archetype-structures. */ -void -first_arch_pass (object_thawer & fp) +static bool +first_arch_pass (object_thawer &f) { - archetype * - at, * - head = NULL, *last_more = NULL; - - at->clone.arch = first_archetype = at = new archetype; - - 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)); - - switch (i) + for (;;) + { + switch (f.kw) { - 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; + case KW_object: + if (!archetype::read (f)) + return false; + continue; - } + case KW_EOF: + return true; - at = new archetype; + default: + if (!f.parse_error ("archetypes file")) + return false; + } - at->clone.arch = at; + f.next (); } - - delete at; } /* * 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; + 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++; @@ -549,16 +445,17 @@ cp--; } } - if (!strcmp ("Object", variable)) + + if (!strcmp ("object", variable)) { - if ((at = find_archetype (argument)) == NULL) + 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 = find_archetype (argument)) == 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; @@ -566,10 +463,9 @@ } else if (!strcmp ("randomitems", variable)) { - if (at != NULL) + if (at) { - treasurelist * - tl = find_treasurelist (argument); + treasurelist *tl = find_treasurelist (argument); if (tl == NULL) LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); @@ -580,48 +476,28 @@ } } -#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]; - -#if TIME_ARCH_LOAD - struct timeval - tv1, - tv2; -#endif + char filename[MAX_BUF]; sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); LOG (llevDebug, "Reading archetypes from %s:\n", filename); { - object_thawer - thawer (filename); + object_thawer f (filename); + + f.next (); - clear_archetable (); 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"); } @@ -629,17 +505,14 @@ warn_archetypes = 1; { - object_thawer - thawer (filename); + object_thawer f (filename); LOG (llevDebug, " loading treasure...\n"); load_treasures (); - LOG (llevDebug, " done\n arch-pass 2...\n"); - second_arch_pass (thawer); LOG (llevDebug, " done\n"); -#ifdef DEBUG - check_generators (); -#endif + LOG (llevDebug, " arch-pass 2...\n"); + second_arch_pass (f); + LOG (llevDebug, " done\n"); } LOG (llevDebug, " done\n"); } @@ -648,14 +521,10 @@ * Creates and returns a new object which is a copy of the given archetype. * This function returns NULL on failure. */ - object * arch_to_object (archetype *at) { - object * - op; - - if (at == NULL) + if (!at) { if (warn_archetypes) LOG (llevError, "Couldn't find archetype.\n"); @@ -663,8 +532,7 @@ return NULL; } - op = get_object (); - copy_object (&at->clone, op); + object *op = at->clone.clone (); op->arch = at; op->instantiate (); return op; @@ -676,17 +544,14 @@ * Thus get_archetype() will be guaranteed to always return * an object, and never NULL. */ - object * create_singularity (const char *name) { - object * - op; - char - buf[MAX_BUF]; + object *op; + char buf[MAX_BUF]; sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); - op = get_object (); + op = object::create (); op->name = op->name_pl = buf; SET_FLAG (op, FLAG_NO_PICK); return op; @@ -696,15 +561,12 @@ * Finds which archetype matches the given name, and returns a new * object containing a copy of the archetype. */ - object * get_archetype (const char *name) { - archetype * - at; + archetype *at = archetype::find (name); - at = find_archetype (name); - if (at == NULL) + if (!at) return create_singularity (name); return arch_to_object (at); @@ -717,12 +579,9 @@ unsigned long hasharch (const char *str, int tablesize) { - unsigned long - hash = 0; - unsigned int - i = 0; - const char * - p; + 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 @@ -747,96 +606,49 @@ * Finds, using the hashtable, which archetype matches the given name. * returns a pointer to the found archetype, otherwise NULL. */ - archetype * -find_archetype (const char *name) +archetype::find (const char *name) { -#if USE_UNORDERED_MAP - name = shstr::find (name); - if (!name) return 0; - AUTODECL (i, ht.find ((size_t) name)); + AUTODECL (i, ht.find (name)); if (i == ht.end ()) return 0; else return i->second; -#endif - - archetype * - at; - unsigned long - index; - - if (name == NULL) - return (archetype *) NULL; - - index = hasharch (name, ARCHTABLE); - arch_search++; - for (;;) - { - at = arch_table[index]; - if (at == NULL) - { - if (warn_archetypes) - LOG (llevError, "Couldn't find archetype %s\n", name); - return NULL; - } - arch_cmp++; - if (!strcmp ((const char *) at->name, name)) - return at; - if (++index >= ARCHTABLE) - index = 0; - } } /* * Adds an archetype to the hashtable. */ - -static void -add_arch (archetype *at) +void +archetype::hash_add () { -#if USE_UNORDERED_MAP - ht.insert (std::make_pair ((size_t) (const char *) at->name, at)); -#endif - - int - index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index; - - for (;;) - { - if (arch_table[index] == NULL) - { - arch_table[index] = at; - return; - } - - if (++index == ARCHTABLE) - index = 0; + ht.insert (std::make_pair (name, this)); +} - if (index == org_index) - fatal (ARCHTABLE_TOO_SMALL); - } +void +archetype::hash_del () +{ + ht.erase (name); } /* * Returns the first archetype using the given type. * Used in treasure-generation. */ - archetype * type_to_archetype (int type) { - archetype * - at; + archetype *at; - for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) + for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more) if (at->clone.type == type) return at; - return NULL; + + return 0; } /* @@ -848,18 +660,15 @@ object * clone_arch (int type) { - archetype * - at; - object * - op = get_object (); + archetype *at; if ((at = type_to_archetype (type)) == NULL) { LOG (llevError, "Can't clone archetype %d\n", type); - free_object (op); - return NULL; + return 0; } - copy_object (&at->clone, op); + + object *op = at->clone.clone (); op->instantiate (); return op; } @@ -871,23 +680,24 @@ object * object_create_arch (archetype *at) { - object * - op, * - prev = NULL, *head = NULL; + object *op, *prev = 0, *head = 0; while (at) { op = arch_to_object (at); op->x = at->clone.x; op->y = at->clone.y; + if (head) op->head = head, prev->more = op; + if (!head) head = op; + prev = op; at = at->more; } + return (head); } -/*** end of arch.c ***/