--- deliantra/server/common/arch.C 2007/10/16 00:30:24 1.70 +++ deliantra/server/common/arch.C 2008/04/20 00:44:12 1.73 @@ -1,11 +1,11 @@ /* - * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * 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 * - * Crossfire TRT 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 3 of the License, or * (at your option) any later version. @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * The authors can be reached via e-mail to + * The authors can be reached via e-mail to */ #include @@ -30,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 - */ - archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing +archetype *archetype::empty; // the hashtable typedef std::tr1::unordered_map @@ -53,6 +46,11 @@ static HT ht (5000); 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 * during the game (for example, "writing pen" instead of "stylus"). @@ -278,7 +276,6 @@ archetype::archetype (const char *name) { - stub = true; arch = this; this->archname = this->name = this->name_pl = name; } @@ -325,45 +322,17 @@ } archetype * -archetype::get (const char *name) -{ - if (!name) - { - LOG (llevError, "null archetype requested\n"); - name = "(null)"; - } - - if (loading_arch && !strcmp (&loading_arch->archname, name)) - return loading_arch; - - archetype *at = find (name); - - if (!at) - { - at = new archetype (name); - at->link (); - } - - return at; -} - -archetype * archetype::read (object_thawer &f) { assert (f.kw == KW_object); std::vector parts; - coroapi::cede_to_tick_every (10); + coroapi::cede_to_tick (); for (;;) { - // 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 ()); + archetype *at = new archetype (f.get_str ()); f.next (); @@ -436,10 +405,6 @@ } } - // 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; @@ -467,13 +432,7 @@ less = at; } - // now activate it - for (auto (p, parts.begin ()); p != parts.end (); ++p) - { - archetype *at = *p; - at->stub = false; - at->link (); - } + postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ()); return new_head; } @@ -485,17 +444,44 @@ return 0; } -/* - * Initialize global archtype pointers: - */ void -init_archetype_pointers () +archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch) +{ + ref = 0; + postponed_arch_ref.push_back (std::pair(&ref, shstr (other_arch))); +} + +void +archetype::commit_load () { - 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"); + // 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); } /*