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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.50 by root, Sat May 12 18:14:47 2007 UTC vs.
Revision 1.51 by root, Sat May 12 18:23:51 2007 UTC

  * that gives them that ability.
  */
 int
 change_abil (object *op, object *tmp)
 {
-  int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0;
+  int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0;
   char message[MAX_BUF];
   int potion_max = 0;
   /* remember what object was like before it was changed.  note that
    * refop is a local copy of op only to be used for detecting changes
   if (op->type == PLAYER)
     {
       if (tmp->type == POTION)
         {
           potion_max = 1;
-          for (j = 0; j < NUM_STATS; j++)
+          for (int j = 0; j < NUM_STATS; j++)
             {
-              int nstat, ostat;
-              ostat = op->contr->orig_stats.stat (j);
+              int ostat = op->contr->orig_stats.stat (j);
-              i = tmp->stats.stat (j);
+              int i = tmp->stats.stat (j);
               /* nstat is what the stat will be after use of the potion */
-              nstat = flag * i + ostat;
+              int nstat = flag * i + ostat;
               /* Do some bounds checking.  While I don't think any
                * potions do so right now, there is the potential for potions
                * that adjust that stat by more than one point, so we need
                * to allow for that.
           /* This section of code ups the characters normal stats also.  I am not
            * sure if this is strictly necessary, being that fix_player probably
            * recalculates this anyway.
            */
-          for (j = 0; j < NUM_STATS; j++)
+          for (int j = 0; j < NUM_STATS; j++)
             change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
           check_stat_bounds (&op->stats);
         }                       /* end of potion handling code */
     }
-  /* reset attributes that fix_player doesn't reset since it doesn't search
+  /* reset attributes that update_stats doesn't reset since it doesn't search
    * everything to set
    */
   if (flag == -1)
     {
       op->attacktype    &= ~tmp->attacktype;
        */
       op->move_type     &= ~tmp->move_type;
     }
   /* call fix_player since op object could have whatever attribute due
-   * to multiple items. if fix_player always has to be called after
+   * to multiple items. if update_stats always has to be called after
    * change_ability then might as well call it from here
    */
   op->update_stats ();
-  /* Fix player won't add the bows ability to the player, so don't
+  /* update_stats won't add the bows ability to the player, so don't
    * print out message if this is a bow.
    */
   if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
     {
       success = 1;
       if (tmp->move_type & MOVE_FLY_HIGH)
         {
           /* double conditional - second case covers if you have move_fly_low -
            * in that case, you don't actually land
            */
-          DIFF_MSG (flag, "You soar into the air air!.",
+          DIFF_MSG (flag, "You soar into the air!",
                     (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
         }
       if (tmp->move_type & MOVE_SWIM)
         DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
       success = 1;
       DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
     }
   /* Messages for changed resistance */
-  for (i = 0; i < NROFATTACKS; i++)
+  for (int i = 0; i < NROFATTACKS; i++)
     {
       if (i == ATNR_PHYSICAL)
         continue;               /* Don't display about armour */
       if (op->resist[i] != refop.resist[i])
         }
     }
   if (!potion_max)
     {
-      for (j = 0; j < NUM_STATS; j++)
+      for (int j = 0; j < NUM_STATS; j++)
         {
-          if ((i = tmp->stats.stat (j)))
+          if (int i = tmp->stats.stat (j))
             {
               success = 1;
               DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
             }
         }
  * Subtracts stat-bonuses given by the class which the player has chosen.
  */
 void
 object::remove_statbonus ()
 {
-  stats.Str -= arch->clone.stats.Str;
+  for (int i = 0; i < NUM_STATS; ++i)
-  stats.Dex -= arch->clone.stats.Dex;
+    {
-  stats.Con -= arch->clone.stats.Con;
+      sint8 v = arch->clone.stats.stat (i);
-  stats.Wis -= arch->clone.stats.Wis;
+      stats.stat (i)             -= v;
-  stats.Pow -= arch->clone.stats.Pow;
+      contr->orig_stats.stat (i) -= v;
-  stats.Cha -= arch->clone.stats.Cha;
+    }
-  stats.Int -= arch->clone.stats.Int;
-  contr->orig_stats.Str -= arch->clone.stats.Str;
-  contr->orig_stats.Dex -= arch->clone.stats.Dex;
-  contr->orig_stats.Con -= arch->clone.stats.Con;
-  contr->orig_stats.Wis -= arch->clone.stats.Wis;
-  contr->orig_stats.Pow -= arch->clone.stats.Pow;
-  contr->orig_stats.Cha -= arch->clone.stats.Cha;
-  contr->orig_stats.Int -= arch->clone.stats.Int;
 }
 /*
  * Adds stat-bonuses given by the class which the player has chosen.
  */
 void
 object::add_statbonus ()
 {
-  stats.Str += arch->clone.stats.Str;
+  for (int i = 0; i < NUM_STATS; ++i)
-  stats.Dex += arch->clone.stats.Dex;
+    {
-  stats.Con += arch->clone.stats.Con;
+      sint8 v = arch->clone.stats.stat (i);
-  stats.Wis += arch->clone.stats.Wis;
+      stats.stat (i)             += v;
-  stats.Pow += arch->clone.stats.Pow;
+      contr->orig_stats.stat (i) += v;
-  stats.Cha += arch->clone.stats.Cha;
+    }
-  stats.Int += arch->clone.stats.Int;
-  contr->orig_stats.Str += arch->clone.stats.Str;
-  contr->orig_stats.Dex += arch->clone.stats.Dex;
-  contr->orig_stats.Con += arch->clone.stats.Con;
-  contr->orig_stats.Wis += arch->clone.stats.Wis;
-  contr->orig_stats.Pow += arch->clone.stats.Pow;
-  contr->orig_stats.Cha += arch->clone.stats.Cha;
-  contr->orig_stats.Int += arch->clone.stats.Int;
 }
 /*
  * Updates all abilities given by applied objects in the inventory
  * of the given object.  Note: This function works for both monsters

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.50 by root, Sat May 12 18:14:47 2007 UTC vs. Revision 1.51 by root, Sat May 12 18:23:51 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.50 by root, Sat May 12 18:14:47 2007 UTC vs.
Revision 1.51 by root, Sat May 12 18:23:51 2007 UTC