--- deliantra/server/common/arch.C 2007/05/17 21:32:08 1.60 +++ deliantra/server/common/arch.C 2007/06/05 13:05:02 1.64 @@ -1,25 +1,25 @@ /* - * CrossFire, A Multiplayer game + * 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 @@ -70,8 +70,8 @@ { shstr_cmp name_cmp (name); - for (archetype *at = first_archetype; at; at = at->next) - if (at->clone.name == name_cmp) + for_all_archetypes (at) + if (at->archname == name_cmp) return at; return 0; @@ -87,8 +87,8 @@ { shstr_cmp name_cmp (name); - for (archetype *at = first_archetype; at; at = at->next) - if (at->clone.name == name_cmp && at->clone.type == type) + for_all_archetypes (at) + if (at->archname == name_cmp && at->type == type) return at; return 0; @@ -104,8 +104,8 @@ { shstr_cmp skill_cmp (skill); - for (archetype *at = first_archetype; at; at = at->next) - if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) + for_all_archetypes (at) + if (at->skill == skill_cmp && (type == -1 || type == at->type)) return arch_to_object (at); return 0; @@ -121,8 +121,8 @@ archetype * get_archetype_by_type_subtype (int type, int subtype) { - for (archetype *at = first_archetype; at; at = at->next) - if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) + for_all_archetypes (at) + if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype)) return at; return 0; @@ -277,45 +277,72 @@ return 0; } -archetype::archetype () +archetype::archetype (const char *name) { - 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... */ + stub = true; + arch = this; + this->archname = this->name = this->name_pl = name; } archetype::~archetype () { - //TODO: nuke ->more's + unlink (); } -static void -unlink (archetype *at) +void +archetype::link () { - if (at->head) - at = at->head; + ht.insert (std::make_pair (archname, this)); - // 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; - } + if (!archetypes.contains (this)) + archetypes.insert (this); } -// dire hack, need to rationalise void -overwrite (archetype *at, object *op) +archetype::unlink () +{ + ht.erase (archname); + if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D + if (archetypes.contains (this)) + archetypes.erase (this); +} + +/* + * Finds, using the hashtable, which archetype matches the given name. + * returns a pointer to the found archetype, otherwise NULL. + */ +archetype * +archetype::find (const char *name) +{ + if (!name) + return 0; + + auto (i, ht.find (name)); + + if (i == ht.end ()) + return 0; + else + return i->second; +} + +archetype * +archetype::get (const char *name) { - at->clone = *op; - at->clone.arch = at; + if (!name) + { + LOG (llevError, "null archetype requested\n"); + name = "(null)"; + } + + archetype *at = find (name); - at->clone.inv = op->inv; op->inv = 0; + if (!at) + { + at = new archetype (name); + at->link (); + } - op->destroy (); + return at; } archetype * @@ -325,37 +352,44 @@ loading_arch = true; // hack to tell parse_kv et al. to behave - typedef std::pair part; - std::vector parts; + std::vector parts; - coroapi::cede_to_tick_every (100); + coroapi::cede_to_tick_every (10); for (;;) { - object *op = object::create (); - archetype *at = get (f.get_str ()); - f.get (op->name); + // the archetype might have been referenced earlier + // so try to find an existing stub archetype first + archetype *at = find (f.get_str ()); + + if (!at || !at->stub) + at = new archetype (f.get_str ()); + f.next (); #if 0 + // implementing it here in the server does neither allow multiple inheritence + // nor does it cleanly "just override". it would allow use in map files, though, + // and other resource files dynamically laoded (as opposed to being preprocessed). + // not that any of this is relevant as of yet... 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 ()); + &at->archname, f.get_str ()); f.next (); } #endif - if (!op->parse_kv (f)) + if (!at->parse_kv (f)) goto fail; - op->post_load_check (); + at->post_load_check (); - parts.push_back (std::make_pair (at, op)); + parts.push_back (at); if (f.kw != KW_more) break; @@ -369,74 +403,72 @@ } } + loading_arch = false; + { - archetype *head = parts.front ().first; + auto (at, parts.begin ()); - // check that all archetypes belong to the same object or are heads - for (auto (p, parts.begin ()); p != parts.end (); ++p) + archetype *new_head = parts.front (); + archetype *old_head = find (new_head->archname); + + if (old_head && !old_head->is_head ()) { - archetype *at = p->first; + LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n", + &new_head->archname, &old_head->archname); + goto fail; + } - 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; - } + // check that all archetypes belong to the same old object or are new + for (auto (at, parts.begin ()); at != parts.end (); ++at) + { + archetype *new_part = *at; + archetype *old_part = find (new_part->archname); - if (at->next && at != head) + if (old_part && old_part->head_ () != old_head) { - LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name); + LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", + &new_part->archname, &((archetype *)old_part->head_ ())->archname); 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; + // deactivate existing archetype + for (archetype *at = old_head; at; at = (archetype *)at->more) + at->unlink (); + + // assemble new chain + new_head->min_x = new_head->max_x = new_head->x; + new_head->min_y = new_head->max_y = new_head->y; - // link into list of heads, if not already there - if (!head->linked) - { - head->linked = true; - head->next = first_archetype; - first_archetype = head; - } - - // reassemble new chain - archetype *prev = head; + archetype *less = new_head; for (auto (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; + archetype *at = *p; - at->head = head; - at->clone.head = &head->clone; - prev->more = at; - prev->clone.more = &at->clone; + if (at->x < new_head->min_x) new_head->min_x = at->x; + if (at->y < new_head->min_y) new_head->min_y = at->y; + if (at->x > new_head->max_x) new_head->max_x = at->x; + if (at->y > new_head->max_y) new_head->max_y = at->y; + + at->head = new_head; + less->more = at; + less = at; + } - prev = at; + // now activate it + for (auto (p, parts.begin ()); p != parts.end (); ++p) + { + archetype *at = *p; + at->stub = false; + at->link (); } - loading_arch = false; - return head; + return new_head; } fail: for (auto (p, parts.begin ()); p != parts.end (); ++p) - p->second->destroy (true); + (*p)->destroy (true); loading_arch = false; return 0; @@ -468,7 +500,7 @@ return 0; } - object *op = at->clone.clone (); + object *op = at->clone (); op->arch = at; op->instantiate (); @@ -510,68 +542,14 @@ } /* - * Finds, using the hashtable, which archetype matches the given name. - * returns a pointer to the found archetype, otherwise NULL. - */ -archetype * -archetype::find (const char *name) -{ - if (!name) - return 0; - - auto (i, ht.find (name)); - - if (i == ht.end ()) - return 0; - else - return i->second; -} - -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 = at->clone.name = at->clone.name_pl = name; - at->hash_add (); - } - - return at; -} - -/* - * Adds an archetype to the hashtable. - */ -void -archetype::hash_add () -{ - ht.insert (std::make_pair (name, this)); -} - -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) { - for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) - if (at->clone.type == type) + for_all_archetypes (at) + if (at->type == type && at->head_ () != at) return at; return 0; @@ -593,7 +571,7 @@ return 0; } - object *op = at->clone.clone (); + object *op = at->clone (); op->instantiate (); return op; } @@ -601,7 +579,6 @@ /* * member: make instance from class */ - object * object_create_arch (archetype *at) { @@ -610,8 +587,9 @@ while (at) { op = arch_to_object (at); - op->x = at->clone.x; - op->y = at->clone.y; + + op->x = at->x; + op->y = at->y; if (head) op->head = head, prev->more = op; @@ -620,9 +598,9 @@ head = op; prev = op; - at = at->more; + at = (archetype *)at->more; } - return (head); + return head; }