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

diff --git a/src/cave.c b/src/cave.c
index 026dbd8..64414fb 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -4546,7 +4546,7 @@ void wiz_dark(void)
 /*
  * Change the "feat" flag for a grid, and notice/redraw the grid
  */
-void cave_set_feat(POSITION y, POSITION x, IDX feat)
+void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 {
        cave_type *c_ptr = &cave[y][x];
        feature_type *f_ptr = &f_info[feat];

diff --git a/src/cmd1.c b/src/cmd1.c
index e6b7e67..4c32d90 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -853,7 +853,7 @@ bool player_can_enter(s16b feature, u16b mode)
  * @param mpe_mode 移動オプションフラグ
  * @return プレイヤーが死亡やフロア離脱を行わず、実際に移動が可能ならばTRUEを返す。
  */
-bool move_player_effect(POSITION ny, POSITION nx, u32b mpe_mode)
+bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
 {
        cave_type *c_ptr = &cave[ny][nx];
        feature_type *f_ptr = &f_info[c_ptr->feat];

diff --git a/src/externs.h b/src/externs.h
index 8974ab1..62e660e 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -503,7 +503,7 @@ extern void update_smell(void);
 extern void map_area(POSITION range);
 extern void wiz_lite(bool ninja);
 extern void wiz_dark(void);
-extern void cave_set_feat(POSITION y, POSITION x, IDX feat);
+extern void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat);
 extern IDX conv_dungeon_feat(IDX newfeat);
 extern IDX feat_state(IDX feat, int action);
 extern void cave_alter_feat(POSITION y, POSITION x, int action);
@@ -523,7 +523,7 @@ extern bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, POSITION y, POSITI
 extern bool cave_player_teleportable_bold(POSITION y, POSITION x, BIT_FLAGS mode);
 
 /* cmd1.c */
-extern bool test_hit_norm(int chance, int ac, int vis);
+extern bool test_hit_norm(int chance, ARMOUR_CLASS ac, int vis);
 extern HIT_POINT critical_shot(int weight, int plus_ammo, int plus_bow, HIT_POINT dam);
 extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown);
 extern void search(void);
@@ -531,7 +531,7 @@ extern void py_pickup_aux(OBJECT_IDX o_idx);
 extern void carry(bool pickup);
 extern bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
 extern bool player_can_enter(s16b feature, u16b mode);
-extern bool move_player_effect(POSITION ny, POSITION nx, u32b mpe_mode);
+extern bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
 extern bool trap_can_be_ignored(int feat);
 extern void move_player(DIRECTION dir, bool do_pickup, bool break_trap);
 extern void run_step(DIRECTION dir);

diff --git a/src/melee1.c b/src/melee1.c
index bb34903..614fb4f 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;
 

diff --git a/src/object2.c b/src/object2.c
index 3929934..d7746df 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6954,7 +6954,7 @@ static int blow_damcalc(monster_type *m_ptr, monster_blow *blow_ptr)
 
        if (blow_ptr->method != RBM_EXPLODE)
        {
-               int ac = p_ptr->ac + p_ptr->to_a;
+               ARMOUR_CLASS ac = p_ptr->ac + p_ptr->to_a;
 
                switch (blow_ptr->effect)
                {

diff --git a/src/trap.c b/src/trap.c
index e72683d..8dfe430 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -42,7 +42,7 @@ void init_normal_traps(void)
 * Actually, it is not this routine, but the "trap instantiation"\n\r
 * code, which should also check for "trap doors" on quest levels.\n\r
 */\r
-s16b choose_random_trap(void)\r
+FEAT_IDX choose_random_trap(void)\r
 {\r
        FEAT_IDX feat;\r
 \r

diff --git a/src/trap.h b/src/trap.h
index b9940b7..400f235 100644 (file)
--- a/src/trap.h
+++ b/src/trap.h
@@ -1,6 +1,6 @@
 \r
 extern void init_normal_traps(void);\r
-extern s16b choose_random_trap(void);\r
+extern FEAT_IDX choose_random_trap(void);\r
 extern void disclose_grid(POSITION y, POSITION x);\r
 extern void place_trap(POSITION y, POSITION x);\r
 extern void hit_trap(bool break_trap);\r

diff --git a/src/xtra1.c b/src/xtra1.c
index 7a6c2d6..0034f4b 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -4524,7 +4524,7 @@ void calc_bonuses(void)
                }
                for (i = INVEN_RARM; i <= INVEN_FEET; i++)
                {
-                       int ac = 0;
+                       ARMOUR_CLASS ac = 0;
                        o_ptr = &inventory[i];
                        if (!o_ptr->k_idx) continue;
                        if (!object_is_armour(o_ptr)) continue;