--- deliantra/server/common/arch.C 2007/04/16 12:37:08 1.49 +++ deliantra/server/common/arch.C 2007/06/04 12:19:08 1.62 @@ -1,25 +1,25 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 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. + * Crossfire TRT 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. + * 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 + * You should have received a copy of the GNU General Public License along + * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to */ #include @@ -52,7 +52,7 @@ > HT; static HT ht (5000); -static std::vector archetypes; +archvec archetypes; /** * GROS - This function retrieves an archetype given the name that appears @@ -311,55 +311,81 @@ overwrite (archetype *at, object *op) { at->clone = *op; - at->clone.arch = at; + at->clone.inv = op->inv; op->inv = 0; op->destroy (); } -bool -archetype::load (object_thawer &f) +archetype * +archetype::read (object_thawer &f) { assert (f.kw == KW_object); + loading_arch = true; // hack to tell parse_kv et al. to behave + typedef std::pair part; std::vector parts; + coroapi::cede_to_tick_every (100); + for (;;) { - archetype *at = get (f.get_str ()); object *op = object::create (); + archetype *at = get (f.get_str ()); + f.get (op->name); + f.next (); + +#if 0 + if (f.kw == KW_inherit) + { + if (archetype *at = find (f.get_str ())) + *op = at->clone; + else + LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", + &at->name, f.get_str ()); + + f.next (); + } +#endif if (!op->parse_kv (f)) goto fail; + op->post_load_check (); + parts.push_back (std::make_pair (at, op)); if (f.kw != KW_more) break; f.next (); - assert (f.kw == KW_object); + + if (f.kw != KW_object) + { + f.parse_error ("more object"); + goto fail; + } } { archetype *head = parts.front ().first; // check that all archetypes belong to the same object or are heads - for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) + 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); + LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->archname); goto fail; } if (at->next && at != head) { - LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name); + LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->archname); goto fail; } } @@ -379,15 +405,16 @@ head->tail_y = 0; // link into list of heads, if not already there - if (!head->next) + if (!head->linked) { + head->linked = true; head->next = first_archetype; first_archetype = head; } // reassemble new chain archetype *prev = head; - for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p) + for (auto (p, parts.begin () + 1); p != parts.end (); ++p) { archetype *at = p->first; overwrite (at, p->second); @@ -402,78 +429,30 @@ prev = at; } - } - return true; + loading_arch = false; + return head; + } fail: - for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p) + for (auto (p, parts.begin ()); p != parts.end (); ++p) p->second->destroy (true); - return false; -} - -/* - * Reads/parses the archetype-file, and copies into a linked list - * of archetype-structures. - */ -static bool -load_archetypes (object_thawer &f) -{ - for (;;) - { - switch (f.kw) - { - case KW_object: - loading_arch = true; - if (!archetype::load (f)) - { - loading_arch = false; - return false; - } - - loading_arch = false; - continue; - - case KW_EOF: - return true; - - default: - if (!f.parse_error ("archetypes file")) - return false; - } - - f.next (); - } + loading_arch = false; + return 0; } /* - * First initialises the archtype hash-table (init_archetable()). - * Reads and parses the archetype file (with the first and second-pass - * functions). + * Initialize global archtype pointers: */ -bool -load_archetype_file (const char *filename) +void +init_archetype_pointers () { - object_thawer f (filename); - - f.next (); - - // make sure the next - long - step is only done after a tick - coroapi::wait_for_tick_begin (); - - if (!load_archetypes (f)) - return false; - - warn_archetypes = 1; - + 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"); - if (!empty_archetype) - return false; - - coroapi::cede (); - - return true; } /* @@ -485,15 +464,14 @@ { if (!at) { - if (warn_archetypes) - LOG (llevError, "Couldn't find archetype.\n"); - - return NULL; + LOG (llevError, "Couldn't find archetype.\n"); + return 0; } object *op = at->clone.clone (); op->arch = at; op->instantiate (); + return op; } @@ -532,36 +510,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. */ @@ -571,7 +519,7 @@ if (!name) return 0; - AUTODECL (i, ht.find (name)); + auto (i, ht.find (name)); if (i == ht.end ()) return 0; @@ -582,12 +530,18 @@ archetype * archetype::get (const char *name) { + if (!name) + { + LOG (llevError, "null archetype requested\n"); + name = "(null)"; + } + archetype *at = find (name); if (!at) { - archetypes.push_back (at = new archetype); - at->name = name; + archetypes.insert (at = new archetype); + at->archname = at->clone.name = at->clone.name_pl = name; at->hash_add (); } @@ -600,13 +554,13 @@ void archetype::hash_add () { - ht.insert (std::make_pair (name, this)); + ht.insert (std::make_pair (archname, this)); } void archetype::hash_del () { - ht.erase (name); + ht.erase (archname); } /*