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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.72 by root, Wed Nov 16 23:42:02 2016 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by 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
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * 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.
 /**
  * If the god does/doesnt have this flag, we
  * give/remove it from the experience object if it doesnt/does
  * already exist. For players only!
  */
-static void
+static inline void
 update_priest_flag (object *god, object *exp_ob, uint32 flag)
 {
+  exp_ob->flag [flag] = god->flag [flag];
+  return;
+  // old code follows for reference...
   if (god->flag [flag] && !exp_ob->flag [flag])
-    exp_ob->flag [flag];
+    exp_ob->set_flag (flag);
   else if (exp_ob->flag [flag] && !god->flag [flag])
     {
       /*  When this is called with the exp_ob set to the player,
        * this check is broken, because most all players arch
        * allow use of weapons.  I'm not actually sure why this
        * check is here - I guess if you had a case where the
        * value in the archetype (wisdom) should over ride the restrictions
        * the god places on it, this may make sense.  But I don't think
        * there is any case like that.
        */
 /*        if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
       exp_ob->clr_flag (flag);
     };
 }
  * switched to a new god. It handles basically all the stat changes
  * that happen to the player, including the removal of godgiven
  * items (from the former cult).
  */
 void
-become_follower (object *op, object *new_god)
+object::become_follower (object *new_god)
 {
-  object *old_god = NULL;       /* old god */
+  object *old_god = 0;       /* old god */
   treasure *tr;
   object *item, *skop, *next;
   int i, sk_applied, undeadified = 0;   /* Turns to true if changing god can changes the undead status of the player. */
+  if (!contr)
+    return;
+  contr->queue_stats_update ();
-  old_god = find_god (determine_god (op));
+  old_god = find_god (determine_god (this));
   /* take away any special god-characteristic items. */
-  for (item = op->inv; item; item = next)
+  for (item = inv; item; item = next)
     {
       next = item->below;
       // remove all invisible startequip items which are not skill, exp or force
-      if (item->flag [FLAG_STARTEQUIP] && item->invisible &&
+      if (item->flag [FLAG_STARTEQUIP] && item->invisible
-          (item->type != SKILL) && (item->type != FORCE))
+          && item->type != SKILL && item->type != FORCE)
         {
           if (item->type == SPELL)
             {
-              new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name);
+              new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, this, "You lose knowledge of %s.", &item->name);
-              esrv_remove_spell (op->contr, item);
+              esrv_remove_spell (contr, item);
             }
           item->destroy ();
         }
     }
   /* remove any godgiven items from the old god */
   if (old_god)
     for (tr = old_god->randomitems->items; tr; tr = tr->next)
       if (tr->item && tr->item->flag [FLAG_STARTEQUIP])
-        follower_remove_similar_item (op, tr->item);
+        follower_remove_similar_item (this, tr->item);
-  if (!op || !new_god)
+  if (!new_god)
     return;
-  if (new_god->slaying && op->race.contains (new_god->slaying))
+  if (new_god->slaying && new_god->slaying.contains (race))
     {
-      new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name);
+      failmsgf ("Fool! %s detests your kind! H<This god does not accept followers of your race.>", &new_god->name);
-      if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0)
+      if (random_roll (0, level - 1, this, PREFER_LOW) - 5 > 0)
         {
-          object *tmp = get_archetype (LOOSE_MANA);
+          object *tmp = archetype::get (LOOSE_MANA);
-          cast_magic_storm (op, tmp, new_god->level + 10);
+          cast_magic_storm (this, tmp, new_god->level + 10);
         }
       return;
     }
   /* give the player any special god-characteristic-items. */
   for (tr = new_god->randomitems->items; tr; tr = tr->next)
-    {
-      if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
+    if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
-          && tr->item->type != BOOK && tr->item->type != SPELL)
+        && tr->item->type != BOOK && tr->item->type != SPELL)
-        god_gives_present (op, new_god, tr);
+      god_gives_present (this, new_god, tr);
-    }
-  new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
+  new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, this, "You become a follower of %s!", &new_god->name);
-  for (skop = op->inv; skop; skop = skop->below)
+  for (skop = inv; skop; skop = skop->below)
     if (skop->type == SKILL && skop->subtype == SK_PRAYING)
       break;
   /* Player has no skill - give them the skill */
   if (!skop)
     /* The archetype 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)->skill);
+    skop = give_skill_by_name (this, shstr_praying);
   sk_applied = skop->flag [FLAG_APPLIED]; /* save skill status */
   /* Clear the "undead" status. We also need to force a call to change_abil,
    * so I set undeadified for that.
     }
   if (skop->title)
     {
       /* get rid of old god */
-      new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title);
+      new_draw_info_format (NDI_UNIQUE, 0, this, "%s's blessing is withdrawn from you.", &skop->title);
       /* The point of this is to really show what abilities the player just lost */
       if (sk_applied || undeadified)
         {
           skop->clr_flag (FLAG_APPLIED);
-          change_abil (op, skop);
+          change_abil (this, skop);
         }
     }
   /* now change to the new gods attributes to exp_obj */
   skop->title = new_god->name;
   update_priest_flag (new_god, skop, FLAG_MAKE_INVIS);
   update_priest_flag (new_god, skop, FLAG_UNDEAD);
   update_priest_flag (new_god, skop, FLAG_BLIND);
   update_priest_flag (new_god, skop, FLAG_XRAYS);       /* better have this if blind! */
-  new_draw_info_format (NDI_UNIQUE, 0, op, "You are bathed in %s's aura.", &new_god->name);
+  new_draw_info_format (NDI_UNIQUE, 0, this, "You are bathed in %s's aura.", &new_god->name);
   /* Weapon/armour use are special...handle flag toggles here as this can
    * only happen when gods are worshipped and if the new priest could
    * have used armour/weapons in the first place.
    *
    * This also can happen for monks which cannot use weapons. In this case
    * do not allow to use weapons even if the god otherwise would allow it.
    */
-  if (!present_in_ob_by_name (FORCE, "no weapon force", op))
+  if (!present_in_ob_by_name (FORCE, "no weapon force", this))
     update_priest_flag (new_god, skop, FLAG_USE_WEAPON);
   update_priest_flag (new_god, skop, FLAG_USE_ARMOUR);
-  if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons"))
+  if (worship_forbids_use (this, skop, FLAG_USE_WEAPON, "weapons"))
-    stop_using_item (op, WEAPON, 2);
+    stop_using_item (this, WEAPON, 2);
-  if (worship_forbids_use (op, skop, FLAG_USE_ARMOUR, "armour"))
+  if (worship_forbids_use (this, skop, FLAG_USE_ARMOUR, "armour"))
     {
-      stop_using_item (op, ARMOUR, 1);
+      stop_using_item (this, ARMOUR, 1);
-      stop_using_item (op, HELMET, 1);
+      stop_using_item (this, HELMET, 1);
-      stop_using_item (op, BOOTS, 1);
+      stop_using_item (this, BOOTS, 1);
-      stop_using_item (op, GLOVES, 1);
+      stop_using_item (this, GLOVES, 1);
-      stop_using_item (op, SHIELD, 1);
+      stop_using_item (this, SHIELD, 1);
     }
   skop->set_flag (FLAG_APPLIED);
-  change_abil (op, skop);
+  change_abil (this, skop);
   /* return to previous skill status */
   if (!sk_applied)
+    {
-    skop->clr_flag (FLAG_APPLIED);
+      skop->clr_flag (FLAG_APPLIED);
+      contr->queue_stats_update ();
+    }
-  check_special_prayers (op, new_god);
+  check_special_prayers (this, new_god);
 }
 archetype *
 determine_holy_arch (object *god, shstr_cmp type)
 {
  * attacktype, slaying and such.
  */
 static int
 god_enchants_weapon (object *op, object *god, object *tr, object *skill)
 {
-  object *weapon;
+  if (!op->contr)
-  uint32 attacktype;
+    return 0;
-  int tmp;
-  for (weapon = op->inv; weapon; weapon = weapon->below)
+  object *weapon = op->contr->combat_ob;
-    if ((weapon->type == WEAPON || weapon->type == BOW) && weapon->flag [FLAG_APPLIED])
-      break;
+  if (!weapon)
+    return 0;
+  if (weapon->type != WEAPON && weapon->type != BOW)
+    return 0;
-  if (!weapon || god_examines_item (god, weapon) <= 0)
+  if (god_examines_item (god, weapon) <= 0)
     return 0;
   /* First give it a title, so other gods won't touch it */
   if (!weapon->title)
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s now hungers to slay enemies of your god!", &weapon->name);
       return 1;
     }
   /* Add the gods attacktype */
-  attacktype = (weapon->attacktype == 0) ? AT_PHYSICAL : weapon->attacktype;
+  uint32 attacktype = (weapon->attacktype == 0) ? AT_PHYSICAL : weapon->attacktype;
   if ((attacktype & god->attacktype) != god->attacktype)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Your weapon suddenly glows!");
       weapon->attacktype = attacktype | god->attacktype;
       return 1;
     }
   /* Higher magic value */
-  tmp = follower_level_to_enchantments (skill->level, tr->level);
+  if (weapon->magic < follower_level_to_enchantments (skill->level, tr->level))
-  if (weapon->magic < tmp)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!");
       weapon->magic++;
       if (object *pl = weapon->visible_to ())
           break;
       if (skop)
         loss = 0.05f * skop->stats.exp;
-      change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP);
+      change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? skop->skill : shstr_none, SK_SUBTRACT_SKILL_EXP);
       if (random_roll (0, angry, op, PREFER_LOW))
         {
-          object *tmp = get_archetype (LOOSE_MANA);
+          object *tmp = archetype::get (LOOSE_MANA);
           cast_magic_storm (op, tmp, op->level + (angry * 3));
         }
       new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name);
           if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
             {
               /* Follower lacks the required grace for the following
                * treasure list items. */
-              object *tmp = get_archetype (HOLY_POSSESSION);
+              object *tmp = archetype::get (HOLY_POSSESSION);
               cast_change_ability (op, op, tmp, 0, 1);
               tmp->destroy ();
               return;
             }
     return;
   /* hmm. what happend depends on pl's current god, level, etc */
   if (!pl_god)
     {                           /*new convert */
-      become_follower (pl, altar->other_arch);
+      pl->become_follower (altar->other_arch);
       return;
     }
   else if (pl_god->name == altar->other_arch->object::name)
     {
       /* pray at your gods altar */
               object *tmp;
               /* you really screwed up */
               angry = 3;
               new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Foul Priest! %s punishes you!", &pl_god->name);
-              tmp = get_archetype (LOOSE_MANA);
+              tmp = archetype::get (LOOSE_MANA);
               cast_magic_storm (pl, tmp, pl_god->level + 20);
             }
           else
             new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Foolish heretic! %s is livid!", &pl_god->name);
         }
        * we lose experience from the clerical experience obj
        */
       loss = angry * (skill->stats.exp / 10);
       if (loss)
-        change_exp (pl, -random_roll64 (0, loss, pl, PREFER_LOW), skill ? &skill->skill : "none", SK_SUBTRACT_SKILL_EXP);
+        change_exp (pl, -random_roll64 (0, loss, pl, PREFER_LOW), skill ? skill->skill : shstr_none, SK_SUBTRACT_SKILL_EXP);
       /* 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);
+        pl->become_follower (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;

Diff Legend

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

Comparing deliantra/server/server/gods.C (file contents): Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC vs. Revision 1.72 by root, Wed Nov 16 23:42:02 2016 UTC

Diff Legend

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.72 by root, Wed Nov 16 23:42:02 2016 UTC