--- deliantra/server/common/holy.C	2007/05/17 21:32:08	1.9
+++ deliantra/server/common/holy.C	2007/06/04 13:04:00	1.11
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) Mark Wedel & Crossfire Development Team
- * Copyright (C) Frank Tore Johansen
- *
- * This program 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.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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.
+ * 
+ * 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
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /* Started file Sept 1996 - initialization of gods in form of a
@@ -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