--- deliantra/server/common/arch.C 2007/04/19 19:24:25 1.57 +++ deliantra/server/common/arch.C 2008/04/20 00:44:12 1.73 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 + * Deliantra 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 + * the Free Software Foundation, either version 3 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 + * 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 + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #include @@ -31,15 +30,8 @@ #include #include -/* 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 - * return an object. Perhaps those should be called 'archob' functions - * to denote they return an object derived from the archetype. - * MSW 2003-04-29 - */ - -bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing +archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing +archetype *archetype::empty; // the hashtable typedef std::tr1::unordered_map @@ -52,7 +44,12 @@ > HT; static HT ht (5000); -static std::vector archetypes; +archvec archetypes; + +// the vector of other_arch references to be resolved +static std::vector< std::pair > postponed_arch_ref; +// the vector of loaded but not yet committed archetypes +static std::vector postponed_arch; /** * GROS - This function retrieves an archetype given the name that appears @@ -70,8 +67,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->name == name_cmp) return at; return 0; @@ -87,8 +84,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->name == name_cmp && at->type == type) return at; return 0; @@ -104,8 +101,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 +118,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; @@ -159,23 +156,23 @@ return create_singularity (name); } - /* This is a subset of the parse_id command. Basically, name can be - * a string seperated lists of things to match, with certain keywords. - * pl is the player (only needed to set count properly) - * op is the item we are trying to match. Calling function takes care - * of what action might need to be done and if it is valid - * (pickup, drop, etc.) Return NONZERO if we have a match. A higher - * value means a better match. 0 means no match. - * - * Brief outline of the procedure: - * We take apart the name variable into the individual components. - * cases for 'all' and unpaid are pretty obvious. - * Next, we check for a count (either specified in name, or in the - * player object.) - * If count is 1, make a quick check on the name. - * IF count is >1, we need to make plural name. Return if match. - * Last, make a check on the full name. - */ +/* This is a subset of the parse_id command. Basically, name can be + * a string seperated lists of things to match, with certain keywords. + * pl is the player (only needed to set count properly) + * op is the item we are trying to match. Calling function takes care + * of what action might need to be done and if it is valid + * (pickup, drop, etc.) Return NONZERO if we have a match. A higher + * value means a better match. 0 means no match. + * + * Brief outline of the procedure: + * We take apart the name variable into the individual components. + * cases for 'all' and unpaid are pretty obvious. + * Next, we check for a count (either specified in name, or in the + * player object.) + * If count is 1, make a quick check on the name. + * IF count is >1, we need to make plural name. Return if match. + * Last, make a check on the full name. + */ int item_matched_string (object *pl, object *op, const char *name) { @@ -277,45 +274,51 @@ 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... */ + 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 () { - at->clone = *op; - at->clone.arch = at; + ht.erase (archname); - at->clone.inv = op->inv; op->inv = 0; + if (archetypes.contains (this)) + archetypes.erase (this); +} - op->destroy (); +/* + * 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 * @@ -323,37 +326,45 @@ { assert (f.kw == KW_object); - loading_arch = true; // hack to tell parse_kv et al. to behave + std::vector parts; - typedef std::pair part; - std::vector parts; - - coroapi::cede_to_tick_every (100); + coroapi::cede_to_tick (); for (;;) { - object *op = object::create (); - archetype *at = get (f.get_str ()); - f.get (op->name); + archetype *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)) + loading_arch = at; // hack to tell parse_kv et al. to behave + bool parse_ok = at->parse_kv (f); + loading_arch = 0; + + if (!parse_ok) goto fail; - parts.push_back (std::make_pair (at, op)); + loading_arch = at; // hack to tell parse_kv et al. to behave + at->post_load_check (); + loading_arch = 0; + + parts.push_back (at); if (f.kw != KW_more) break; @@ -368,89 +379,109 @@ } { - 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; - - // link into list of heads, if not already there - if (!head->linked) - { - head->linked = true; - head->next = first_archetype; - first_archetype = head; - } + // 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; - // 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); + archetype *at = *p; - 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; - - at->head = head; - at->clone.head = &head->clone; - prev->more = at; - prev->clone.more = &at->clone; - - prev = at; + // some flags get inherited formt he head (probably a lot more) + // doing it here doesn't feel too cozy, but it allows code + // to ignore head checks for these flags, which saves time + at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; + at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; + at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; + at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; + + 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; } - loading_arch = false; - return head; + postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ()); + + 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; } -/* - * Initialize global archtype pointers: - */ void -init_archetype_pointers () +archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) { - 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"); + ref = 0; + postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch))); +} + +void +archetype::commit_load () +{ + // unlink old archetypes and link in new ones */ + for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) + { + archetype *at = *p; + + if (archetype *old = find (at->archname)) + old->unlink (); + + at->link (); + } + + postponed_arch.clear (); + + // now resolve arch references + for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p) + { + arch_ptr *ap = p->first; + archetype *at = find (p->second); + + if (!at) + LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second); + + *ap = at; + } + + postponed_arch_ref.clear (); + + empty = find (shstr_empty_archetype); } /* @@ -466,13 +497,19 @@ return 0; } - object *op = at->clone.clone (); + object *op = at->clone (); op->arch = at; op->instantiate (); return op; } +object * +archetype::instance () +{ + return arch_to_object (this); +} + /* * Creates an object. This function is called by get_archetype() * if it fails to find the appropriate archetype. @@ -482,13 +519,17 @@ object * create_singularity (const char *name) { - object *op; + LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); + + if (!strcmp (name, "bug")) + abort (); + char buf[MAX_BUF]; + sprintf (buf, "bug, please report (%s)", name); - sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); - op = object::create (); + object *op = get_archetype ("bug"); op->name = op->name_pl = buf; - SET_FLAG (op, FLAG_NO_PICK); + return op; } @@ -508,62 +549,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) -{ - 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; @@ -585,7 +578,7 @@ return 0; } - object *op = at->clone.clone (); + object *op = at->clone (); op->instantiate (); return op; } @@ -593,7 +586,6 @@ /* * member: make instance from class */ - object * object_create_arch (archetype *at) { @@ -602,8 +594,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; @@ -612,9 +605,9 @@ head = op; prev = op; - at = at->more; + at = (archetype *)at->more; } - return (head); + return head; }