[Refactor] #37353 feature.c/h 追加。 / Add feature.c/h.

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 5119309..a4215b8 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -146,6 +146,7 @@
     <ClCompile Include="..\..\src\cmd-pet.c" />\r
     <ClCompile Include="..\..\src\cmd-quaff.c" />\r
     <ClCompile Include="..\..\src\cmd-read.c" />\r
+    <ClCompile Include="..\..\src\feature.c" />\r
     <ClCompile Include="..\..\src\floor-events.c" />\r
     <ClCompile Include="..\..\src\floor-generate.c" />\r
     <ClCompile Include="..\..\src\floor-save.c" />\r
@@ -275,6 +276,7 @@
     <ClInclude Include="..\..\src\cmd-usestaff.h" />\r
     <ClInclude Include="..\..\src\defines.h" />\r
     <ClInclude Include="..\..\src\externs.h" />\r
+    <ClInclude Include="..\..\src\feature.h" />\r
     <ClInclude Include="..\..\src\floor-events.h" />\r
     <ClInclude Include="..\..\src\floor.h" />\r
     <ClInclude Include="..\..\src\gameoption.h" />\r

diff --git a/src/cmd2.c b/src/cmd2.c
index d7d8d8b..1200fe9 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -26,6 +26,8 @@
 #include "realm-hex.h"
 #include "geometry.h"
 #include "wild.h"
+#include "grid.h"
+#include "feature.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

diff --git a/src/externs.h b/src/externs.h
index 4f922ce..3e26a0d 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -464,12 +464,9 @@ extern void get_height_weight(void);
 extern void player_outfit(void);
 extern void dump_yourself(FILE *fff);
 
+
 /* grids.c */
 extern POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-extern bool is_trap(FEAT_IDX feat);
-extern bool is_known_trap(grid_type *g_ptr);
-extern bool is_closed_door(FEAT_IDX feat);
-extern bool is_hidden_door(grid_type *g_ptr);
 extern bool los(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 extern void update_local_illumination(POSITION y, POSITION x);
 extern bool player_can_see_bold(POSITION y, POSITION x);

diff --git a/src/feature.c b/src/feature.c
new file mode 100644 (file)
index 0000000..4a8f6dd
--- /dev/null
+++ b/src/feature.c
@@ -0,0 +1,27 @@
+#include "angband.h"
+#include "feature.h"
+
+
+/*!
+ * @brief 地形が罠持ちであるかの判定を行う。 / Return TRUE if the given feature is a trap
+ * @param feat 地形情報のID
+ * @return 罠持ちの地形ならばTRUEを返す。
+ */
+bool is_trap(FEAT_IDX feat)
+{
+       return have_flag(f_info[feat].flags, FF_TRAP);
+}
+
+/*!
+ * @brief 地形が閉じたドアであるかの判定を行う。 / Return TRUE if the given grid is a closed door
+ * @param feat 地形情報のID
+ * @return 閉じたドアのある地形ならばTRUEを返す。
+ */
+bool is_closed_door(FEAT_IDX feat)
+{
+       feature_type *f_ptr = &f_info[feat];
+
+       return (have_flag(f_ptr->flags, FF_OPEN) || have_flag(f_ptr->flags, FF_BASH)) &&
+               !have_flag(f_ptr->flags, FF_MOVE);
+}
+

diff --git a/src/feature.h b/src/feature.h
new file mode 100644 (file)
index 0000000..1180ef8
--- /dev/null
+++ b/src/feature.h
@@ -0,0 +1,3 @@
+#pragma once
+extern bool is_closed_door(FEAT_IDX feat);
+extern bool is_trap(FEAT_IDX feat);

diff --git a/src/floor-streams.c b/src/floor-streams.c
index 00323d9..badf557 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -19,6 +19,7 @@
 #include "generate.h"
 #include "floor-streams.h"
 #include "grid.h"
+#include "feature.h"
 
 
 /*!

diff --git a/src/grid.c b/src/grid.c
index d6ab9e3..d0fe5f0 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -27,6 +27,7 @@
 #include "rooms.h"
 #include "monster.h"
 #include "quest.h"
+#include "feature.h"
 
 static byte display_autopick; /*!< 自動拾い状態の設定フラグ */
 static int match_autopick;
@@ -831,15 +832,6 @@ POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
        return d;
 }
 
-/*!
- * @brief 地形が罠持ちであるかの判定を行う。 / Return TRUE if the given feature is a trap
- * @param feat 地形情報のID
- * @return 罠持ちの地形ならばTRUEを返す。
- */
-bool is_trap(FEAT_IDX feat)
-{
-       return have_flag(f_info[feat].flags, FF_TRAP);
-}
 
 /*!
  * @brief マスに看破済みの罠があるかの判定を行う。 / Return TRUE if the given grid is a known trap
@@ -854,18 +846,7 @@ bool is_known_trap(grid_type *g_ptr)
                return FALSE;
 }
 
-/*!
- * @brief 地形が閉じたドアであるかの判定を行う。 / Return TRUE if the given grid is a closed door
- * @param feat 地形情報のID
- * @return 閉じたドアのある地形ならばTRUEを返す。
- */
-bool is_closed_door(FEAT_IDX feat)
-{
-       feature_type *f_ptr = &f_info[feat];
 
-       return (have_flag(f_ptr->flags, FF_OPEN) || have_flag(f_ptr->flags, FF_BASH)) &&
-               !have_flag(f_ptr->flags, FF_MOVE);
-}
 
 /*!
  * @brief マスに隠されたドアがあるかの判定を行う。 / Return TRUE if the given grid is a hidden closed door

diff --git a/src/grid.h b/src/grid.h
index 9c11372..d093338 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -283,3 +283,5 @@ extern bool get_is_floor(POSITION x, POSITION y);
 extern void set_floor(POSITION x, POSITION y);
 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);

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

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

diff --git a/src/object2.c b/src/object2.c
index 2563548..0725124 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -16,6 +16,7 @@
 #include "object-curse.h"
 #include "artifact.h"
 #include "player-status.h"
+#include "feature.h"
 
 static void one_sustain(object_type *o_ptr);
 

diff --git a/src/player-move.c b/src/player-move.c
index 4a545ec..0a63b3d 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -141,12 +141,14 @@
 
 #include "angband.h"
 #include "melee.h"
+#include "grid.h"
 #include "trap.h"
 #include "projection.h"
 #include "quest.h"
 #include "artifact.h"
 #include "player-status.h"
 #include "spells-floor.h"
+#include "feature.h"
 
 
 

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 27ad795..dd314e2 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -5,6 +5,7 @@
 #include "projection.h"
 #include "artifact.h"
 #include "player-status.h"
+#include "feature.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/rooms-special.c b/src/rooms-special.c
index 5c65510..e16626b 100644 (file)
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -5,6 +5,7 @@
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "objectkind-hook.h"
+#include "feature.h"
 
 
 /*!

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

diff --git a/src/spells1.c b/src/spells1.c
index 27431a6..6c273d2 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -34,6 +34,8 @@
 #include "realm-hex.h"
 #include "object-hook.h"
 #include "term.h"
+#include "grid.h"
+#include "feature.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */

diff --git a/src/trap.c b/src/trap.c
index 59eb519..3bde1a6 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -6,6 +6,7 @@
 #include "spells-summon.h"
 #include "quest.h"
 #include "artifact.h"
+#include "feature.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];