[Refactor] #37353 player-move.h を追加。 / Add player-move.h.

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index a4215b8..8eef674 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -303,6 +303,7 @@
     <ClInclude Include="..\..\src\objectkind-hook.h" />\r
     <ClInclude Include="..\..\src\patron.h" />\r
     <ClInclude Include="..\..\src\player-damage.h" />\r
+    <ClInclude Include="..\..\src\player-move.h" />\r
     <ClInclude Include="..\..\src\player-status.h" />\r
     <ClInclude Include="..\..\src\quest.h" />\r
     <ClInclude Include="..\..\src\readdib.h" />\r

diff --git a/src/autopick.c b/src/autopick.c
index 85042d6..8235c8d 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "store.h"
 #include "player-status.h"
+#include "player-move.h"
 #include "object-hook.h"
 
 #define MAX_LINELEN 1024

diff --git a/src/cmd2.c b/src/cmd2.c
index 858c9b9..eedc244 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -28,6 +28,7 @@
 #include "wild.h"
 #include "grid.h"
 #include "feature.h"
+#include "player-move.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

diff --git a/src/dungeon.c b/src/dungeon.c
index a5b1fe7..05b2414 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -35,6 +35,7 @@
 #include "quest.h"
 #include "artifact.h"
 #include "avatar.h"
+#include "player-move.h"
 #include "player-status.h"
 #include "cmd-spell.h"
 #include "realm-hex.h"

diff --git a/src/effects.c b/src/effects.c
index a212a06..dd811c9 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -22,6 +22,7 @@
 #include "object-hook.h"
 #include "wild.h"
 #include "spells-floor.h"
+#include "player-move.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。

diff --git a/src/externs.h b/src/externs.h
index 03c5192..742f247 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1396,5 +1396,3 @@ extern void kamaenaoshi(INVENTORY_IDX item);
 
 extern bool ang_sort_comp_hook(vptr u, vptr v, int a, int b);
 extern void ang_sort_swap_hook(vptr u, vptr v, int a, int b);
-
-extern void disturb(bool stop_search, bool flush_output);
\ No newline at end of file

diff --git a/src/files.c b/src/files.c
index 9c32f60..fa1bf1e 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -23,6 +23,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "shoot.h"
+#include "player-move.h"
 
 
 /*

diff --git a/src/melee1.c b/src/melee1.c
index 8df2852..d1df3f6 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -24,6 +24,7 @@
 #include "realm-hex.h"
 #include "object-hook.h"
 #include "grid.h"
+#include "player-move.h"
 
 
 

diff --git a/src/monster-process.c b/src/monster-process.c
index 2b5f64b..9dc4703 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -25,6 +25,7 @@
 #include "object-hook.h"
 #include "feature.h"
 #include "grid.h"
+#include "player-move.h"
 
 
 /*!

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

diff --git a/src/mspells1.c b/src/mspells1.c
index b27388d..ce3abea 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -43,6 +43,7 @@
 #include "projection.h"
 #include "quest.h"
 #include "realm-hex.h"
+#include "player-move.h"
 
 
 /*!

diff --git a/src/mspells2.c b/src/mspells2.c
index 36d72db..aeb2b49 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -15,6 +15,7 @@
 #include "projection.h"
 #include "quest.h"
 #include "realm-hex.h"
+#include "player-move.h"
 
 /*!
  * @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /

diff --git a/src/mspells4.c b/src/mspells4.c
index c995526..b6ffc23 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -12,6 +12,7 @@
 #include "artifact.h"
 #include "player-status.h"
 #include "realm-hex.h"
+#include "player-move.h"
 
 /*!
 * @brief モンスターIDを取り、モンスター名をm_nameに代入する /

diff --git a/src/object1.c b/src/object1.c
index 67a94d6..0a22c87 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -15,6 +15,7 @@
 #include "artifact.h"
 #include "cmd-activate.h"
 #include "object-hook.h"
+#include "player-move.h"
 
 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
 #ifdef verify

diff --git a/src/object2.c b/src/object2.c
index 9b3065f..0b48025 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -17,6 +17,7 @@
 #include "artifact.h"
 #include "player-status.h"
 #include "feature.h"
+#include "player-move.h"
 
 static void one_sustain(object_type *o_ptr);
 

diff --git a/src/player-move.c b/src/player-move.c
index f3cbca0..ac0a04a 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -146,6 +146,7 @@
 #include "projection.h"
 #include "quest.h"
 #include "artifact.h"
+#include "player-move.h"
 #include "player-status.h"
 #include "spells-floor.h"
 #include "feature.h"

diff --git a/src/player-move.h b/src/player-move.h
new file mode 100644 (file)
index 0000000..e1ad28f
--- /dev/null
+++ b/src/player-move.h
@@ -0,0 +1,2 @@
+
+extern void disturb(bool stop_search, bool flush_output);

diff --git a/src/spells1.c b/src/spells1.c
index 1f9087b..704869b 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -31,6 +31,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "player-move.h"
 #include "realm-hex.h"
 #include "object-hook.h"
 #include "term.h"

diff --git a/src/trap.c b/src/trap.c
index 7eccfce..aef866c 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -2,6 +2,7 @@
 #include "floor.h"
 #include "trap.h"
 #include "player-damage.h"
+#include "player-move.h"
 #include "projection.h"
 #include "spells-summon.h"
 #include "quest.h"

diff --git a/src/xtra2.c b/src/xtra2.c
index 2a3b51b..bd80108 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -23,6 +23,7 @@
 #include "patron.h"
 #include "mutation.h"
 #include "floor-events.h"
+#include "player-move.h"
 
 #define REWARD_CHANCE 10