[Refactor] #40514 have_pass_wall() を返り値持ちに仕様変更. / have_pass_wall() was changed specif...

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index 942263b..ed2f1b8 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -50,28 +50,22 @@ void have_kill_wall(player_type *creature_ptr)
     }
 }
 
-void have_pass_wall(player_type *creature_ptr)
+bool have_pass_wall(player_type *creature_ptr)
 {
-    creature_ptr->pass_wall = FALSE;
+    bool pow = FALSE;
 
-    if (creature_ptr->wraith_form) {
-        creature_ptr->pass_wall = TRUE;
-    }
-
-    if (creature_ptr->tim_pass_wall) {
-        creature_ptr->pass_wall = TRUE;
-    }
-
-    if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_SPECTRE) {
-        creature_ptr->pass_wall = TRUE;
+    if (creature_ptr->wraith_form || creature_ptr->tim_pass_wall || (!creature_ptr->mimic_form && creature_ptr->prace == RACE_SPECTRE)) {
+        pow = TRUE;
     }
 
     if (creature_ptr->riding) {
         monster_type *riding_m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding];
         monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx];
         if (!(riding_r_ptr->flags2 & RF2_PASS_WALL))
-            creature_ptr->pass_wall = FALSE;
+            pow = FALSE;
     }
+
+       return pow;
 }
 
 void have_xtra_might(player_type *creature_ptr)

diff --git a/src/player/player-status-flags.h b/src/player/player-status-flags.h
index 5dbea52..cd54392 100644 (file)
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -1,6 +1,6 @@
 #include "player/player-status.h"
 
-void have_pass_wall(player_type *creature_ptr);
+bool have_pass_wall(player_type *creature_ptr);
 void have_kill_wall(player_type *creature_ptr);
 void have_xtra_might(player_type *creature_ptr);
 void have_esp_evil(player_type *creature_ptr);

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 800082a..4a56298 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -327,7 +327,7 @@ void calc_bonuses(player_type *creature_ptr)
     have_two_handed_weapons(creature_ptr);
     calc_weapon_weight_limit(creature_ptr);
 
-    have_pass_wall(creature_ptr);
+    creature_ptr->pass_wall = have_pass_wall(creature_ptr);
     have_kill_wall(creature_ptr);
     have_xtra_might(creature_ptr);
     have_esp_evil(creature_ptr);