[Refactor] #37353 複数の is_bound* マクロを floor.h へ移動。

diff --git a/src/defines.h b/src/defines.h
index 2ad1ac8..800bc01 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2729,24 +2729,6 @@
        ((int)((G) % 256U))
 
 
-/*
- * Determines if a map location is fully inside the outer walls
- */
-#define in_bounds(Y,X) \
-   (((Y) > 0) && ((X) > 0) && ((Y) < current_floor_ptr->height-1) && ((X) < current_floor_ptr->width-1))
-
-/*
- * Determines if a map location is on or inside the outer walls
- */
-#define in_bounds2(Y,X) \
-   (((Y) >= 0) && ((X) >= 0) && ((Y) < current_floor_ptr->height) && ((X) < current_floor_ptr->width))
-
-/*
- * Determines if a map location is on or inside the outer walls
- * (unsigned version)
- */
-#define in_bounds2u(Y,X) \
-   (((Y) < current_floor_ptr->height) && ((X) < current_floor_ptr->width))
 
 /*
  * Determines if a map location is currently "on screen" -RAK-

diff --git a/src/floor-generate.c b/src/floor-generate.c
index be76c6c..575155b 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -100,6 +100,7 @@
 #include "generate.h"
 #include "grid.h"
 #include "rooms.h"
+#include "floor.h"
 #include "floor-streams.h"
 #include "floor-generate.h"
 #include "trap.h"

diff --git a/src/floor-save.c b/src/floor-save.c
index 0f124ad..1deedf3 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -19,7 +19,7 @@
 #include "wild.h"
 #include "spells-floor.h"
 #include "monster-status.h"
-
+#include "object-hook.h"
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */
 static u32b change_floor_mode;  /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */

diff --git a/src/floor-streams.c b/src/floor-streams.c
index b2364c8..d35f0d9 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -17,10 +17,12 @@
 
 #include "angband.h"
 #include "generate.h"
+#include "floor.h"
 #include "floor-streams.h"
 #include "grid.h"
 #include "monster.h"
 #include "feature.h"
+#include "object-hook.h"
 
 
 /*!

diff --git a/src/floor.h b/src/floor.h
index 7c6c88f..bad17ca 100644 (file)
--- a/src/floor.h
+++ b/src/floor.h
@@ -13,3 +13,22 @@
 #define CFM_NO_RETURN    0x0100  /* Flee from random quest etc... */
 #define CFM_FIRST_FLOOR  0x0200  /* Create exit from the dungeon */
 
+ /*
+  * Determines if a map location is fully inside the outer walls
+  */
+#define in_bounds(Y,X) \
+   (((Y) > 0) && ((X) > 0) && ((Y) < current_floor_ptr->height-1) && ((X) < current_floor_ptr->width-1))
+
+  /*
+   * Determines if a map location is on or inside the outer walls
+   */
+#define in_bounds2(Y,X) \
+   (((Y) >= 0) && ((X) >= 0) && ((Y) < current_floor_ptr->height) && ((X) < current_floor_ptr->width))
+
+   /*
+       * Determines if a map location is on or inside the outer walls
+       * (unsigned version)
+       */
+#define in_bounds2u(Y,X) \
+   (((Y) < current_floor_ptr->height) && ((X) < current_floor_ptr->width))
+

diff --git a/src/geometry.c b/src/geometry.c
index 58ecc72..d4cdd5e 100644 (file)
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "floor.h"
 
 /*!
  * @brief プレイヤーから指定の座標がどの方角にあるかを返す /

diff --git a/src/grid.c b/src/grid.c
index 0b28e95..14f2173 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -18,6 +18,7 @@
 
 
 #include "angband.h"
+#include "floor.h"
 #include "world.h"
 #include "object-hook.h"
 #include "generate.h"

diff --git a/src/mind.c b/src/mind.c
index 4447c94..8718464 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -15,6 +15,7 @@
  */
 
 #include "angband.h"
+#include "floor.h"
 #include "melee.h"
 #include "spells-summon.h"
 #include "avatar.h"

diff --git a/src/monster-process.c b/src/monster-process.c
index 353a2b5..708d911 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -27,6 +27,7 @@
 #include "player-move.h"
 #include "monster-status.h"
 #include "monster-spell.h"
+#include "floor.h"
 
 
 /*!

diff --git a/src/monster1.c b/src/monster1.c
index eb4333a..a45db4e 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -12,10 +12,11 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
-#include "monsterrace-hook.h"
+#include "floor.h"
 #include "objectkind-hook.h"
 #include "monster.h"
 #include "monster-spell.h"
+#include "monsterrace-hook.h"
 #include "spells-summon.h"
 #include "patron.h"
 #include "quest.h"

diff --git a/src/monster2.c b/src/monster2.c
index 37854d3..126ee24 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "floor.h"
 #include "monsterrace-hook.h"
 #include "monster-status.h"
 #include "monster.h"

diff --git a/src/mspells1.c b/src/mspells1.c
index b716b85..caf160e 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -39,6 +39,7 @@
  */
 
 #include "angband.h"
+#include "floor.h"
 #include "object-curse.h"
 #include "quest.h"
 #include "realm-hex.h"

diff --git a/src/mutation.c b/src/mutation.c
index 6523987..f838cd0 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -19,6 +19,7 @@
 #include "avatar.h"
 #include "player-status.h"
 #include "spells-status.h"
+#include "object-hook.h"
 
 /*!
  * @brief プレイヤーに突然変異を与える

diff --git a/src/object1.c b/src/object1.c
index a3e5001..20d0dbf 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "artifact.h"
+#include "floor.h"
 #include "cmd-activate.h"
 #include "object-hook.h"
 #include "player-move.h"

diff --git a/src/object2.c b/src/object2.c
index 4c1672c..9fd5d98 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "floor.h"
 #include "object-boost.h"
 #include "object-hook.h"
 #include "object-curse.h"

diff --git a/src/player-move.c b/src/player-move.c
index b5c7087..e977e14 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -140,6 +140,7 @@
  */
 
 #include "angband.h"
+#include "floor.h"
 #include "melee.h"
 #include "grid.h"
 #include "trap.h"

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 8243b68..db5357b 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -6,6 +6,7 @@
 #include "trap.h"
 #include "monster.h"
 #include "feature.h"
+#include "floor.h"
 
 /*
 * This function creates a random vault that looks like a collection of bubbles.

diff --git a/src/rooms.c b/src/rooms.c
index bd5abfa..47e17cd 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -37,6 +37,7 @@
  */
 
 #include "angband.h"
+#include "floor.h"
 #include "generate.h"
 #include "grid.h"
 #include "rooms.h"

diff --git a/src/shoot.c b/src/shoot.c
index 13f7f39..d49d761 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -5,6 +5,8 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "object-hook.h"
+#include "floor.h"
 
 #include "shoot.h"
 

diff --git a/src/spells1.c b/src/spells1.c
index 8e906c3..f51af07 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "floor.h"
 #include "trap.h"
 #include "object-curse.h"
 #include "player-damage.h"

diff --git a/src/spells2.c b/src/spells2.c
index db281fb..dd7b891 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "floor.h"
 #include "grid.h"
 #include "trap.h"
 #include "monsterrace-hook.h"

diff --git a/src/warning.c b/src/warning.c
index f1c111f..cd1e986 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -4,6 +4,7 @@
 #include "artifact.h"
 #include "player-move.h"
 #include "feature.h"
+#include "floor.h"
 #include "warning.h"
 #include "player-status.h"
 #include "monster.h"

diff --git a/src/xtra2.c b/src/xtra2.c
index 4b04366..56a9bd4 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -19,6 +19,7 @@
 #include "objectkind-hook.h"
 #include "sort.h"
 #include "spells-summon.h"
+#include "floor.h"
 #include "floor-events.h"
 #include "player-move.h"
 #include "monster-status.h"