• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisionf55500ddafa9ef014dca6bde14c788800e24092d (tree)
Time2019-05-07 23:35:47
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -392,6 +392,7 @@
392392 <ClInclude Include="..\..\src\spells-world.h" />
393393 <ClInclude Include="..\..\src\spells.h" />
394394 <ClInclude Include="..\..\src\store.h" />
395+ <ClInclude Include="..\..\src\targeting.h" />
395396 <ClInclude Include="..\..\src\term.h" />
396397 <ClInclude Include="..\..\src\trap.h" />
397398 <ClInclude Include="..\..\src\util.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -754,6 +754,9 @@
754754 <ClInclude Include="..\..\src\realm.h">
755755 <Filter>spells</Filter>
756756 </ClInclude>
757+ <ClInclude Include="..\..\src\targeting.h">
758+ <Filter>io</Filter>
759+ </ClInclude>
757760 </ItemGroup>
758761 <ItemGroup>
759762 <None Include="..\..\src\wall.bmp" />
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -29,6 +29,7 @@
2929 #include "objectkind.h"
3030 #include "object-ego.h"
3131 #include "grid.h"
32+#include "targeting.h"
3233
3334 /*!
3435 * @brief 装備耐性に準じたブレス効果の選択テーブル /
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -48,6 +48,7 @@
4848 #include "files.h"
4949
5050 #include "view-mainwindow.h"
51+#include "targeting.h"
5152
5253 /*!
5354 * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -39,7 +39,7 @@
3939 #include "spells.h"
4040 #include "objectkind.h"
4141 #include "autopick.h"
42-
42+#include "targeting.h"
4343
4444 /*!
4545 * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display p_ptr->inventory_list
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -64,7 +64,7 @@
6464 #include "spells.h"
6565 #include "player-class.h"
6666 #include "objectkind.h"
67-
67+#include "targeting.h"
6868
6969 /*!
7070 * @brief 魔道具術師の取り込んだ魔力一覧から選択/閲覧する /
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -25,6 +25,7 @@
2525 #include "player-status.h"
2626 #include "player-effects.h"
2727 #include "cmd-basic.h"
28+#include "targeting.h"
2829
2930 static int damage;
3031
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -17,6 +17,7 @@
1717 #include "cmd-pet.h"
1818 #include "cmd-basic.h"
1919 #include "view-mainwindow.h"
20+#include "targeting.h"
2021
2122 /*!
2223 * @brief プレイヤーの騎乗/下馬処理判定
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -11,6 +11,7 @@
1111 #include "spells-floor.h"
1212 #include "cmd-basic.h"
1313 #include "floor.h"
14+#include "targeting.h"
1415
1516 /*!
1617 * @brief ロッドの効果を発動する
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -10,7 +10,7 @@
1010 #include "object-hook.h"
1111 #include "cmd-basic.h"
1212 #include "floor.h"
13-
13+#include "targeting.h"
1414
1515 /*!
1616 * @brief 魔法棒の効果を発動する
--- a/src/core.c
+++ b/src/core.c
@@ -78,6 +78,7 @@
7878 #include "autopick.h"
7979 #include "save.h"
8080 #include "realm.h"
81+#include "targeting.h"
8182
8283 /*!
8384 * コピーライト情報 /
--- a/src/externs.h
+++ b/src/externs.h
@@ -196,19 +196,6 @@ extern void update_output(void);
196196 extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines);
197197 extern void update_playtime(void);
198198
199-/* xtra2.c */
200-extern void panel_bounds_center(void);
201-extern void verify_panel(void);
202-extern bool target_able(MONSTER_IDX m_idx);
203-extern bool target_okay(void);
204-extern bool target_set(BIT_FLAGS mode);
205-extern void target_set_prepare_look(void);
206-extern bool get_aim_dir(DIRECTION *dp);
207-extern bool get_hack_dir(DIRECTION *dp);
208-extern bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed);
209-extern bool get_rep_dir(DIRECTION *dp, bool under);
210-extern bool tgt_pt(POSITION *x, POSITION *y);
211-
212199 /*
213200 * Hack -- conditional (or "bizarre") externs
214201 */
--- a/src/mind.c
+++ b/src/mind.c
@@ -36,6 +36,7 @@
3636 #include "monster-status.h"
3737 #include "player-effects.h"
3838 #include "view-mainwindow.h"
39+#include "targeting.h"
3940
4041 /*! 特殊技能の一覧テーブル */
4142 mind_power const mind_powers[5] =
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -25,6 +25,7 @@
2525 #include "spells.h"
2626 #include "cmd-basic.h"
2727 #include "player-effects.h"
28+#include "targeting.h"
2829
2930 #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130) /*!< モンスター魔法をプレイヤーが使用する場合の換算レベル */
3031
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -28,6 +28,7 @@
2828 #include "cmd-basic.h"
2929 #include "files.h"
3030 #include "floor.h"
31+#include "targeting.h"
3132
3233 /*!
3334 * @brief プレイヤーに突然変異を与える
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -167,6 +167,7 @@
167167 #include "world.h"
168168 #include "objectkind.h"
169169 #include "autopick.h"
170+#include "targeting.h"
170171
171172
172173 #ifdef TRAVEL
--- a/src/racial.c
+++ b/src/racial.c
@@ -30,6 +30,7 @@
3030 #include "spells.h"
3131 #include "cmd-spell.h"
3232 #include "realm-hex.h"
33+#include "targeting.h"
3334
3435 /*!
3536 * @brief 修行僧の構え設定処理
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -11,6 +11,7 @@
1111 #include "spells-status.h"
1212 #include "player-status.h"
1313 #include "player-effects.h"
14+#include "targeting.h"
1415
1516 /*!
1617 * @brief 秘術領域魔法の各処理を行う
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -6,6 +6,7 @@
66 #include "spells-summon.h"
77 #include "spells-status.h"
88 #include "spells.h"
9+#include "targeting.h"
910
1011 /*!
1112 * @brief カオス領域魔法の各処理を行う
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -7,6 +7,7 @@
77 #include "spells-summon.h"
88 #include "spells-status.h"
99 #include "player-effects.h"
10+#include "targeting.h"
1011
1112
1213
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -8,6 +8,7 @@
88 #include "spells-floor.h"
99 #include "spells-status.h"
1010 #include "player-effects.h"
11+#include "targeting.h"
1112
1213 /*!
1314 * @brief 悪魔領域魔法の各処理を行う
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -6,6 +6,7 @@
66 #include "avatar.h"
77 #include "player-status.h"
88 #include "player-effects.h"
9+#include "targeting.h"
910
1011
1112
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -32,6 +32,7 @@
3232 #include "realm-hex.h"
3333 #include "grid.h"
3434 #include "monsterrace.h"
35+#include "targeting.h"
3536
3637 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
3738
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -15,6 +15,7 @@
1515 #include "feature.h"
1616 #include "spells.h"
1717 #include "grid.h"
18+#include "targeting.h"
1819
1920 /*!
2021 * @brief 剣術の各処理を行う
--- a/src/realm-life.c
+++ b/src/realm-life.c
@@ -6,6 +6,7 @@
66 #include "player-status.h"
77 #include "player-effects.h"
88 #include "floor.h"
9+#include "targeting.h"
910
1011 /*!
1112 * @brief 生命領域魔法の各処理を行う
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -9,6 +9,7 @@
99 #include "avatar.h"
1010 #include "spells-floor.h"
1111 #include "player-effects.h"
12+#include "targeting.h"
1213
1314
1415 /*!
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -6,6 +6,7 @@
66 #include "spells-status.h"
77 #include "spells-floor.h"
88 #include "player-effects.h"
9+#include "targeting.h"
910
1011 /*!
1112 * @brief 歌の開始を処理する / Start singing if the player is a Bard
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -9,6 +9,7 @@
99 #include "spells-status.h"
1010 #include "spells-floor.h"
1111 #include "player-effects.h"
12+#include "targeting.h"
1213
1314 /*!
1415 * @brief 仙術領域魔法の各処理を行う
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -7,6 +7,7 @@
77 #include "spells-summon.h"
88 #include "spells-status.h"
99 #include "player-effects.h"
10+#include "targeting.h"
1011
1112
1213 /*!
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -18,6 +18,7 @@
1818 #include "snipe.h"
1919 #include "view-mainwindow.h"
2020 #include "objectkind.h"
21+#include "targeting.h"
2122
2223 /*!
2324 * @brief 矢弾を射撃した際のスレイ倍率をかけた結果を返す /
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -16,6 +16,7 @@
1616 #include "player-class.h"
1717 #include "objectkind.h"
1818 #include "autopick.h"
19+#include "targeting.h"
1920
2021
2122 typedef struct
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -11,6 +11,7 @@
1111 #include "cmd-spell.h"
1212 #include "player-effects.h"
1313 #include "objectkind.h"
14+#include "targeting.h"
1415
1516 /*!
1617 * @brief モンスター回復処理
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -47,6 +47,7 @@
4747 #include "view-mainwindow.h"
4848 #include "objectkind.h"
4949 #include "monsterrace.h"
50+#include "targeting.h"
5051
5152 /*!
5253 * @brief プレイヤー周辺の地形を感知する
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -48,6 +48,7 @@
4848 #include "world.h"
4949 #include "objectkind.h"
5050 #include "autopick.h"
51+#include "targeting.h"
5152
5253
5354 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -13,6 +13,7 @@
1313
1414 #include "angband.h"
1515 #include "util.h"
16+#include "targeting.h"
1617
1718 #include "bldg.h"
1819 #include "cmd-pet.h"
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -38,6 +38,7 @@
3838 #include "floor-town.h"
3939 #include "feature.h"
4040 #include "objectkind.h"
41+#include "targeting.h"
4142
4243 static int feat_priority; /*!< マップ縮小表示時に表示すべき地形の優先度を保管する */
4344 static byte display_autopick; /*!< 自動拾い状態の設定フラグ */
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -43,6 +43,7 @@
4343 #include "monster-spell.h"
4444 #include "bldg.h"
4545 #include "objectkind.h"
46+#include "targeting.h"
4647
4748 #ifdef ALLOW_WIZARD
4849
Show on old repository browser