[Refactor] #37353 PROJECT_* 定義を新規ファイル projection.h へ移動。 / Move PROJECT_* definition...

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 03be4b7..1bdde7b 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -314,6 +314,7 @@
     <ClInclude Include="..\..\src\sort.h" />\r
     <ClInclude Include="..\..\src\spells-summon.h" />\r
     <ClInclude Include="..\..\src\floor-streams.h" />\r
+    <ClInclude Include="..\..\src\projection.h" />\r
     <ClInclude Include="..\..\src\store.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
     <ClInclude Include="..\..\src\types.h" />\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a3c039..4747cb9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,9 @@ hengband_SOURCES = \
        object-curse.c object-curse.h \
        object-hook.c object-hook.h object1.c object2.c \
        objectkind-hook.c objectkind-hook.h obj_kind.c \
+
+       projection.h \
+
        player-damage.c player-damage.h player-status.c player-status.h \
        racial.c \
        realm-arcane.c \
@@ -39,7 +42,9 @@ hengband_SOURCES = \
        rooms.h rooms-normal.c rooms-normal.h rooms-pitnest.c rooms-pitnest.h \
        rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h rooms-vault.c \
        rooms-vault.h save.c scores.c selfinfo.c selfinfo.h shoot.c snipe.c \
+
        spells1.c spells2.c spells3.c spells-summon.c spells-summon.h \
+
        sort.c sort.h \
        store.h store.c tables.c trap.c trap.h types.h util.c \
        variable.c wild.c wizard1.c wizard2.c \

diff --git a/src/cave.c b/src/cave.c
index 923190a..5a0118f 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -18,6 +18,7 @@
 
 #include "angband.h"
 #include "world.h"
+#include "projection.h"
 
 static byte display_autopick; /*!< 自動拾い状態の設定フラグ */
 static int match_autopick;

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index badf09e..a316fb6 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -11,6 +11,7 @@
 #include "object-hook.h"
 #include "spells-summon.h"
 #include "sort.h"
+#include "projection.h"
 
 /*!
 * @brief ペット入りモンスターボールをソートするための比較関数

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index f2375c5..e5e1628 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -1,4 +1,5 @@
 #include "angband.h"\r
+#include "projection.h"\r
 \r
 \r
 \r

diff --git a/src/cmd1.c b/src/cmd1.c
index 7b18fc4..33b3d9e 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -142,6 +142,7 @@
 #include "angband.h"
 #include "melee.h"
 #include "trap.h"
+#include "projection.h"
 
 
 

diff --git a/src/cmd2.c b/src/cmd2.c
index d7536e9..cd434a8 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -15,6 +15,7 @@
 #include "floor.h"
 #include "melee.h"
 #include "object-hook.h"
+#include "projection.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

diff --git a/src/defines.h b/src/defines.h
index df0a9b5..3faa7be 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2442,27 +2442,6 @@
 
 
 /*
- * project()関数に用いられる、遠隔攻撃特性ビットフラグ / Bit flags for the "project()" function
- */
-#define PROJECT_JUMP        0x0001 /*!< 遠隔攻撃特性: 発動者からの軌跡を持たず、指定地点に直接発生する(予め置いたトラップ、上空からの発生などのイメージ) / Jump directly to the target location (this is a hack) */
-#define PROJECT_BEAM        0x0002 /*!< 遠隔攻撃特性: ビーム範囲を持つ。 / Work as a beam weapon (affect every grid passed through) */
-#define PROJECT_THRU        0x0004 /*!< 遠隔攻撃特性: 目標地点に到達しても射程と遮蔽の限り引き延ばす。 / Continue "through" the target (used for "bolts"/"beams") */
-#define PROJECT_STOP        0x0008 /*!< 遠隔攻撃特性: 道中にプレイヤーかモンスターがいた時点で到達地点を更新して停止する(壁や森はPROJECT_DISIがない限り最初から貫通しない) */
-#define PROJECT_GRID        0x0010 /*!< 遠隔攻撃特性: 射程内の地形に影響を及ぼす / Affect each grid in the "blast area" in some way */
-#define PROJECT_ITEM        0x0020 /*!< 遠隔攻撃特性: 射程内のアイテムに影響を及ぼす / Affect each object in the "blast area" in some way */
-#define PROJECT_KILL        0x0040 /*!< 遠隔攻撃特性: 射程内のモンスターに影響を及ぼす / Affect each monster in the "blast area" in some way */
-#define PROJECT_HIDE        0x0080 /*!< 遠隔攻撃特性: / Hack -- disable "visual" feedback from projection */
-#define PROJECT_DISI        0x0100 /*!< 遠隔攻撃特性: / Disintegrate non-permanent features */
-#define PROJECT_PLAYER      0x0200 /*!< 遠隔攻撃特性: / Main target is player (used for riding player) */
-#define PROJECT_AIMED       0x0400 /*!< 遠隔攻撃特性: / Target is only player or monster, so don't affect another. Depend on PROJECT_PLAYER. (used for minimum (rad == 0) balls on riding player) */
-#define PROJECT_REFLECTABLE 0x0800 /*!< 遠隔攻撃特性: 反射可能(ボルト系魔法に利用) / Refrectable spell attacks (used for "bolts") */
-#define PROJECT_NO_HANGEKI  0x1000 /*!< 遠隔攻撃特性: / Avoid counter attacks of monsters */
-#define PROJECT_PATH        0x2000 /*!< 遠隔攻撃特性: / Only used for printing project path */
-#define PROJECT_FAST        0x4000 /*!< 遠隔攻撃特性: / Hide "visual" of flying bolts until blast */
-#define PROJECT_LOS         0x8000 /*!< 遠隔攻撃特性: /  */
-
-
-/*
  * Special caster ID for project()
  */
 #define PROJECT_WHO_UNCTRL_POWER -1 /*!< 魔法効果の自然発生要因: 名状し難い力の解放 */

diff --git a/src/melee1.c b/src/melee1.c
index 2ec4458..13b90f1 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -16,6 +16,7 @@
 #include "player-damage.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
+#include "projection.h"
 
 
 

diff --git a/src/mind.c b/src/mind.c
index fe87e89..9563ffa 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -16,6 +16,7 @@
 
 #include "angband.h"
 #include "melee.h"
+#include "projection.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/monster-process.c b/src/monster-process.c
index c0c616a..83994c9 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -17,6 +17,7 @@
 #include "cmd-pet.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
+#include "projection.h"
 
 
 /*!

diff --git a/src/monster2.c b/src/monster2.c
index 87c49ff..7b6acb0 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -14,6 +14,7 @@
 #include "cmd-pet.h"
 #include "monsterrace-hook.h"
 #include "monster-status.h"
+#include "projection.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */

diff --git a/src/mspells1.c b/src/mspells1.c
index b914e2a..c975954 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -40,6 +40,7 @@
 
 #include "angband.h"
 #include "object-curse.h"
+#include "projection.h"
 
 
 /*!

diff --git a/src/mspells2.c b/src/mspells2.c
index 1f0bfbe..c7f4b85 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "projection.h"
 
 /*!
  * @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /

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

diff --git a/src/mspells4.c b/src/mspells4.c
index 823af9e..8e39f49 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -7,6 +7,7 @@
 
 
 #include "angband.h"
+#include "projection.h"
 
 /*!
 * @brief モンスターIDを取り、モンスター名をm_nameに代入する /

diff --git a/src/projection.h b/src/projection.h
new file mode 100644 (file)
index 0000000..e5b2388
--- /dev/null
+++ b/src/projection.h
@@ -0,0 +1,19 @@
+/*
+ * project()関数に用いられる、遠隔攻撃特性ビットフラグ / Bit flags for the "project()" function
+ */
+#define PROJECT_JUMP        0x0001 /*!< 遠隔攻撃特性: 発動者からの軌跡を持たず、指定地点に直接発生する(予め置いたトラップ、上空からの発生などのイメージ) / Jump directly to the target location (this is a hack) */
+#define PROJECT_BEAM        0x0002 /*!< 遠隔攻撃特性: ビーム範囲を持つ。 / Work as a beam weapon (affect every grid passed through) */
+#define PROJECT_THRU        0x0004 /*!< 遠隔攻撃特性: 目標地点に到達しても射程と遮蔽の限り引き延ばす。 / Continue "through" the target (used for "bolts"/"beams") */
+#define PROJECT_STOP        0x0008 /*!< 遠隔攻撃特性: 道中にプレイヤーかモンスターがいた時点で到達地点を更新して停止する(壁や森はPROJECT_DISIがない限り最初から貫通しない) */
+#define PROJECT_GRID        0x0010 /*!< 遠隔攻撃特性: 射程内の地形に影響を及ぼす / Affect each grid in the "blast area" in some way */
+#define PROJECT_ITEM        0x0020 /*!< 遠隔攻撃特性: 射程内のアイテムに影響を及ぼす / Affect each object in the "blast area" in some way */
+#define PROJECT_KILL        0x0040 /*!< 遠隔攻撃特性: 射程内のモンスターに影響を及ぼす / Affect each monster in the "blast area" in some way */
+#define PROJECT_HIDE        0x0080 /*!< 遠隔攻撃特性: / Hack -- disable "visual" feedback from projection */
+#define PROJECT_DISI        0x0100 /*!< 遠隔攻撃特性: / Disintegrate non-permanent features */
+#define PROJECT_PLAYER      0x0200 /*!< 遠隔攻撃特性: / Main target is player (used for riding player) */
+#define PROJECT_AIMED       0x0400 /*!< 遠隔攻撃特性: / Target is only player or monster, so don't affect another. Depend on PROJECT_PLAYER. (used for minimum (rad == 0) balls on riding player) */
+#define PROJECT_REFLECTABLE 0x0800 /*!< 遠隔攻撃特性: 反射可能(ボルト系魔法に利用) / Refrectable spell attacks (used for "bolts") */
+#define PROJECT_NO_HANGEKI  0x1000 /*!< 遠隔攻撃特性: / Avoid counter attacks of monsters */
+#define PROJECT_PATH        0x2000 /*!< 遠隔攻撃特性: / Only used for printing project path */
+#define PROJECT_FAST        0x4000 /*!< 遠隔攻撃特性: / Hide "visual" of flying bolts until blast */
+#define PROJECT_LOS         0x8000 /*!< 遠隔攻撃特性: /  */

diff --git a/src/realm-arcane.c b/src/realm-arcane.c
index 186104f..1f4ca7e 100644 (file)
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "cmd-spell.h"
+#include "projection.h"
 
 /*!
 * @brief 秘術領域魔法の各処理を行う

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index c6991d5..5c07933 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "cmd-spell.h"
 #include "spells-summon.h"
+#include "projection.h"
 
 /*!
 * @brief カオス領域魔法の各処理を行う

diff --git a/src/realm-craft.c b/src/realm-craft.c
index a7946dd..9667a21 100644 (file)
--- a/src/realm-craft.c
+++ b/src/realm-craft.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "cmd-spell.h"
 #include "selfinfo.h"
+#include "projection.h"
 
 
 

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index a95a671..10d545e 100644 (file)
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "cmd-spell.h"
 #include "spells-summon.h"
+#include "projection.h"
 
 
 

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index 0ca0221..713b5fb 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -2,6 +2,7 @@
 #include "angband.h"
 #include "cmd-spell.h"
 #include "spells-summon.h"
+#include "projection.h"
 
 /*!
 * @brief 悪魔領域魔法の各処理を行う

diff --git a/src/realm-death.c b/src/realm-death.c
index 7178b60..cb6fe6e 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "cmd-spell.h"
+#include "projection.h"
 
 
 

diff --git a/src/realm-hex.c b/src/realm-hex.c
index b6032e8..7a614eb 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -20,6 +20,7 @@
 #include "cmd-quaff.h"
 #include "object-hook.h"
 #include "object-curse.h"
+#include "projection.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
 

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 9abe687..4c43059 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -2,6 +2,7 @@
 #include "cmd-spell.h"
 #include "melee.h"
 #include "monsterrace-hook.h"
+#include "projection.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/realm-life.c b/src/realm-life.c
index c866ac7..f772d4f 100644 (file)
--- a/src/realm-life.c
+++ b/src/realm-life.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "cmd-spell.h"
+#include "projection.h"
 
 /*!
 * @brief 生命領域魔法の各処理を行う

diff --git a/src/realm-nature.c b/src/realm-nature.c
index ea815a6..73221dc 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -1,5 +1,6 @@
 #include "angband.h"\r
 #include "cmd-spell.h"\r
+#include "projection.h"\r
 \r
 \r
 /*!\r

diff --git a/src/realm-song.c b/src/realm-song.c
index ba614c0..972ce42 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "cmd-spell.h"
+#include "projection.h"
 
 /*!
 * @brief 歌の開始を処理する / Start singing if the player is a Bard

diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c
index 92f6393..6de9178 100644 (file)
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "cmd-spell.h"
 #include "selfinfo.h"
+#include "projection.h"
 
 /*!
 * @brief 仙術領域魔法の各処理を行う

diff --git a/src/realm-trump.c b/src/realm-trump.c
index b993e99..b8a805b 100644 (file)
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "cmd-spell.h"
+#include "projection.h"
 
 
 /*!

diff --git a/src/spells1.c b/src/spells1.c
index 08ab7b0..8e75c6a 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -19,6 +19,7 @@
 #include "monsterrace-hook.h"
 #include "melee.h"
 #include "world.h"
+#include "projection.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */

diff --git a/src/spells2.c b/src/spells2.c
index 1e4a09a..c8162bb 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -17,6 +17,7 @@
 #include "monsterrace-hook.h"
 #include "melee.h"
 #include "world.h"
+#include "projection.h"
 
 
 /*!

diff --git a/src/spells3.c b/src/spells3.c
index ca982e7..fb91369 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -16,6 +16,8 @@
 #include "object-hook.h"
 #include "melee.h"
 #include "player-status.h"
+#include "projection.h"
+
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */
 #define MAX_TRIES 100

diff --git a/src/trap.c b/src/trap.c
index c750f19..b232f7c 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -2,6 +2,7 @@
 #include "floor.h"\r
 #include "trap.h"\r
 #include "player-damage.h"\r
+#include "projection.h"\r
 \r
 static s16b normal_traps[MAX_NORMAL_TRAPS];\r
 \r

diff --git a/src/xtra2.c b/src/xtra2.c
index 4972294..48d2537 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -17,6 +17,7 @@
 #include "monsterrace-hook.h"
 #include "objectkind-hook.h"
 #include "sort.h"
+#include "projection.h"
 
 #define REWARD_CHANCE 10