[Refactor] #37353 is_*_grid()の宣言をいくつか を grid.h に移動。 / Move some declarations, is_...

diff --git a/src/externs.h b/src/externs.h
index 3e26a0d..e41e31d 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -499,9 +499,7 @@ extern FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat);
 extern FEAT_IDX feat_state(FEAT_IDX feat, int action);
 extern void cave_alter_feat(POSITION y, POSITION x, int action);
 extern void remove_mirror(POSITION y, POSITION x);
-extern bool is_mirror_grid(grid_type *g_ptr);
-extern bool is_glyph_grid(grid_type *g_ptr);
-extern bool is_explosive_rune_grid(grid_type *g_ptr);
+
 extern void mmove2(POSITION *y, POSITION *x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 extern bool projectable(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, BIT_FLAGS mode);

diff --git a/src/floor-events.c b/src/floor-events.c
index ba36e81..f1d2687 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "grid.h"
 
 void day_break()
 {

diff --git a/src/grid.h b/src/grid.h
index d093338..468c113 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -285,3 +285,6 @@ extern void place_bound_perm_wall(grid_type *g_ptr);
 
 extern bool is_known_trap(grid_type *g_ptr);
 extern bool is_hidden_door(grid_type *g_ptr);
+extern bool is_mirror_grid(grid_type *g_ptr);
+extern bool is_glyph_grid(grid_type *g_ptr);
+extern bool is_explosive_rune_grid(grid_type *g_ptr);
\ No newline at end of file

diff --git a/src/melee1.c b/src/melee1.c
index c667b8c..17bd36c 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -23,6 +23,7 @@
 #include "player-status.h"
 #include "realm-hex.h"
 #include "object-hook.h"
+#include "grid.h"
 
 
 

diff --git a/src/mind.c b/src/mind.c
index 1e3e63a..a8f43d0 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -24,6 +24,7 @@
 #include "cmd-spell.h"
 #include "spells-floor.h"
 #include "feature.h"
+#include "grid.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/monster-process.c b/src/monster-process.c
index 9583bc5..1c76598 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -24,6 +24,7 @@
 #include "realm-hex.h"
 #include "object-hook.h"
 #include "feature.h"
+#include "grid.h"
 
 
 /*!

diff --git a/src/monster2.c b/src/monster2.c
index 7630bc4..69e4071 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -18,6 +18,7 @@
 #include "monster.h"
 #include "spells-summon.h"
 #include "quest.h"
+#include "grid.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */

diff --git a/src/wild.c b/src/wild.c
index 118ba64..1b44c65 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -15,6 +15,7 @@
 #include "monster.h"
 #include "realm-hex.h"
 #include "player-status.h"
+#include "grid.h"
 
 /*!
  * @brief 地形生成確率を決める要素100の配列を確率テーブルから作成する