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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.18 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.27 by root, Tue Jun 5 13:05:02 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
- * it under the terms of the GNU General Public License as published by
+ * under the terms of the GNU General Public License as published by the Free
- * the Free Software Foundation; either version 2 of the License, or
+ * Software Foundation; either version 2 of the License, or (at your option)
- * (at your option) any later version.
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful, but
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * GNU General Public License for more details.
+ * for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /* Oct 3, 1995 - Code laid down for initial gods, priest alignment, and
  * monster race initialization. b.t.
  */
       godlink *gl;
       for (gl = first_god; gl; gl = gl->next)
         if (!strncmp (name, gl->name, MIN ((size_t) strlen (gl->name), nmlen)))
           break;
       if (gl)
         godnr = gl->id;
     }
   return godnr;
 }
 /**
  * Returns pointer to specified god's object through pntr_to_god_obj..
           godnr = rndm (1, gl->id);
           while (gl)
             {
               if (gl->id == godnr)
                 break;
               gl = gl->next;
             }
           op->title = gl->name;
         }
       return op->title;
     }
     return 0;
   else
     return strcmp (s1, s2) == 0;
 }
 /**
  * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively).
  * Any matching items in the inventory are deleted, and a
  * message is displayed to the player.
  */
   object *tmp;
   if (!tr->item)
     return 0;
-  if (follower_has_similar_item (op, &tr->item->clone))
+  if (follower_has_similar_item (op, tr->item))
     return 0;
   tmp = arch_to_object (tr->item);
   new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp));
   tmp = insert_ob_in_ob (tmp, op);
     return;
   /* hmm. what happend depends on pl's current god, level, etc */
   if (!pl_god)
     {                           /*new convert */
-      become_follower (pl, &altar->other_arch->clone);
+      become_follower (pl, altar->other_arch);
       return;
     }
-  else if (!strcmp (&pl_god->name, altar->other_arch->clone.name))
+  else if (!strcmp (&pl_god->name, altar->other_arch->object::name))
     {
       /* pray at your gods altar */
       int bonus = (pl->stats.Wis + skill->level) / 10;
       /* we can get neg grace up faster */
        * points to the god of this altar (which we have
        * already verified is non null).  pl_god->other_arch
        * is the opposing god - we need to verify that exists before
        * using its values.
        */
-      if (pl_god->other_arch && (altar->other_arch->name == pl_god->other_arch->name))
+      if (pl_god->other_arch && (altar->other_arch->archname == pl_god->other_arch->archname))
         {
           angry = 2;
           if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0)
             {
               object *tmp;
       /* May switch Gods, but its random chance based on our current level
        * note it gets harder to swap gods the higher we get
        */
       if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW)))
-        {
-          become_follower (pl, &altar->other_arch->clone);
+        become_follower (pl, altar->other_arch);
-        }
       else
         {
           /* toss this player off the altar.  He can try again. */
           new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar.");
+          pl->contr->fire_on = 0;
+          pl->speed_left = 1.f;
           move_player (pl, absdir (pl->facing + 4));    /* back him off the way he came. */
         }
     }
 }
         {
           object *item;
           if (!tr->item)
             continue;
-          item = &tr->item->clone;
+          item = tr->item;
           /* Basically, see if the matching spell is granted by this god. */
-          if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name)
+          if (tr->item->type == SPELL && tr->item->object::name == tmp->name)
             {
               remove = 0;
               break;
             }
         }
         }
     }
   /* remove any godgiven items from the old god */
   if (old_god)
-    {
-      for (tr = old_god->randomitems->items; tr != NULL; tr = tr->next)
+    for (tr = old_god->randomitems->items; tr; tr = tr->next)
-        {
-          if (tr->item && QUERY_FLAG (&tr->item->clone, FLAG_STARTEQUIP))
+      if (tr->item && QUERY_FLAG (tr->item, FLAG_STARTEQUIP))
-            follower_remove_similar_item (op, &tr->item->clone);
+        follower_remove_similar_item (op, tr->item);
-        }
-    }
   if (!op || !new_god)
     return;
   if (op->race && new_god->slaying && strstr (op->race, new_god->slaying))
     {
       new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name);
       if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0)
         {
           object *tmp = get_archetype (LOOSE_MANA);
           cast_magic_storm (op, tmp, new_god->level + 10);
         }
       return;
     }
   /* give the player any special god-characteristic-items. */
-  for (tr = new_god->randomitems->items; tr != NULL; tr = tr->next)
+  for (tr = new_god->randomitems->items; tr; tr = tr->next)
     {
-      if (tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK &&
+      if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
-          tr->item->clone.type != BOOK && tr->item->clone.type != SPELL)
+          && tr->item->type != BOOK && tr->item->type != SPELL)
         god_gives_present (op, new_god, tr);
     }
   new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
   if (!skop)
     {
       /* The arhetype should always be defined - if we crash here because it doesn't,
        * things are really messed up anyways.
        */
-      skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->clone.skill);
+      skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
       link_player_skills (op);
     }
   sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
 int
 worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string)
 {
-  if (QUERY_FLAG (&op->arch->clone, flag))
+  if (QUERY_FLAG (op->arch, flag))
     if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
       {
         update_priest_flag (exp_obj, op, flag);
         if (QUERY_FLAG (op, flag))
           new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string);
     {
       LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n");
       return NULL;
     }
-  for (tr = god->randomitems->items; tr != NULL; tr = tr->next)
+  for (tr = god->randomitems->items; tr; tr = tr->next)
     {
-      object *item;
       if (!tr->item)
         continue;
-      item = &tr->item->clone;
+      object *item = tr->item;
       if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0)
         return item->other_arch;
     }
   return NULL;
   if (level <= 20)
     return level / difficulty;
   if (level <= 40)
     return (20 + (level - 20) / 2) / difficulty;
   return (30 + (level - 40) / 4) / difficulty;
 }
 /**
  * God wants to enchant weapon.
   int tmp;
   for (weapon = op->inv; weapon; weapon = weapon->below)
     if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
       break;
   if (weapon == NULL || god_examines_item (god, weapon) <= 0)
     return 0;
   /* First give it a title, so other gods won't touch it */
   if (!weapon->title)
   if (god_examines_priest (op, god) < 0)
     return;
   new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!");
-  for (tr = god->randomitems->items; tr != NULL; tr = tr->next)
+  for (tr = god->randomitems->items; tr; tr = tr->next)
     {
       object *item;
       if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH))
         continue;
       /* Treasurelist - generate some treasure for the follower */
       if (tr->name)
         {
-          treasurelist *tl = find_treasurelist (tr->name);
+          treasurelist *tl = treasurelist::find (tr->name);
           if (tl == NULL)
             continue;
           new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your " "eyes.  You catch it before it falls to the ground.");
         }
       if (!tr->item)
         continue;
-      item = &tr->item->clone;
+      item = tr->item;
       /* Grace limit */
       if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0)
         {
           if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
             continue;
           new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!");
           for (i = 0; i < NUM_STATS; i++)
-            if (get_attr_value (&depl->stats, i))
+            if (depl->stats.stat (i))
               new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
           depl->destroy ();
           op->update_stats ();
           return;
   if (race == NULL)
     return NULL;
   while (gl)
     {
-      if (!strcasecmp (gl->arch->clone.race, race))
+      if (!strcasecmp (gl->arch->race, race))
         {
           godname = gl->name;
           break;
         }
       gl = gl->next;

Diff Legend

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

Comparing deliantra/server/server/gods.C (file contents): Revision 1.18 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs. Revision 1.27 by root, Tue Jun 5 13:05:02 2007 UTC

Diff Legend

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.18 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.27 by root, Tue Jun 5 13:05:02 2007 UTC