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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.35 by root, Wed Mar 14 04:12:27 2007 UTC vs.
Revision 1.39 by root, Sun Apr 29 14:39:55 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
  * Updates all abilities given by applied objects in the inventory
  * of the given object.  Note: This function works for both monsters
  * and players; the "player" in the name is purely an archaic inheritance.
  * This functions starts from base values (archetype or player object)
  * and then adjusts them according to what the player has equipped.
- */
+ *
-/* July 95 - inserted stuff to handle new skills/exp system - b.t.
+ * July 95 - inserted stuff to handle new skills/exp system - b.t.
-   spell system split, grace points now added to system  --peterm
+ * spell system split, grace points now added to system  --peterm
  */
 void
 object::update_stats ()
 {
   int i, j;
   float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;
       if (settings.spell_encumbrance == TRUE)
         contr->encumbrance = 0;
       attacktype = 0;
-      contr->digestion = 0;
+      contr->digestion     = 0;
-      contr->gen_hp = 0;
+      contr->gen_hp        = 0;
-      contr->gen_sp = 0;
+      contr->gen_sp        = 0;
-      contr->gen_grace = 0;
+      contr->gen_grace     = 0;
       contr->gen_sp_armour = 10;
-      contr->item_power = 0;
+      contr->item_power    = 0;
       /* Don't clobber all the range_ values.  range_golem otherwise
        * gets reset for no good reason, and we don't want to reset
        * range_magic (what spell is readied).  These three below
        * well get filled in based on what the player has equipped.
        */
-      contr->ranges[range_bow] = NULL;
+      contr->ranges[range_bow]   = 0;
-      contr->ranges[range_misc] = NULL;
+      contr->ranges[range_misc]  = 0;
-      contr->ranges[range_skill] = NULL;
+      contr->ranges[range_skill] = 0;
     }
   memcpy (body_used, body_info, sizeof (body_info));
   slaying = 0;
   if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL  )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
   if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
   if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD      )) CLEAR_FLAG (this, FLAG_UNDEAD);
   if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
-  path_attuned = arch->clone.path_attuned;
+  path_attuned  = arch->clone.path_attuned;
   path_repelled = arch->clone.path_repelled;
-  path_denied = arch->clone.path_denied;
+  path_denied   = arch->clone.path_denied;
-  glow_radius = arch->clone.glow_radius;
+  glow_radius   = arch->clone.glow_radius;
-  move_type = arch->clone.move_type;
+  move_type     = arch->clone.move_type;
   chosen_skill = NULL;
   /* initializing resistances from the values in player/monster's
    * archetype clone
    */
        * in the praying skill, and the player should always get those.
        * It also means we need to put in additional checks for applied below,
        * because the skill shouldn't count against body positions being used
        * up, etc.
        */
-      if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) ||
+      if ((QUERY_FLAG (tmp, FLAG_APPLIED)
+           && tmp->type != CONTAINER
+           && tmp->type != CLOSE_CON)
+          || (tmp->type == SKILL
-          (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
+              && tmp->subtype == SK_PRAYING))
         {
           if (type == PLAYER)
             {
               if (tmp->type == BOW)
                 contr->ranges[range_bow] = tmp;
               if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
                 contr->ranges[range_misc] = tmp;
               for (i = 0; i < NUM_STATS; i++)
-                change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i));
+                change_attr_value (&stats, i, get_attr_value (&tmp->stats, i));
               /* these are the items that currently can change digestion, regeneration,
                * spell point recovery and mana point recovery.  Seems sort of an arbitary
                * list, but other items store other info into stats array.
                */
-              if ((tmp->type == WEAPON)  ||
+              if ((tmp->type == WEAPON)  || (tmp->type == BOW)    ||
                   (tmp->type == ARMOUR)  || (tmp->type == HELMET) ||
                   (tmp->type == SHIELD)  || (tmp->type == RING)   ||
                   (tmp->type == BOOTS)   || (tmp->type == GLOVES) ||
                   (tmp->type == AMULET)  || (tmp->type == GIRDLE) ||
                   (tmp->type == BRACERS) || (tmp->type == CLOAK)  ||
               body_used[i] += tmp->body_info[i];
           if (tmp->type == SYMPTOM)
             {
               speed_reduce_from_disease = tmp->last_sp / 100.0;
               if (speed_reduce_from_disease == 0)
                 speed_reduce_from_disease = 1;
             }
           /* Pos. and neg. protections are counted seperate (-> pro/vuln).
           /* There may be other things that should not adjust the attacktype */
           if (tmp->type != BOW && tmp->type != SYMPTOM)
             attacktype |= tmp->attacktype;
-          path_attuned |= tmp->path_attuned;
+          path_attuned  |= tmp->path_attuned;
           path_repelled |= tmp->path_repelled;
-          path_denied |= tmp->path_denied;
+          path_denied   |= tmp->path_denied;
+          move_type     |= tmp->move_type;
-          stats.luck += tmp->stats.luck;
+          stats.luck    += tmp->stats.luck;
-          move_type |= tmp->move_type;
           if (QUERY_FLAG (tmp, FLAG_LIFESAVE    )) SET_FLAG (this, FLAG_LIFESAVE);
           if (QUERY_FLAG (tmp, FLAG_REFL_SPELL  )) SET_FLAG (this, FLAG_REFL_SPELL);
           if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
           if (QUERY_FLAG (tmp, FLAG_STEALTH     )) SET_FLAG (this, FLAG_STEALTH);
               case HELMET:
               case BOOTS:
               case GLOVES:
               case CLOAK:
                 if (tmp->stats.wc)
-                  wc -= (tmp->stats.wc + tmp->magic);
+                  wc -= tmp->stats.wc + tmp->magic;
                 if (tmp->stats.dam)
-                  stats.dam += (tmp->stats.dam + tmp->magic);
+                  stats.dam += tmp->stats.dam + tmp->magic;
                 if (tmp->stats.ac)
-                  ac -= (tmp->stats.ac + tmp->magic);
+                  ac -= tmp->stats.ac + tmp->magic;
                 break;
+              case BOW:
               case WEAPON:
-                wc -= (tmp->stats.wc + tmp->magic);
+                wc -= tmp->stats.wc + tmp->magic;
                 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
                   ac -= tmp->stats.ac + tmp->magic;
-                stats.dam += (tmp->stats.dam + tmp->magic);
+                stats.dam += tmp->stats.dam + tmp->magic;
                 weapon_weight = tmp->weight;
                 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
                 if (weapon_speed < 0)
                   weapon_speed = 0;
        * monster bonus the same as before. -b.t.
        */
       if (type == PLAYER && wc_obj && wc_obj->level > 1)
         {
-          wc -= (wc_obj->level + thaco_bonus[stats.Str]);
+          wc -= wc_obj->level + thaco_bonus[stats.Str];
           for (i = 1; i < wc_obj->level; i++)
             {
               /* addtional wc every 6 levels */
               if (!(i % 6))
                 wc--;
               /* addtional dam every 4 levels. */
-              if (!(i % 4) && (dam_bonus[stats.Str] >= 0))
+              if (!(i % 4) && dam_bonus[stats.Str] >= 0)
-                stats.dam += (1 + (dam_bonus[stats.Str] / 5));
+                stats.dam += 1 + dam_bonus[stats.Str] / 5;
             }
         }
       else
-        wc -= (level + thaco_bonus[stats.Str]);
+        wc -= level + thaco_bonus[stats.Str];
       stats.dam += dam_bonus[stats.Str];
       if (stats.dam < 1)
         stats.dam = 1;
  * these last two values are only used for players.
  */
 void
 change_exp (object *op, sint64 exp, const char *skill_name, int flag)
 {
 #ifdef EXP_DEBUG
   LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
 #endif
   /* safety */
 /* Applies a death penalty experience, the size of this is defined by the
  * settings death_penalty_percentage and death_penalty_levels, and by the
  * amount of permenent experience, whichever gives the lowest loss.
  */
 void
 apply_death_exp_penalty (object *op)
 {
   object *tmp;
   sint64 loss;

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.35 by root, Wed Mar 14 04:12:27 2007 UTC vs. Revision 1.39 by root, Sun Apr 29 14:39:55 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.35 by root, Wed Mar 14 04:12:27 2007 UTC vs.
Revision 1.39 by root, Sun Apr 29 14:39:55 2007 UTC