#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

[hengband/hengband.git] / src / effects.c

diff --git a/src/effects.c b/src/effects.c
index 34a174f..bf01018 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -297,7 +297,7 @@ void dispel_player(void)
  * @param do_dec 現在の継続時間より長い値のみ上書きする
  * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
  */
-bool set_mimic(TIME_EFFECT v, int p, bool do_dec)
+bool set_mimic(TIME_EFFECT v, IDX p, bool do_dec)
 {
        bool notice = FALSE;
 
@@ -316,7 +316,7 @@ bool set_mimic(TIME_EFFECT v, int p, bool do_dec)
                else if ((!p_ptr->tim_mimic) || (p_ptr->mimic_form != p))
                {
                        msg_print(_("自分の体が変わってゆくのを感じた。", "You feel that your body changes."));
-                       p_ptr->mimic_form=p;
+                       p_ptr->mimic_form = p;
                        notice = TRUE;
                }
        }
@@ -3728,7 +3728,8 @@ bool inc_stat(int stat)
  */
 bool dec_stat(int stat, int amount, int permanent)
 {
-       int cur, max, loss, same, res = FALSE;
+       BASE_STATUS cur, max;
+       int loss, same, res = FALSE;
 
 
        /* Acquire current value */
@@ -4188,7 +4189,7 @@ void do_poly_wounds(void)
 /*
  * Change player race
  */
-void change_race(int new_race, cptr effect_msg)
+void change_race(CHARACTER_IDX new_race, cptr effect_msg)
 {
        cptr title = race_info[new_race].title;
        int  old_race = p_ptr->prace;
@@ -4260,7 +4261,7 @@ void do_poly_self(void)
        if ((power > randint0(20)) && one_in_(3) && (p_ptr->prace != RACE_ANDROID))
        {
                char effect_msg[80] = "";
-               int new_race;
+               CHARACTER_IDX new_race;
 
                /* Some form of racial polymorph... */
                power -= 10;
@@ -4327,7 +4328,7 @@ void do_poly_self(void)
 
                do
                {
-                       new_race = randint0(MAX_RACES);
+                       new_race = (CHARACTER_IDX)randint0(MAX_RACES);
                }
                while ((new_race == p_ptr->prace) || (new_race == RACE_ANDROID));