[Refactor] #37353 モンスター呪文の定義を monster-spell.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 329f03d..ef25341 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -388,23 +388,6 @@
 #define have_dark_flag(ARRAY) \
        (have_flag(ARRAY, TR_LITE_M1) || have_flag(ARRAY, TR_LITE_M2) || have_flag(ARRAY, TR_LITE_M3))
 
-/* Spell Type flag */
-#define MONSTER_TO_PLAYER     0x01
-#define MONSTER_TO_MONSTER    0x02
-
-/* summoning number */
-#define S_NUM_6     (easy_band ? 2 : 6)
-#define S_NUM_4     (easy_band ? 1 : 4)
-
-/* monster spell number */
-#define RF4_SPELL_START 32 * 3
-#define RF5_SPELL_START 32 * 4
-#define RF6_SPELL_START 32 * 5
-
-#define RF4_SPELL_SIZE 32
-#define RF5_SPELL_SIZE 32
-#define RF6_SPELL_SIZE 32
-
 /* Cheat Info Type */
 #define CHEAT_OBJECT 0
 #define CHEAT_MONSTER 1

diff --git a/src/monster-spell.h b/src/monster-spell.h
index 7cd0158..be3f56e 100644 (file)
--- a/src/monster-spell.h
+++ b/src/monster-spell.h
@@ -14,6 +14,23 @@ struct monster_power
        concptr    name;
 };
 
+/* Spell Type flag */
+#define MONSTER_TO_PLAYER     0x01
+#define MONSTER_TO_MONSTER    0x02
+
+/* summoning number */
+#define S_NUM_6     (easy_band ? 2 : 6)
+#define S_NUM_4     (easy_band ? 1 : 4)
+
+/* monster spell number */
+#define RF4_SPELL_START 32 * 3
+#define RF5_SPELL_START 32 * 4
+#define RF6_SPELL_START 32 * 5
+
+#define RF4_SPELL_SIZE 32
+#define RF5_SPELL_SIZE 32
+#define RF6_SPELL_SIZE 32
+
 /* Spell Damage Calc Flag*/
 #define DAM_ROLL 1
 #define DAM_MAX 2