[ViewVC] Diff of: cvs/deliantra/server/common/holy.C

Comparing deliantra/server/common/holy.C (file contents):
Revision 1.10 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.11 by root, Mon Jun 4 13:04:00 2007 UTC

 void
 init_gods (void)
 {
   LOG (llevDebug, "Initialising gods...\n");
-  for (archetype *at = first_archetype; at; at = at->next)
+  for_all_archetypes (at)
-    if (at->clone.type == GOD)
+    if (at->type == GOD)
       add_god_to_list (at);
   LOG (llevDebug, "done.\n");
 }
     }
   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
     {
       god->id = first_god->id + 1;
         {
           LOG (llevError, "baptise_altar(): bizarre nameless god!\n");
           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;
         }
       op->title = god->name;
  * are returning a pointer to the CLONE object. -b.t.
  */
 object *
 pntr_to_god_obj (godlink *godlnk)
 {
-  object *god = NULL;
-  if (godlnk && godlnk->arch)
+  return godlnk && godlnk->arch
-    god = &godlnk->arch->clone;
+    ? godlnk->arch
-  return god;
+    : 0;
 }
 void
 free_all_god (void)
 {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines