Changeset 998

Timestamp:

10/01/08 01:57:25 (3 months ago)

Author:

takkaria

Message:

Separate out the "calculation" of "bonuses" from the "updating" in player/calcs.c.

Files:

• trunk/src/player/calcs.c (modified) (5 diffs)
• trunk/src/player/types.h (modified) (2 diffs)

trunk/src/player/calcs.c

@@ -618 +618 @@
- * damage, since that would affect non-combat things.  These values
- * are actually added in later, at the appropriate place.
- *
- * This function induces various "status" messages.
- */
-void
+object_type inventory[]
-{
-        int i, j, hold;
-
-        int old_speed;
-
-        int old_telepathy;
-        int old_see_inv;
-
-        int old_dis_ac;
-        int old_dis_to_a;
-
-        int extra_blows;
@@ -637 +627 @@
-        int extra_might;
-
-        int old_stat_top[A_MAX];
-        int old_stat_use[A_MAX];
-        int old_stat_ind[A_MAX];
-
-        bool old_heavy_shoot;
-        bool old_heavy_wield;
-        bool old_icky_wield;
-
-        object_type *o_ptr;
-
-        u32b f1, f2, f3;
-
-
-        /*** Memorize ***/
-
-        /* Save the old speed */
-        old_speed = p_ptr->pspeed;
-
-        /* Save the old vision stuff */
-        old_telepathy = p_ptr->telepathy;
-        old_see_inv = p_ptr->see_inv;
-
-        /* Save the old armor class */
-        old_dis_ac = p_ptr->dis_ac;
-        old_dis_to_a = p_ptr->dis_to_a;
-
-        /* Save the old stats */
-        for (i = 0; i < A_MAX; i++)
-        {
-                old_stat_top[i] = p_ptr->stat_top[i];
-                old_stat_use[i] = p_ptr->stat_use[i];
-                old_stat_ind[i] = p_ptr->stat_ind[i];
-        }
-
-        old_heavy_shoot = p_ptr->heavy_shoot;
-        old_heavy_wield = p_ptr->heavy_wield;
-        old_icky_wield = p_ptr->icky_wield;
-
-
@@ -1331 +1287 @@
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Analyze stats */
@@ -1380 +1396 @@
-        }
-
+
-        /* Hack -- Telepathy Change */
-        if (p_ptr->telepathy != old_telepathy)
@@ -1522 +1539 @@
-        {
-                p_ptr->update &= ~(PU_BONUS);
-calc
+update
-        }
-

trunk/src/player/types.h

@@ -142 +142 @@
-        s16b stat_top[A_MAX];   /* Maximal modified stats */
-
+
+        /* Generation fields (for quick start) */
+        s32b au_birth;          /* Birth gold */
+        s16b stat_birth[A_MAX]; /* Birth "natural" stat values */
+        s16b ht_birth;          /* Birth Height */
+        s16b wt_birth;          /* Birth Weight */
+
+
-        /*** Extracted fields ***/
+
+        s16b pspeed;            /* Current speed */
+
+        s16b num_blow;          /* Number of blows */
+        s16b num_fire;          /* Number of shots */
+
+        byte ammo_mult;         /* Ammo multiplier */
+        byte ammo_tval;         /* Ammo variety */
-
-        s16b stat_add[A_MAX];   /* Equipment stat bonuses */
-        s16b stat_ind[A_MAX];   /* Indexes into stat tables */
+
+        s16b dis_ac;            /* Known base ac */
+        s16b ac;                        /* Base ac */
+
+        s16b dis_to_a;          /* Known bonus to ac */
+        s16b to_a;                      /* Bonus to ac */
+
+        s16b to_h;                      /* Bonus to hit */
+        s16b dis_to_h;          /* Known bonus to hit */
+
+        s16b to_d;                      /* Bonus to dam */
+        s16b dis_to_d;          /* Known bonus to dam */
+
+        s16b see_infra;         /* Infravision range */
+
+        s16b skills[SKILL_MAX]; /* Skills */
+
+        u32b noise;                     /* Derived from stealth */
-
-        bool vuln_acid;
@@ -199 +233 @@
-
-        bool bless_blade;       /* Blessed blade */
-
-        s16b dis_to_h;          /* Known bonus to hit */
-        s16b dis_to_d;          /* Known bonus to dam */
-        s16b dis_to_a;          /* Known bonus to ac */
-
-        s16b dis_ac;            /* Known base ac */
-
-        s16b to_h;                      /* Bonus to hit */
-        s16b to_d;                      /* Bonus to dam */
-        s16b to_a;                      /* Bonus to ac */
-
-        s16b ac;                        /* Base ac */
-
-        s16b see_infra;         /* Infravision range */
-
-        s16b skills[SKILL_MAX]; /* Skills */
-
-        u32b noise;                     /* Derived from stealth */
-
-        s16b num_blow;          /* Number of blows */
-        s16b num_fire;          /* Number of shots */
-
-        byte ammo_mult;         /* Ammo multiplier */
-
-        byte ammo_tval;         /* Ammo variety */
-
-        s16b pspeed;            /* Current speed */
-
-        /* Generation fields (for quick start) */
-        s32b au_birth;          /* Birth gold */
-        s16b stat_birth[A_MAX]; /* Birth "natural" stat values */
-        s16b ht_birth;          /* Birth Height */
-        s16b wt_birth;          /* Birth Weight */
-};
-