[Refactor] #37353 targeting.h を作成して 宣言を移動．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 991c907..b8c13b3 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -392,6 +392,7 @@
     <ClInclude Include="..\..\src\spells-world.h" />\r
     <ClInclude Include="..\..\src\spells.h" />\r
     <ClInclude Include="..\..\src\store.h" />\r
+    <ClInclude Include="..\..\src\targeting.h" />\r
     <ClInclude Include="..\..\src\term.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
     <ClInclude Include="..\..\src\util.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index e947348..ebf15b7 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -754,6 +754,9 @@
     <ClInclude Include="..\..\src\realm.h">
       <Filter>spells</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\targeting.h">
+      <Filter>io</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index cddd228..79c36f1 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -29,6 +29,7 @@
 #include "objectkind.h"
 #include "object-ego.h"
 #include "grid.h"
+#include "targeting.h"
 
 /*!
  * @brief 装備耐性に準じたブレス効果の選択テーブル /

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 93fb804..3e05f3f 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -48,6 +48,7 @@
 #include "files.h"
 
 #include "view-mainwindow.h"
+#include "targeting.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 8a19a3d..cf95606 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -39,7 +39,7 @@
 #include "spells.h"
 #include "objectkind.h"
 #include "autopick.h"
-
+#include "targeting.h"
 
 /*!
  * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display p_ptr->inventory_list

diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c
index 60871ae..2840265 100644 (file)
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -64,7 +64,7 @@
 #include "spells.h"
 #include "player-class.h"
 #include "objectkind.h"
-
+#include "targeting.h"
 
 /*!
  * @brief 魔道具術師の取り込んだ魔力一覧から選択/閲覧する /

diff --git a/src/cmd-mane.c b/src/cmd-mane.c
index aabd8e3..752b8ba 100644 (file)
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -25,6 +25,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "cmd-basic.h"
+#include "targeting.h"
 
 static int damage;
 

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 1c5e1cd..1d84f22 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -17,6 +17,7 @@
 #include "cmd-pet.h"
 #include "cmd-basic.h"
 #include "view-mainwindow.h"
+#include "targeting.h"
 
 /*!
 * @brief プレイヤーの騎乗/下馬処理判定

diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index 1f50780..efcfca3 100644 (file)
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -11,6 +11,7 @@
 #include "spells-floor.h"
 #include "cmd-basic.h"
 #include "floor.h"
+#include "targeting.h"
 
 /*!
  * @brief ロッドの効果を発動する

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index 83a8fe6..014c94d 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -10,7 +10,7 @@
 #include "object-hook.h"
 #include "cmd-basic.h"
 #include "floor.h"
-
+#include "targeting.h"
 
 /*!
 * @brief 魔法棒の効果を発動する

diff --git a/src/core.c b/src/core.c
index 80e85ed..9325382 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -78,6 +78,7 @@
 #include "autopick.h"
 #include "save.h"
 #include "realm.h"
+#include "targeting.h"
 
  /*!
   * コピーライト情報 /

diff --git a/src/externs.h b/src/externs.h
index 8024564..7f8118a 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -196,19 +196,6 @@ extern void update_output(void);
 extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines);
 extern void update_playtime(void);
 
-/* xtra2.c */
-extern void panel_bounds_center(void);
-extern void verify_panel(void);
-extern bool target_able(MONSTER_IDX m_idx);
-extern bool target_okay(void);
-extern bool target_set(BIT_FLAGS mode);
-extern void target_set_prepare_look(void);
-extern bool get_aim_dir(DIRECTION *dp);
-extern bool get_hack_dir(DIRECTION *dp);
-extern bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed);
-extern bool get_rep_dir(DIRECTION *dp, bool under);
-extern bool tgt_pt(POSITION *x, POSITION *y);
-
 /*
  * Hack -- conditional (or "bizarre") externs
  */

diff --git a/src/mind.c b/src/mind.c
index 16c4c6c..27fab7e 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -36,6 +36,7 @@
 #include "monster-status.h"
 #include "player-effects.h"
 #include "view-mainwindow.h"
+#include "targeting.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/mspells3.c b/src/mspells3.c
index 1be660f..e2f18c8 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -25,6 +25,7 @@
 #include "spells.h"
 #include "cmd-basic.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130) /*!< モンスター魔法をプレイヤーが使用する場合の換算レベル */
 

diff --git a/src/mutation.c b/src/mutation.c
index a26fd7f..61d2651 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -28,6 +28,7 @@
 #include "cmd-basic.h"
 #include "files.h"
 #include "floor.h"
+#include "targeting.h"
 
 /*!
  * @brief プレイヤーに突然変異を与える

diff --git a/src/player-move.c b/src/player-move.c
index 2828e2e..fbf22fd 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -167,6 +167,7 @@
 #include "world.h"
 #include "objectkind.h"
 #include "autopick.h"
+#include "targeting.h"
 
 
 #ifdef TRAVEL

diff --git a/src/racial.c b/src/racial.c
index 0918029..525adb0 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -30,6 +30,7 @@
 #include "spells.h"
 #include "cmd-spell.h"
 #include "realm-hex.h"
+#include "targeting.h"
 
 /*!
  * @brief 修行僧の構え設定処理

diff --git a/src/realm-arcane.c b/src/realm-arcane.c
index a1fa21d..e11736d 100644 (file)
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -11,6 +11,7 @@
 #include "spells-status.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 /*!
 * @brief 秘術領域魔法の各処理を行う

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 05ef21a..91a81a4 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -6,6 +6,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells.h"
+#include "targeting.h"
 
 /*!
 * @brief カオス領域魔法の各処理を行う

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index 74957e2..917e5e6 100644 (file)
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -7,6 +7,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 
 

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index d9e408c..db44393 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -8,6 +8,7 @@
 #include "spells-floor.h"
 #include "spells-status.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 /*!
 * @brief 悪魔領域魔法の各処理を行う

diff --git a/src/realm-death.c b/src/realm-death.c
index 80053af..647cccc 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -6,6 +6,7 @@
 #include "avatar.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 
 

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 2812dae..23afa7d 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -32,6 +32,7 @@
 #include "realm-hex.h"
 #include "grid.h"
 #include "monsterrace.h"
+#include "targeting.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
 

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index fe26cb1..14f6cb5 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -15,6 +15,7 @@
 #include "feature.h"
 #include "spells.h"
 #include "grid.h"
+#include "targeting.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/realm-life.c b/src/realm-life.c
index 65fdc51..6ebfbed 100644 (file)
--- a/src/realm-life.c
+++ b/src/realm-life.c
@@ -6,6 +6,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "floor.h"
+#include "targeting.h"
 
 /*!
 * @brief 生命領域魔法の各処理を行う

diff --git a/src/realm-nature.c b/src/realm-nature.c
index d4f989a..e99cbc4 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -9,6 +9,7 @@
 #include "avatar.h"
 #include "spells-floor.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 
 /*!

diff --git a/src/realm-song.c b/src/realm-song.c
index a3a5bca..706d1f7 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -6,6 +6,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 /*!
 * @brief 歌の開始を処理する / Start singing if the player is a Bard

diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c
index d7de405..c11fb28 100644 (file)
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -9,6 +9,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 /*!
 * @brief 仙術領域魔法の各処理を行う

diff --git a/src/realm-trump.c b/src/realm-trump.c
index e062893..3a44960 100644 (file)
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -7,6 +7,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "player-effects.h"
+#include "targeting.h"
 
 
 /*!

diff --git a/src/shoot.c b/src/shoot.c
index 2108624..0a88475 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -18,6 +18,7 @@
 #include "snipe.h"
 #include "view-mainwindow.h"
 #include "objectkind.h"
+#include "targeting.h"
 
 /*!
  * @brief 矢弾を射撃した際のスレイ倍率をかけた結果を返す /

diff --git a/src/spells-object.c b/src/spells-object.c
index fceea7b..0a95758 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -16,6 +16,7 @@
 #include "player-class.h"
 #include "objectkind.h"
 #include "autopick.h"
+#include "targeting.h"
 
 
 typedef struct

diff --git a/src/spells-status.c b/src/spells-status.c
index a18c70e..65d1130 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -11,6 +11,7 @@
 #include "cmd-spell.h"
 #include "player-effects.h"
 #include "objectkind.h"
+#include "targeting.h"
 
 /*!
  * @brief モンスター回復処理

diff --git a/src/spells2.c b/src/spells2.c
index a6967f6..9c25fa2 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -47,6 +47,7 @@
 #include "view-mainwindow.h"
 #include "objectkind.h"
 #include "monsterrace.h"
+#include "targeting.h"
 
 /*!
  * @brief プレイヤー周辺の地形を感知する

diff --git a/src/spells3.c b/src/spells3.c
index bedb37b..f516d77 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -48,6 +48,7 @@
 #include "world.h"
 #include "objectkind.h"
 #include "autopick.h"
+#include "targeting.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */

diff --git a/src/targeting.c b/src/targeting.c
index e948ec2..0e8fdb9 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "targeting.h"
 
 #include "bldg.h"
 #include "cmd-pet.h"

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 3c13bdf..a69ab91 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -38,6 +38,7 @@
 #include "floor-town.h"
 #include "feature.h"
 #include "objectkind.h"
+#include "targeting.h"
 
 static int feat_priority; /*!< マップ縮小表示時に表示すべき地形の優先度を保管する */
 static byte display_autopick; /*!< 自動拾い状態の設定フラグ */

diff --git a/src/wizard2.c b/src/wizard2.c
index f952a26..d326ba1 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -43,6 +43,7 @@
 #include "monster-spell.h"
 #include "bldg.h"
 #include "objectkind.h"
+#include "targeting.h"
 
 #ifdef ALLOW_WIZARD