--- deliantra/server/common/holy.C 2007/06/04 13:04:00 1.11
+++ deliantra/server/common/holy.C 2008/05/06 16:55:25 1.16
@@ -1,25 +1,24 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 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 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.
+ * 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.
*
- * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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
*/
/* Started file Sept 1996 - initialization of gods in form of a
@@ -30,21 +29,6 @@
#include
#include
-//TODO: make a constructor
-static godlink *
-init_godslist (void)
-{
- godlink *gl = new godlink;
-
- // name=NULL; /* how to describe the god to the player */
- // arch=NULL; /* pointer to the archetype of this god */
- // id=0; /* id of the god */
- // pantheon=NULL; /* the group to which the god belongs (not implemented) */
- // next=NULL; /* next god in this linked list */
-
- return gl;
-}
-
/* init_gods() - this takes a look at all of the archetypes to find
* the objects which correspond to the GODS (type GOD) */
@@ -64,18 +48,23 @@
void
add_god_to_list (archetype *god_arch)
{
- godlink *god;
-
if (!god_arch)
{
LOG (llevError, "ERROR: Tried to add null god to list!\n");
return;
}
- god = init_godslist ();
+ godlink *god = new godlink;
+
+ // name=NULL; /* how to describe the god to the player */
+ // arch=NULL; /* pointer to the archetype of this god */
+ // id=0; /* id of the god */
+ // pantheon=NULL; /* the group to which the god belongs (not implemented) */
+ // next=NULL; /* next god in this linked list */
god->arch = god_arch;
god->name = god_arch->object::name;
+
if (!first_god)
god->id = 1;
else
@@ -83,6 +72,7 @@
god->id = first_god->id + 1;
god->next = first_god;
}
+
first_god = god;
#ifdef DEBUG_GODS
@@ -93,7 +83,6 @@
/* 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)
{