--- deliantra/server/common/holy.C	2007/01/27 02:19:36	1.7
+++ deliantra/server/common/holy.C	2008/12/31 17:35:37	1.17
@@ -1,3 +1,25 @@
+/*
+ * 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
+ * 
+ * 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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
+ */
 
 /* Started file Sept 1996 - initialization of gods in form of a
  * linked list -b.t.
@@ -7,32 +29,16 @@
 #include <living.h>
 #include <spells.h>
 
-//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) */
 
 void
 init_gods (void)
 {
-  archetype *at = NULL;
-
   LOG (llevDebug, "Initialising gods...\n");
-  for (at = first_archetype; at != NULL; at = at->next)
-    if (at->clone.type == GOD)
+
+  for_all_archetypes (at)
+    if (at->type == GOD)
       add_god_to_list (at);
 
   LOG (llevDebug, "done.\n");
@@ -42,18 +48,24 @@
 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->clone.name;
+  god->name = god_arch->object::name;
+
+  // first_god->id MUST be the highest god number for other code to work currently
   if (!first_god)
     god->id = 1;
   else
@@ -61,6 +73,7 @@
       god->id = first_god->id + 1;
       god->next = first_god;
     }
+
   first_god = god;
 
 #ifdef DEBUG_GODS
@@ -71,7 +84,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)
 {
@@ -89,7 +101,7 @@
           return 0;
         }
       /* if the object name hasnt' been changed, we tack on the gods name */
-      if (!strcmp (op->name, op->arch->clone.name))
+      if (op->name == op->arch->object::name)
         {
           sprintf (buf, "%s of %s", &op->name, &god->name);
           op->name = buf;
@@ -124,11 +136,9 @@
 object *
 pntr_to_god_obj (godlink *godlnk)
 {
-  object *god = NULL;
-
-  if (godlnk && godlnk->arch)
-    god = &godlnk->arch->clone;
-  return god;
+  return godlnk && godlnk->arch
+    ? godlnk->arch
+    : 0;
 }
 
 void