[Refactor] #40577 Moved player_has_los_bold() from floor.h to cave.c/h

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index aa82475..cfd807f 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -16,8 +16,9 @@
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
-#include "floor/floor-object.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
+#include "floor/floor-object.h"
 #include "game-option/disturbance-options.h"
 #include "game-option/text-display-options.h"
 #include "grid/grid.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index 3361b6d..3f0f2ff 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -2,8 +2,8 @@
 #include "autopick/autopick.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
+#include "floor/cave.h"
 #include "floor/floor-object.h"
-#include "floor/floor.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster/monster-info.h"

diff --git a/src/floor/cave.c b/src/floor/cave.c
index 49a19b8..4055861 100644 (file)
--- a/src/floor/cave.c
+++ b/src/floor/cave.c
@@ -32,3 +32,11 @@ bool cave_have_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_
 {
     return have_flag(f_info[floor_ptr->grid_array[y][x].feat].flags, f_idx);
 }
+
+/*
+ * Determine if a "legal" grid is within "los" of the player
+ */
+bool player_has_los_bold(player_type *player_ptr, POSITION y, POSITION x)
+{
+    return ((player_ptr->current_floor_ptr->grid_array[y][x].info & CAVE_VIEW) != 0) || player_ptr->phase_out;
+}

diff --git a/src/floor/cave.h b/src/floor/cave.h
index ee839df..bf4e4f6 100644 (file)
--- a/src/floor/cave.h
+++ b/src/floor/cave.h
@@ -7,3 +7,4 @@ bool in_bounds(floor_type *floor_ptr, POSITION y, POSITION x);
 bool in_bounds2(floor_type *floor_ptr, POSITION y, POSITION x);
 bool in_bounds2u(floor_type *floor_ptr, POSITION y, POSITION x);
 bool cave_have_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_flag_type f_idx);
+bool player_has_los_bold(player_type *player_ptr, POSITION y, POSITION x);

diff --git a/src/floor/floor.h b/src/floor/floor.h
index 5832128..bdbd2d4 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -104,15 +104,6 @@ extern floor_type floor_info;
     (((C)->info & (CAVE_VIEW)) != 0)
 
 /*
- * Determine if a "legal" grid is within "los" of the player
- *
- * Note the use of comparison to zero to force a "boolean" result
- */
-#define player_has_los_bold(C,Y,X) \
-    ((((C)->current_floor_ptr->grid_array[Y][X].info & (CAVE_VIEW)) != 0) || (C)->phase_out)
-
-
-/*
  * Determine if a "feature" is "permanent wall"
  */
 #define permanent_wall(F) \

diff --git a/src/floor/geometry.c b/src/floor/geometry.c
index c635d0d..f542b82 100644 (file)
--- a/src/floor/geometry.c
+++ b/src/floor/geometry.c
@@ -1,4 +1,5 @@
 #include "floor/geometry.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/text-display-options.h"
 #include "grid/feature.h"

diff --git a/src/mind/mind-switcher.c b/src/mind/mind-switcher.c
index d7039f2..184f5ef 100644 (file)
--- a/src/mind/mind-switcher.c
+++ b/src/mind/mind-switcher.c
@@ -28,6 +28,7 @@
 #include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"
 #include "game-option/input-options.h"

diff --git a/src/monster-floor/monster-object.c b/src/monster-floor/monster-object.c
index 53b411c..3fc0de4 100644 (file)
--- a/src/monster-floor/monster-object.c
+++ b/src/monster-floor/monster-object.c
@@ -7,7 +7,7 @@
 #include "monster-floor/monster-object.h"
 #include "flavor/flavor-describer.h"
 #include "floor/floor-object.h"
-#include "floor/floor.h"
+#include "floor/cave.h"
 #include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/monster-floor/monster-runaway.c b/src/monster-floor/monster-runaway.c
index cd1f097..4e301ff 100644 (file)
--- a/src/monster-floor/monster-runaway.c
+++ b/src/monster-floor/monster-runaway.c
@@ -7,6 +7,7 @@
 #include "monster-floor/monster-runaway.h"
 #include "core/disturbance.h"
 #include "dungeon/quest.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "monster-race/monster-race.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index b7f76c3..b14e417 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -9,6 +9,7 @@
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index c4901e2..bc0a114 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -11,6 +11,7 @@
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/mspell/mspell-learn-checker.c b/src/mspell/mspell-learn-checker.c
index 2a32e04..cf8c356 100644 (file)
--- a/src/mspell/mspell-learn-checker.c
+++ b/src/mspell/mspell-learn-checker.c
@@ -1,5 +1,5 @@
 #include "mspell-learn-checker.h"
-#include "floor/floor.h"
+#include "floor/cave.h"
 #include "grid/grid.h"
 #include "system/floor-type-definition.h"
 #include "world/world.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index 7d67afc..ed32818 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -3,6 +3,7 @@
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "grid/grid.h"

diff --git a/src/spell-kind/spells-world.c b/src/spell-kind/spells-world.c
index 794ea5b..38bc9e4 100644 (file)
--- a/src/spell-kind/spells-world.c
+++ b/src/spell-kind/spells-world.c
@@ -4,6 +4,7 @@
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/cave.h"
 #include "floor/floor-save.h"
 #include "floor/floor-town.h"
 #include "floor/floor.h"