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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.21 by root, Sat May 12 18:14:48 2007 UTC vs.
Revision 1.32 by root, Tue Apr 22 02:46:18 2008 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * 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 2 of the License, or
+ * 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
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* 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..
     {
       /* find a god based on race */
       if (!op->title)
         {
-          if (op->race != NULL)
+          if (op->race)
             {
               godname = get_god_for_race (op->race);
-              if (godname != NULL)
+              if (godname)
-                {
-                  op->title = godname;
+                op->title = godname;
-                }
             }
         }
       /* find a random god */
       if (!op->title)
           godnr = rndm (1, gl->id);
           while (gl)
             {
               if (gl->id == godnr)
                 break;
               gl = gl->next;
             }
           op->title = gl->name;
         }
       return op->title;
     }
    * that skill, once we find it, we can return, either with the
    * title or "none".
    */
   if (op->type == PLAYER)
     {
-      object *tmp;
-      for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+      for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->type == SKILL && tmp->subtype == SK_PRAYING)
           {
             if (tmp->title)
-              return (tmp->title);
+              return tmp->title;
             else
-              return ("none");
+              return "none";
           }
     }
-  return ("none");
+  return "none";
 }
 /**
  * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0
  */
     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.
  */
               if (tmp->nrof > 1)
                 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumble to dust!", query_short_name (tmp));
               else
                 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumbles to dust!", query_short_name (tmp));
-              tmp->remove ();  /* remove obj from players inv. */
+              tmp->destroy ();
-              esrv_del_item (op->contr, tmp->count);    /* notify client */
-              tmp->destroy ();        /* free object */
             }
           if (tmp->inv)
             follower_remove_similar_item (tmp, item);
         }
   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 */
       if (pl->stats.grace < 0)
         pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10));
       /* we can super-charge grace to 2x max */
-      if (pl->stats.grace < (2 * pl->stats.maxgrace))
+      if (pl->stats.grace < 2 * pl->stats.maxgrace)
-        {
-          pl->stats.grace += bonus / 2;
+        pl->stats.grace += bonus / 2;
-        }
+      else
-      if (pl->stats.grace > (2 * pl->stats.maxgrace))
-        {
-          pl->stats.grace = (2 * pl->stats.maxgrace);
+        pl->stats.grace = 2 * pl->stats.maxgrace;
-        }
       /* Every once in a while, the god decides to checkup on their
        * follower, and may intervene to help them out.
        */
       bonus = MAX (1, bonus + MAX (pl->stats.luck, -3));        /* -- DAMN -- */
       if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0)
         god_intervention (pl, pl_god, skill);
     }
   else
     {                           /* praying to another god! */
       uint64 loss = 0;
       int angry = 1;
        * 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; 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))
   /* give the player any special god-characteristic-items. */
   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);
   for (tr = god->randomitems->items; tr; tr = tr->next)
     {
       if (!tr->item)
         continue;
-      object *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;
     }
   return 0;
 }
 /**
  * Every once in a while the god will intervene to help the worshiper.
  * Later, this fctn can be used to supply quests, etc for the
  * priest. -b.t.
  * called from pray_at_altar() currently.
  */
 void
 god_intervention (object *op, object *god, object *skill)
 {
   treasure *tr;
   /* lets do some checks of whether we are kosher with our god */
   if (god_examines_priest (op, god) < 0)
     return;
+  op->play_sound (sound_find ("god_intervention"));
   new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!");
   for (tr = god->randomitems->items; tr; tr = tr->next)
     {
       object *item;
           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.");
+          new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your eyes. You catch it before it falls to the ground.");
           create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD | GT_UPDATE_INV, skill->level, 0);
           return;
         }
       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)
               tmp = get_archetype (HOLY_POSSESSION);
               cast_change_ability (op, op, tmp, 0, 1);
               tmp->destroy ();
               return;
             }
           continue;
         }
       /* Restore grace */
       if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0)
         }
       /* Voices */
       if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0)
         {
-          new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to " "turn around:");
+          new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to turn around:");
           new_draw_info (NDI_WHITE, 0, op, item->msg);
           return;
         }
       /* Messages */
   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.21 by root, Sat May 12 18:14:48 2007 UTC vs. Revision 1.32 by root, Tue Apr 22 02:46:18 2008 UTC

Diff Legend

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.21 by root, Sat May 12 18:14:48 2007 UTC vs.
Revision 1.32 by root, Tue Apr 22 02:46:18 2008 UTC