--- deliantra/server/common/holy.C	2007/05/28 21:21:40	1.10
+++ deliantra/server/common/holy.C	2007/06/04 13:04:00	1.11
@@ -53,8 +53,8 @@
 {
   LOG (llevDebug, "Initialising gods...\n");
 
-  for (archetype *at = first_archetype; at; 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");
@@ -75,7 +75,7 @@
   god = init_godslist ();
 
   god->arch = god_arch;
-  god->name = god_arch->clone.name;
+  god->name = god_arch->object::name;
   if (!first_god)
     god->id = 1;
   else
@@ -111,7 +111,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 (!strcmp (op->name, op->arch->object::name))
         {
           sprintf (buf, "%s of %s", &op->name, &god->name);
           op->name = buf;
@@ -146,11 +146,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