[Refactor] #38997 calc_android_exp() に player_type * 引数を追加．

diff --git a/src/bldg.c b/src/bldg.c
index f3bdc7c..f60b4e7 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3131,7 +3131,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        o_ptr->discount = 99;
 
        p_ptr->total_weight += o_ptr->weight;
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Decrease material object */
        inven_item_increase(mater, -1);
@@ -3254,7 +3254,7 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C
                /* Charge the money */
                p_ptr->au -= (cost * o_ptr->number);
 
-               if (item >= INVEN_RARM) calc_android_exp();
+               if (item >= INVEN_RARM) calc_android_exp(p_ptr);
 
                /* Something happened */
                return (TRUE);

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 5205b84..4a39308 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -618,7 +618,7 @@ void exe_activate(player_type *user_ptr, INVENTORY_IDX item)
                        if (!success)
                                msg_print(_("おっと、解放に失敗した。", "Oops.  You failed to release your pet."));
                }
-               calc_android_exp();
+               calc_android_exp(p_ptr);
                return;
        }
 
@@ -1764,7 +1764,7 @@ bool activate_artifact(object_type *o_ptr)
                if (o_ptr->name1 != ART_BLOOD) return FALSE;
                msg_print(_("鎌が明るく輝いた...", "Your scythe glows brightly!"));
                get_bloody_moon_flags(o_ptr);
-               if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
+               if (p_ptr->prace == RACE_ANDROID) calc_android_exp(p_ptr);
                p_ptr->update |= (PU_BONUS | PU_HP);
                break;
        }

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 07ae5ea..4c9b2ff 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -2821,7 +2821,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
        else if (equiped_item)
        {
                kamaenaoshi(item);
-               calc_android_exp();
+               calc_android_exp(p_ptr);
        }
 
        if (do_drop)

diff --git a/src/cmd-dump.c b/src/cmd-dump.c
index 126459f..91ac6c5 100644 (file)
--- a/src/cmd-dump.c
+++ b/src/cmd-dump.c
@@ -1014,7 +1014,7 @@ void do_cmd_redraw(void)
 
        handle_stuff();
 
-       if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
+       if (p_ptr->prace == RACE_ANDROID) calc_android_exp(p_ptr);
 
 
        /* Redraw every window */

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 65f9139..8d3aca4 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -456,7 +456,7 @@ void do_cmd_wield(void)
        p_ptr->redraw |= (PR_EQUIPPY);
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 }
 
 /*!
@@ -576,7 +576,7 @@ void do_cmd_takeoff(void)
        /* Take off the item */
        (void)inven_takeoff(item, 255);
        kamaenaoshi(item);
-       calc_android_exp();
+       calc_android_exp(p_ptr);
        p_ptr->redraw |= (PR_EQUIPPY);
 }
 
@@ -626,7 +626,7 @@ void do_cmd_drop(void)
        if (item >= INVEN_RARM)
        {
                kamaenaoshi(item);
-               calc_android_exp();
+               calc_android_exp(p_ptr);
        }
 
        p_ptr->redraw |= (PR_EQUIPPY);
@@ -824,7 +824,7 @@ void do_cmd_destroy(void)
        if (q_ptr->to_a != 0 || q_ptr->to_d != 0 || q_ptr->to_h != 0)
                chg_virtue(V_HARMONY, 1);
 
-       if (item >= INVEN_RARM) calc_android_exp();
+       if (item >= INVEN_RARM) calc_android_exp(p_ptr);
 }
 
 

diff --git a/src/core.c b/src/core.c
index 0f9c2e7..f8601df 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5582,7 +5582,7 @@ void play_game(bool new_game)
        /* Hack -- Enforce "delayed death" */
        if (p_ptr->chp < 0) p_ptr->is_dead = TRUE;
 
-       if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
+       if (p_ptr->prace == RACE_ANDROID) calc_android_exp(p_ptr);
 
        if (new_game && ((p_ptr->pclass == CLASS_CAVALRY) || (p_ptr->pclass == CLASS_BEASTMASTER)))
        {

diff --git a/src/player-damage.c b/src/player-damage.c
index 5d1d097..ca5a789 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -408,7 +408,7 @@ static bool acid_minus_ac(void)
        p_ptr->update |= (PU_BONUS);
        p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Item was damaged */
        return (TRUE);

diff --git a/src/player-effects.c b/src/player-effects.c
index 7d4d863..e399170 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -3936,17 +3936,17 @@ void gain_exp(s32b amount)
 }
 
 
-void calc_android_exp(void)
+void calc_android_exp(player_type *creature_ptr)
 {
        int i;
        u32b total_exp = 0;
-       if (p_ptr->is_dead) return;
+       if (creature_ptr->is_dead) return;
 
-       if (p_ptr->prace != RACE_ANDROID) return;
+       if (creature_ptr->prace != RACE_ANDROID) return;
 
        for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
        {
-               object_type *o_ptr = &p_ptr->inventory_list[i];
+               object_type *o_ptr = &creature_ptr->inventory_list[i];
                object_type forge;
                object_type *q_ptr = &forge;
                u32b value, exp;
@@ -3995,7 +3995,7 @@ void calc_android_exp(void)
                value = object_value_real(q_ptr);
 
                if (value <= 0) continue;
-               if ((o_ptr->tval == TV_SOFT_ARMOR) && (o_ptr->sval == SV_ABUNAI_MIZUGI) && (p_ptr->pseikaku != SEIKAKU_SEXY)) value /= 32;
+               if ((o_ptr->tval == TV_SOFT_ARMOR) && (o_ptr->sval == SV_ABUNAI_MIZUGI) && (creature_ptr->pseikaku != SEIKAKU_SEXY)) value /= 32;
                if (value > 5000000L) value = 5000000L;
                if ((o_ptr->tval == TV_DRAG_ARMOR) || (o_ptr->tval == TV_CARD)) level /= 2;
 
@@ -4024,7 +4024,7 @@ void calc_android_exp(void)
                else total_exp += exp / 16;
                if (i == INVEN_BODY) total_exp += exp / 32;
        }
-       p_ptr->exp = p_ptr->max_exp = total_exp;
+       creature_ptr->exp = creature_ptr->max_exp = total_exp;
 
        /* Check Experience */
        check_experience();

diff --git a/src/player-effects.h b/src/player-effects.h
index 095e5dd..d9ba47d 100644 (file)
--- a/src/player-effects.h
+++ b/src/player-effects.h
@@ -68,7 +68,7 @@ extern bool restore_level(player_type *creature_ptr);
 extern bool lose_all_info(player_type *creature_ptr);
 extern void gain_exp_64(s32b amount, u32b amount_frac);
 extern void gain_exp(s32b amount);
-extern void calc_android_exp(void);
+extern void calc_android_exp(player_type *creature_ptr);
 extern void lose_exp(s32b amount);
 extern bool drain_exp(s32b drain, s32b slip, int hold_exp_prob);
 extern void do_poly_self(void);

diff --git a/src/spells-object.c b/src/spells-object.c
index a71fd10..dae3841 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -771,7 +771,7 @@ bool rustproof(void)
        msg_format("%s %s %s now protected against corrosion.", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "are" : "is"));
 #endif
 
-       calc_android_exp();
+       calc_android_exp(p_ptr);
        return TRUE;
 }
 
@@ -1082,7 +1082,7 @@ bool bless_weapon(void)
 
        p_ptr->update |= (PU_BONUS);
        p_ptr->window |= (PW_EQUIP | PW_PLAYER);
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        return TRUE;
 }
@@ -1136,7 +1136,7 @@ bool pulish_shield(void)
                msg_print(_("失敗した。", "Failed."));
                chg_virtue(V_ENCHANT, -2);
        }
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        return FALSE;
 }
@@ -1265,7 +1265,7 @@ bool enchant(object_type *o_ptr, int n, int eflag)
        p_ptr->update |= (PU_BONUS | PU_COMBINE | PU_REORDER);
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Success */
        return (TRUE);
@@ -1325,7 +1325,7 @@ bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac)
        else
                chg_virtue(V_ENCHANT, 1);
 
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Something happened */
        return (TRUE);
@@ -1473,5 +1473,5 @@ void brand_weapon(int brand_type)
                msg_print(_("属性付加に失敗した。", "The Branding failed."));
                chg_virtue(V_ENCHANT, -2);
        }
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 }

diff --git a/src/spells3.c b/src/spells3.c
index fdd4249..af3c53c 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1018,7 +1018,7 @@ bool apply_disenchant(BIT_FLAGS mode)
                p_ptr->update |= (PU_BONUS);
                p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
-               calc_android_exp();
+               calc_android_exp(p_ptr);
        }
 
        return (TRUE);
@@ -1672,7 +1672,7 @@ bool artifact_scroll(void)
                chg_virtue(V_ENCHANT, 1);
        }
 
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Something happened */
        return (TRUE);
@@ -1831,7 +1831,7 @@ bool mundane_spell(bool only_equip)
                o_ptr->inscription = inscription;
                if (item >= 0) p_ptr->total_weight += (o_ptr->weight - weight);
        }
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Something happened */
        return TRUE;

diff --git a/src/store.c b/src/store.c
index 514cff9..294ce10 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -5181,7 +5181,7 @@ static void store_sell(void)
 
        if ((choice == 0) && (item >= INVEN_RARM))
        {
-               calc_android_exp();
+               calc_android_exp(p_ptr);
                kamaenaoshi(item);
        }
 }