--- deliantra/server/common/arch.C 2009/10/27 01:38:39 1.91 +++ deliantra/server/common/arch.C 2009/11/06 12:27:05 1.93 @@ -53,6 +53,28 @@ // the vector of loaded but not yet committed archetypes static std::vector postponed_arch; +//+GPL + +/* + * Creates an object. This function is called by get_archetype() + * if it fails to find the appropriate archetype. + * Thus get_archetype() will be guaranteed to always return + * an object, and never NULL. + */ +object * +create_singularity (const char *name) +{ + LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); + + if (!strcmp (name, "bug")) + abort (); + + object *op = archetype::get (shstr_bug); + op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name); + + return op; +} + /** * GROS - This function retrieves an archetype given the name that appears * during the game (for example, "writing pen" instead of "stylus"). @@ -278,6 +300,8 @@ return 0; } +//-GPL + archetype::archetype (const char *name) { arch = this; @@ -543,25 +567,7 @@ return op; } -/* - * Creates an object. This function is called by get_archetype() - * if it fails to find the appropriate archetype. - * Thus get_archetype() will be guaranteed to always return - * an object, and never NULL. - */ -object * -create_singularity (const char *name) -{ - LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); - - if (!strcmp (name, "bug")) - abort (); - - object *op = archetype::get (shstr_bug); - op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name); - - return op; -} +//+GPL /* * Finds which archetype matches the given name, and returns a new @@ -645,3 +651,5 @@ return head; } +//-GPL +