--- deliantra/server/common/holy.C 2009/10/12 14:00:57 1.18 +++ deliantra/server/common/holy.C 2011/04/23 04:56:45 1.26 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * 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 + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -30,23 +30,8 @@ #include #include -/* init_gods() - this takes a look at all of the archetypes to find - * the objects which correspond to the GODS (type GOD) */ - -void -init_gods (void) -{ - LOG (llevDebug, "Initialising gods...\n"); - - for_all_archetypes (at) - if (at->type == GOD) - add_god_to_list (at); - - LOG (llevDebug, "done.\n"); -} - /* add_god_to_list()- called only from init_gods */ -void +static void add_god_to_list (archetype *god_arch) { if (!god_arch) @@ -82,39 +67,8 @@ #endif } -/* baptize_altar() - (cosmetically) change the name to that of the - * god in question, then set the title for later use. -b.t. - */ -int -baptize_altar (object *op) -{ - char buf[MAX_BUF]; - - /* if the title field is pre-set, then that altar is - * already dedicated. */ - if (!op->title) - { - godlink *god = get_rand_god (); - - if (!god || !god->name) - { - LOG (llevError, "baptise_altar(): bizarre nameless god!\n"); - return 0; - } - /* if the object name hasnt' been changed, we tack on the gods name */ - if (op->name == op->arch->object::name) - { - sprintf (buf, "%s of %s", &op->name, &god->name); - op->name = buf; - } - op->title = god->name; - return 1; - } - return 0; -} - godlink * -get_rand_god (void) +get_rand_god () { godlink *god = first_god; int i; @@ -142,15 +96,17 @@ : 0; } +/* init_gods() - this takes a look at all of the archetypes to find + * the objects which correspond to the GODS (type GOD) */ void -free_all_god (void) +init_gods () { - godlink *god, *godnext; + LOG (llevDebug, "Initialising gods...\n"); - LOG (llevDebug, "Freeing god information\n"); - for (god = first_god; god; god = godnext) - { - godnext = god->next; - delete god; - } + for_all_archetypes (at) + if (at->type == GOD) + add_god_to_list (at); + + LOG (llevDebug, "done.\n"); } +