[Refactor] #40478 Moved various definitions from monster-spell.h to mspell-util.h

diff --git a/src/mspell/monster-spell.h b/src/mspell/monster-spell.h
index 03024ca..485b665 100644 (file)
--- a/src/mspell/monster-spell.h
+++ b/src/mspell/monster-spell.h
@@ -13,15 +13,6 @@ typedef struct monster_power {
     concptr name;
 } monster_power;
 
-/* Spell Type flag */
-#define MONSTER_TO_PLAYER 0x01
-#define MONSTER_TO_MONSTER 0x02
-
-/* monster spell number */
-#define RF4_SPELL_START 32 * 3
-#define RF5_SPELL_START 32 * 4
-#define RF6_SPELL_START 32 * 5
-
 #define MAX_MONSPELLS 96
 
 extern const monster_power monster_powers[MAX_MONSPELLS];

diff --git a/src/mspell/mspell-util.h b/src/mspell/mspell-util.h
index 382252a..8ae421b 100644 (file)
--- a/src/mspell/mspell-util.h
+++ b/src/mspell/mspell-util.h
@@ -3,6 +3,15 @@
 #include "system/angband.h"
 #include "floor/floor.h"
 
+/* Spell Type flag */
+#define MONSTER_TO_PLAYER 0x01
+#define MONSTER_TO_MONSTER 0x02
+
+/* monster spell number */
+#define RF4_SPELL_START 32 * 3
+#define RF5_SPELL_START 32 * 4
+#define RF6_SPELL_START 32 * 5
+
 bool see_monster(player_type* player_ptr, MONSTER_IDX m_idx);
 bool monster_near_player(floor_type* floor_ptr, MONSTER_IDX m_idx, MONSTER_IDX t_idx);
 void monspell_message_base(player_type* target_ptr, MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1, concptr msg2, concptr msg3, concptr msg4, bool msg_flag_aux, int TARGET_TYPE);

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index e0ea521..4572f71 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -36,6 +36,7 @@
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-learn-checker.h"
 #include "mspell/mspell-mask-definitions.h"
+#include "mspell/mspell-util.h"
 #include "object-enchant/object-curse.h"
 #include "player/player-class.h"
 #include "player/player-move.h"

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index fa3350b..fe9e908 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -32,6 +32,7 @@
 #include "mspell/assign-monster-spell.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-mask-definitions.h"
+#include "mspell/mspell-util.h"
 #include "pet/pet-util.h"
 #include "player/player-class.h"
 #include "player/player-move.h"