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

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

diff --git a/src/artifact.c b/src/artifact.c
index 5224ce9..e2b9caf 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2232,8 +2232,9 @@ static bool activate_dragon_breath(object_type *o_ptr)
  */
 bool activate_random_artifact(object_type *o_ptr)
 {
-       int plev = p_ptr->lev;
-       int k, dir, dummy = 0;
+       PLAYER_LEVEL plev = p_ptr->lev;
+       int k, dummy = 0;
+       DIRECTION dir;
        cptr name = k_name + k_info[o_ptr->k_idx].name;
        const activation_type* const act_ptr = find_activation_info(o_ptr);
 
@@ -2972,7 +2973,7 @@ bool activate_random_artifact(object_type *o_ptr)
                                }
                                for (; i < EATER_EXT*3; i++)
                                {
-                                       int k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2);
+                                       KIND_OBJECT_IDX k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2);
                                        p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE*3 : p_ptr->magic_num2[i]*EATER_ROD_CHARGE/3)*k_info[k_idx].pval;
                                        if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0;
                                }
@@ -3439,7 +3440,8 @@ bool activate_random_artifact(object_type *o_ptr)
                /* Unique activation */
                case ACT_CAST_OFF:
                {
-                       int inv, o_idx, t;
+                       int inv, t;
+                       OBJECT_IDX o_idx;
                        char o_name[MAX_NLEN];
                        object_type forge;
 
@@ -3474,7 +3476,7 @@ bool activate_random_artifact(object_type *o_ptr)
                        (void)set_shero(p_ptr->shero + t, FALSE);
                        if (p_ptr->pclass == CLASS_FORCETRAINER)
                        {
-                               p_ptr->magic_num1[0] = plev * 5 + 190;
+                               P_PTR_KI = plev * 5 + 190;
                                msg_print(_("気が爆発寸前になった。", "Your force are immediatly before explosion."));
                        }
 
@@ -3900,7 +3902,7 @@ int calc_arm_avgdamage(object_type *o_ptr)
        u32b flgs[TR_FLAG_SIZE];
        object_flags(o_ptr, flgs);
 
-       int dam, base, s_evil, forced, vorpal;
+       HIT_POINT dam, base, s_evil, forced, vorpal;
        dam = base = s_evil = forced = vorpal = 0;
 
        dam = base = (o_ptr->dd * o_ptr->ds + o_ptr->dd) / 2;
@@ -3984,7 +3986,7 @@ static int suppression_evil_dam(object_type *o_ptr)
 
 static int weakening_artifact(object_type *o_ptr)
 {
-        int k_idx = lookup_kind(o_ptr->sval, o_ptr->tval);
+        KIND_OBJECT_IDX k_idx = lookup_kind(o_ptr->sval, o_ptr->tval);
         object_kind *k_ptr = &k_info[k_idx];
 
         if ((k_ptr->dd < o_ptr->dd) || (k_ptr->ds < o_ptr->ds))