[Refactor] #38997 trap_can_be_ignored() に player_type * 引数を追加．

diff --git a/src/player-move.c b/src/player-move.c
index 29dd8b8..2ea18f1 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -812,7 +812,7 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
  * @param feat 地形ID
  * @return トラップが自動的に無効ならばTRUEを返す
  */
-bool trap_can_be_ignored(FEAT_IDX feat)
+bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat)
 {
        feature_type *f_ptr = &f_info[feat];
 
@@ -824,28 +824,28 @@ bool trap_can_be_ignored(FEAT_IDX feat)
        case TRAP_PIT:
        case TRAP_SPIKED_PIT:
        case TRAP_POISON_PIT:
-               if (p_ptr->levitation) return TRUE;
+               if (creature_ptr->levitation) return TRUE;
                break;
        case TRAP_TELEPORT:
-               if (p_ptr->anti_tele) return TRUE;
+               if (creature_ptr->anti_tele) return TRUE;
                break;
        case TRAP_FIRE:
-               if (p_ptr->immune_fire) return TRUE;
+               if (creature_ptr->immune_fire) return TRUE;
                break;
        case TRAP_ACID:
-               if (p_ptr->immune_acid) return TRUE;
+               if (creature_ptr->immune_acid) return TRUE;
                break;
        case TRAP_BLIND:
-               if (p_ptr->resist_blind) return TRUE;
+               if (creature_ptr->resist_blind) return TRUE;
                break;
        case TRAP_CONFUSE:
-               if (p_ptr->resist_conf) return TRUE;
+               if (creature_ptr->resist_conf) return TRUE;
                break;
        case TRAP_POISON:
-               if (p_ptr->resist_pois) return TRUE;
+               if (creature_ptr->resist_pois) return TRUE;
                break;
        case TRAP_SLEEP:
-               if (p_ptr->free_act) return TRUE;
+               if (creature_ptr->free_act) return TRUE;
                break;
        }
 
@@ -1140,7 +1140,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
        /* Disarm a visible trap */
        else if ((do_pickup != easy_disarm) && have_flag(f_ptr->flags, FF_DISARM) && !g_ptr->mimic)
        {
-               if (!trap_can_be_ignored(g_ptr->feat))
+               if (!trap_can_be_ignored(p_ptr, g_ptr->feat))
                {
                        (void)do_cmd_disarm_aux(y, x, dir);
                        return;
@@ -1985,7 +1985,7 @@ static DIRECTION travel_test(DIRECTION prev_dir)
        if (!easy_open && is_closed_door(g_ptr->feat)) return (0);
 
        /* Visible and unignorable trap abort tarveling */
-       if (!g_ptr->mimic && !trap_can_be_ignored(g_ptr->feat)) return (0);
+       if (!g_ptr->mimic && !trap_can_be_ignored(p_ptr, g_ptr->feat)) return (0);
 
        /* Move new grid */
        return (new_dir);

diff --git a/src/player-move.h b/src/player-move.h
index 718775f..6781cce 100644 (file)
--- a/src/player-move.h
+++ b/src/player-move.h
@@ -22,7 +22,7 @@ extern bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
 
 extern void py_pickup_aux(OBJECT_IDX o_idx);
 extern bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
-extern bool trap_can_be_ignored(FEAT_IDX feat);
+extern bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat);
 extern void search(player_type *creature_ptr);
 extern void carry(bool pickup);
 #ifdef TRAVEL