[Refactor] #40569 Moved in_bound() from floor.h to cave.c/h

diff --git a/src/cmd-action/cmd-travel.c b/src/cmd-action/cmd-travel.c
index 1de5f8e..972ab15 100644 (file)
--- a/src/cmd-action/cmd-travel.c
+++ b/src/cmd-action/cmd-travel.c
@@ -1,7 +1,7 @@
 #include "cmd-action/cmd-travel.h"
 #include "action/travel-execution.h"
 #include "core/asking-player.h"
-#include "floor/floor.h"
+#include "floor/cave.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "io/targeting.h"

diff --git a/src/floor/cave.c b/src/floor/cave.c
index 3480227..85b3e43 100644 (file)
--- a/src/floor/cave.c
+++ b/src/floor/cave.c
@@ -12,6 +12,11 @@
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
 
+/*
+ * Determines if a map location is fully inside the outer walls
+ */
+bool in_bounds(floor_type *floor_ptr, POSITION y, POSITION x) { return (y > 0) && (x > 0) && (y < floor_ptr->height - 1) && (x < floor_ptr->width - 1); }
+
 bool cave_have_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_flag_type f_idx)
 {
     return have_flag(f_info[floor_ptr->grid_array[y][x].feat].flags, f_idx);

diff --git a/src/floor/cave.h b/src/floor/cave.h
index 9a2e613..26a7e71 100644 (file)
--- a/src/floor/cave.h
+++ b/src/floor/cave.h
@@ -3,4 +3,5 @@
 #include "system/angband.h"
 
 typedef enum feature_flag_type feature_flag_type;
+bool in_bounds(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);

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 92d78bd..389e52c 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -16,6 +16,7 @@
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/cave.h"
 #include "floor/floor-events.h"
 #include "floor/floor-generate.h"
 #include "floor/floor-save.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 188de17..13377c1 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -16,6 +16,7 @@
 #include "core/asking-player.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/cave.h"
 #include "floor/floor-events.h"
 #include "floor/floor-generate.h"
 #include "floor/floor-object.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 8c71a7a..42f328a 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -16,6 +16,7 @@
 #include "floor/floor-streams.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
+#include "floor/cave.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/floor-generate.h"

diff --git a/src/floor/floor.h b/src/floor/floor.h
index 498316e..fb90610 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -5,12 +5,6 @@
 extern floor_type floor_info;
 
 /*
- * Determines if a map location is fully inside the outer walls
- */
-#define in_bounds(F,Y,X) \
-   (((Y) > 0) && ((X) > 0) && ((Y) < (F)->height-1) && ((X) < (F)->width-1))
-
-/*
  * Determines if a map location is on or inside the outer walls
  */
 #define in_bounds2(F,Y,X) \

diff --git a/src/floor/object-scanner.c b/src/floor/object-scanner.c
index f63fc23..2b8bb59 100644 (file)
--- a/src/floor/object-scanner.c
+++ b/src/floor/object-scanner.c
@@ -1,6 +1,6 @@
 #include "floor/object-scanner.h"
+#include "floor/cave.h"
 #include "flavor/flavor-describer.h"
-#include "floor/floor.h"
 #include "game-option/text-display-options.h"
 #include "grid/grid.h"
 #include "inventory/inventory-util.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 1258d09..9644aea 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -21,6 +21,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
+#include "floor/cave.h"
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
 #include "game-option/game-play-options.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index f1f7407..0c204bb 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -22,6 +22,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/spells-effect-util.h"
+#include "floor/cave.h"
 #include "flavor/flavor-describer.h"
 #include "floor/floor-events.h"
 #include "floor/floor-object.h"

diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c
index 148bdc8..2be1a10 100644 (file)
--- a/src/mind/mind-ninja.c
+++ b/src/mind/mind-ninja.c
@@ -5,6 +5,7 @@
 #include "core/player-redraw-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
+#include "floor/cave.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/monster-floor/monster-death.c b/src/monster-floor/monster-death.c
index 2da8fa5..67d4624 100644 (file)
--- a/src/monster-floor/monster-death.c
+++ b/src/monster-floor/monster-death.c
@@ -10,6 +10,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
+#include "floor/cave.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"

diff --git a/src/monster-floor/monster-generator.c b/src/monster-floor/monster-generator.c
index 88ac607..464ff59 100644 (file)
--- a/src/monster-floor/monster-generator.c
+++ b/src/monster-floor/monster-generator.c
@@ -7,6 +7,7 @@
 
 #include "monster-floor/monster-generator.h"
 #include "dungeon/dungeon.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/cheat-options.h"
 #include "grid/grid.h"

diff --git a/src/monster-floor/monster-safety-hiding.c b/src/monster-floor/monster-safety-hiding.c
index 691b52c..58e8f61 100644 (file)
--- a/src/monster-floor/monster-safety-hiding.c
+++ b/src/monster-floor/monster-safety-hiding.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster-floor/monster-safety-hiding.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "monster-floor/monster-dist-offsets.h"

diff --git a/src/monster-floor/one-monster-placer.c b/src/monster-floor/one-monster-placer.c
index eaf7bea..6f0d6ba 100644 (file)
--- a/src/monster-floor/one-monster-placer.c
+++ b/src/monster-floor/one-monster-placer.c
@@ -11,6 +11,7 @@
 #include "effect/effect-characteristics.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
+#include "floor/cave.h"
 #include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"

diff --git a/src/monster/monster-list.c b/src/monster/monster-list.c
index d891248..60ce8c2 100644 (file)
--- a/src/monster/monster-list.c
+++ b/src/monster/monster-list.c
@@ -14,8 +14,8 @@
 #include "core/speed-table.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
+#include "floor/cave.h"
 #include "floor/floor-object.h"
-#include "floor/floor.h"
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
 #include "grid/grid.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index a7d34a1..c179aee 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -16,6 +16,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
+#include "floor/cave.h"
 #include "game-option/birth-options.h"
 #include "grid/grid.h"
 #include "io/targeting.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index 875de1b..3ac3c6c 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -6,6 +6,7 @@
 #include "dungeon/dungeon.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "game-option/input-options.h"
 #include "grid/feature.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 401dc0c..3006388 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -7,6 +7,7 @@
 #include "room/rooms-vault.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
+#include "floor/cave.h"
 #include "floor/floor-generate.h"
 #include "floor/floor.h"
 #include "floor/geometry.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index ec0ca76..c05befd 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -15,6 +15,7 @@
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
+#include "floor/cave.h"
 #include "floor/floor-events.h"
 #include "floor/floor-object.h"
 #include "floor/floor-save.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index f792f2d..20e8b2d 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -9,6 +9,7 @@
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "effect/effect-characteristics.h"
+#include "floor/cave.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "inventory/inventory-slot-types.h"