#37287 #37353 (2.2.0.89) FLOOR_IDX 型を定義し、型の置換を継続中。 / Define FLOOR_IDX, ongoing type...

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

diff --git a/src/cmd1.c b/src/cmd1.c
index 8bacc4f..3cc9c44 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -364,12 +364,12 @@ HIT_POINT critical_norm(int weight, int plus, HIT_POINT dam, s16b meichuu, int m
  * @param m_ptr 目標モンスターの構造体参照ポインタ
  * @return スレイング加味後の倍率(/10倍)
  */
-static int mult_slaying(int mult, const u32b* flgs, const monster_type* m_ptr)
+static MULTIPLY mult_slaying(MULTIPLY mult, const BIT_FLAGS* flgs, const monster_type* m_ptr)
 {
        static const struct slay_table_t {
                int slay_flag;
-               u32b affect_race_flag;
-               int slay_mult;
+               BIT_FLAGS affect_race_flag;
+               MULTIPLY slay_mult;
                size_t flag_offset;
                size_t r_flag_offset;
        } slay_table[] = {
@@ -425,12 +425,12 @@ static int mult_slaying(int mult, const u32b* flgs, const monster_type* m_ptr)
  * @param m_ptr 目標モンスターの構造体参照ポインタ
  * @return スレイング加味後の倍率(/10倍)
  */
-static int mult_brand(int mult, const u32b* flgs, const monster_type* m_ptr)
+static MULTIPLY mult_brand(MULTIPLY mult, const BIT_FLAGS* flgs, const monster_type* m_ptr)
 {
        static const struct brand_table_t {
                int brand_flag;
-               u32b resist_mask;
-               u32b hurt_flag;
+               BIT_FLAGS resist_mask;
+               BIT_FLAGS hurt_flag;
        } brand_table[] = {
                {TR_BRAND_ACID, RFR_EFF_IM_ACID_MASK, 0U           },
                {TR_BRAND_ELEC, RFR_EFF_IM_ELEC_MASK, 0U           },
@@ -494,9 +494,9 @@ static int mult_brand(int mult, const u32b* flgs, const monster_type* m_ptr)
  */
 s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bool thrown)
 {
-       int mult = 10;
+       MULTIPLY mult = 10;
 
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        /* Extract the flags */
        object_flags(o_ptr, flgs);
@@ -950,7 +950,7 @@ static int check_hit(int power)
  */
 static void hit_trap_pit(int trap_feat_type)
 {
-       int dam;
+       HIT_POINT dam;
        cptr trap_name = "";
        cptr spike_name = "";
 
@@ -1368,7 +1368,7 @@ static void hit_trap(bool break_trap)
  * @return なし
  */
 static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_offset, int r_flags_offset, u32b aura_flag,
-                                int (*dam_func)(int dam, cptr kb_str, int monspell, bool aura), cptr message)
+                                int (*dam_func)(HIT_POINT dam, cptr kb_str, int monspell, bool aura), cptr message)
 {
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
@@ -1648,8 +1648,8 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
        {
                if ((r_ptr->level + 10) > p_ptr->lev)
                {
-                       int tval = inventory[INVEN_RARM+hand].tval - TV_WEAPON_BEGIN;
-                       int sval = inventory[INVEN_RARM+hand].sval;
+                       OBJECT_TYPE_VALUE tval = inventory[INVEN_RARM+hand].tval - TV_WEAPON_BEGIN;
+                       OBJECT_SUBTYPE_VALUE sval = inventory[INVEN_RARM+hand].sval;
                        int now_exp = p_ptr->weapon_exp[tval][sval];
                        if (now_exp < s_info[p_ptr->pclass].w_max[tval][sval])
                        {
@@ -1884,9 +1884,9 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
                                }
 
                                if (p_ptr->special_defense & KAMAE_SUZAKU) weight = 4;
-                               if ((p_ptr->pclass == CLASS_FORCETRAINER) && (p_ptr->magic_num1[0]))
+                               if ((p_ptr->pclass == CLASS_FORCETRAINER) && P_PTR_KI)
                                {
-                                       weight += (p_ptr->magic_num1[0]/30);
+                                       weight += (P_PTR_KI / 30);
                                        if (weight > 20) weight = 20;
                                }