[Refactor] #37287 #37353 型の置換。 / Type replacement.

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

diff --git a/src/melee1.c b/src/melee1.c
index 953c213..8b41721 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -25,7 +25,7 @@
  * @return 命中と判定された場合TRUEを返す
  * @note Always miss 5%, always hit 5%, otherwise random.
  */
-bool test_hit_norm(int chance, int ac, int vis)
+bool test_hit_norm(int chance, ARMOUR_CLASS ac, int vis)
 {
        int k;
 
@@ -62,7 +62,7 @@ bool test_hit_norm(int chance, int ac, int vis)
 * @param mode オプションフラグ
 * @return クリティカル修正が入ったダメージ値
 */
-HIT_POINT critical_norm(int weight, int plus, HIT_POINT dam, s16b meichuu, BIT_FLAGS mode)
+HIT_POINT critical_norm(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, BIT_FLAGS mode)
 {
        int i, k;
 
@@ -116,7 +116,7 @@ HIT_POINT critical_norm(int weight, int plus, HIT_POINT dam, s16b meichuu, BIT_F
  * and which also do at least 20 damage, or, sometimes, N damage.
  * This is used only to determine "cuts" and "stuns".
  */
-static int monster_critical(int dice, int sides, HIT_POINT dam)
+static int monster_critical(DICE_NUMBER dice, DICE_SID sides, HIT_POINT dam)
 {
        int max = 0;
        int total = dice * sides;
@@ -463,7 +463,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
        bool            can_drain = FALSE;
        int             num_blow;
        int             drain_left = MAX_VAMPIRIC_DRAIN;
-       u32b flgs[TR_FLAG_SIZE]; /* A massive hack -- life-draining weapons */
+       BIT_FLAGS flgs[TR_FLAG_SIZE]; /* A massive hack -- life-draining weapons */
        bool            is_human = (r_ptr->d_char == 'p');
        bool            is_lowlevel = (r_ptr->level < (p_ptr->lev - 15));
        bool            zantetsu_mukou, e_j_mukou;
@@ -667,7 +667,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
                                int min_level = 1;
                                const martial_arts *ma_ptr = &ma_blows[0], *old_ptr = &ma_blows[0];
                                int resist_stun = 0;
-                               int weight = 8;
+                               WEIGHT weight = 8;
 
                                if (r_ptr->flags1 & RF1_UNIQUE) resist_stun += 88;
                                if (r_ptr->flags3 & RF3_NO_STUN) resist_stun += 66;