[Refactor] #40478 Separated mind-blue-mage.h from monster-spell.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 16b8aef..4a9b88c 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -592,6 +592,7 @@
     <ClInclude Include="..\..\src\io\input-key-requester.h" />\r
     <ClInclude Include="..\..\src\locale\language-switcher.h" />\r
     <ClInclude Include="..\..\src\locale\vowel-checker.h" />\r
+    <ClInclude Include="..\..\src\mind\mind-blue-mage.h" />\r
     <ClInclude Include="..\..\src\system\alloc-entries.h" />\r
     <ClInclude Include="..\..\src\term\screen-processor.h" />\r
     <ClInclude Include="..\..\src\util\bit-flags-calculator.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 5711ef9..6de557f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3073,6 +3073,9 @@
     <ClInclude Include="..\..\src\spell-realm\spells-song.h">
       <Filter>spell-realm</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\mind\mind-blue-mage.h">
+      <Filter>mind</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 26a2552..da27cef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -293,6 +293,7 @@ hengband_SOURCES = \
        \
        mind/drs-typs.h \
        mind/mind.c mind/mind.h \
+       mind/mind-blue-mage.h \
        mind/mind-cavalry.c mind/mind-cavalry.h \
        mind/mind-force-trainer.c mind/mind-force-trainer.h \
        mind/mind-mindcrafter.c mind/mind-mindcrafter.h \

diff --git a/src/io-dump/special-class-dump.c b/src/io-dump/special-class-dump.c
index ea332c1..ed74a29 100644 (file)
--- a/src/io-dump/special-class-dump.c
+++ b/src/io-dump/special-class-dump.c
@@ -7,6 +7,7 @@
 #include "io-dump/special-class-dump.h"
 #include "cmd-item/cmd-magiceat.h"
 #include "cmd-item/cmd-smith.h"
+#include "mind/mind-blue-mage.h"
 #include "mspell/monster-spell.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"

diff --git a/src/mind/mind-blue-mage.h b/src/mind/mind-blue-mage.h
new file mode 100644 (file)
index 0000000..adf8263
--- /dev/null
+++ b/src/mind/mind-blue-mage.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#define MONSPELL_TYPE_BOLT 1
+#define MONSPELL_TYPE_BALL 2
+#define MONSPELL_TYPE_BREATH 3
+#define MONSPELL_TYPE_SUMMON 4
+#define MONSPELL_TYPE_OTHER 5

diff --git a/src/mspell/monster-spell.h b/src/mspell/monster-spell.h
index b6fbcf0..943e32f 100644 (file)
--- a/src/mspell/monster-spell.h
+++ b/src/mspell/monster-spell.h
@@ -36,11 +36,6 @@ struct monster_power
 #define BASE_DAM 8
 
 #define MAX_MONSPELLS 96
-#define MONSPELL_TYPE_BOLT 1
-#define MONSPELL_TYPE_BALL 2
-#define MONSPELL_TYPE_BREATH 3
-#define MONSPELL_TYPE_SUMMON 4
-#define MONSPELL_TYPE_OTHER 5
 
 /*
  * Hack -- choose "intelligent" spells when desperate

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index c37aa09..63b509b 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -26,6 +26,7 @@
 #include "lore/lore-calculator.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "mind/mind-blue-mage.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race.h"