[Refactor] #4508 race-sex-const.cpp を削除し、race-sex-const.h をrace-sex.h に解明した

diff --git a/VisualStudio/Hengband/Hengband.vcxproj b/VisualStudio/Hengband/Hengband.vcxproj
index ddfa580..83683b5 100644 (file)
--- a/VisualStudio/Hengband/Hengband.vcxproj
+++ b/VisualStudio/Hengband/Hengband.vcxproj
@@ -281,7 +281,6 @@
     <ClCompile Include="..\..\src\main-win\main-win-exception.cpp" />\r
     <ClCompile Include="..\..\src\market\melee-arena.cpp" />\r
     <ClCompile Include="..\..\src\monster-race\race-brightness-mask.cpp" />\r
-    <ClCompile Include="..\..\src\monster-race\race-sex-const.cpp" />\r
     <ClCompile Include="..\..\src\monster\monster-pain-describer.cpp" />\r
     <ClCompile Include="..\..\src\net\curl-easy-session.cpp" />\r
     <ClCompile Include="..\..\src\net\curl-slist.cpp" />\r
@@ -1952,7 +1951,7 @@
     <ClInclude Include="..\..\src\wizard\tval-descriptions-table.h" />\r
     <ClInclude Include="..\..\src\load\quest-loader.h" />\r
     <ClInclude Include="..\..\src\view\display-store.h" />\r
-    <ClInclude Include="..\..\src\monster-race\race-sex-const.h" />\r
+    <ClInclude Include="..\..\src\monster-race\race-sex.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\system\angband.h" />\r

diff --git a/VisualStudio/Hengband/Hengband.vcxproj.filters b/VisualStudio/Hengband/Hengband.vcxproj.filters
index 91e0eee..75d11af 100644 (file)
--- a/VisualStudio/Hengband/Hengband.vcxproj.filters
+++ b/VisualStudio/Hengband/Hengband.vcxproj.filters
@@ -2496,9 +2496,6 @@
     <ClCompile Include="..\..\src\system\angband-system.cpp">\r
       <Filter>system</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\monster-race\race-sex-const.cpp">\r
-      <Filter>monster-race</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\room\rooms-pit.cpp">\r
       <Filter>room</Filter>\r
     </ClCompile>\r
@@ -5427,7 +5424,7 @@
     <ClInclude Include="..\..\src\system\angband-system.h">\r
       <Filter>system</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\monster-race\race-sex-const.h">\r
+    <ClInclude Include="..\..\src\monster-race\race-sex.h">\r
       <Filter>monster-race</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\monster-race\race-misc-flags.h">\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 69c926f..0da45a5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -529,7 +529,7 @@ hengband_SOURCES = \
        monster-race/race-misc-flags.h \
        monster-race/race-population-flags.h \
        monster-race/race-resistance-mask.cpp monster-race/race-resistance-mask.h \
-       monster-race/race-sex-const.cpp monster-race/race-sex-const.h \
+       monster-race/race-sex.h \
        monster-race/race-speak-flags.h \
        monster-race/race-special-flags.h \
        monster-race/race-visual-flags.h \

diff --git a/src/info-reader/race-info-tokens-table.cpp b/src/info-reader/race-info-tokens-table.cpp
index 2e6eff3..b079e75 100644 (file)
--- a/src/info-reader/race-info-tokens-table.cpp
+++ b/src/info-reader/race-info-tokens-table.cpp
@@ -11,7 +11,7 @@
 #include "monster-race/race-kind-flags.h"
 #include "monster-race/race-misc-flags.h"
 #include "monster-race/race-population-flags.h"
-#include "monster-race/race-sex-const.h"
+#include "monster-race/race-sex.h"
 #include "monster-race/race-speak-flags.h"
 #include "monster-race/race-special-flags.h"
 #include "monster-race/race-visual-flags.h"

diff --git a/src/lore/monster-lore.cpp b/src/lore/monster-lore.cpp
index 0a579c3..05cd05c 100644 (file)
--- a/src/lore/monster-lore.cpp
+++ b/src/lore/monster-lore.cpp
@@ -11,7 +11,6 @@
 #include "lore/magic-types-setter.h"
 #include "monster-race/race-indice-types.h"
 #include "monster-race/race-misc-flags.h"
-#include "monster-race/race-sex-const.h"
 #include "player-ability/player-ability-types.h"
 #include "system/angband.h"
 #include "system/monster-race-info.h"

diff --git a/src/monster-race/race-sex-const.cpp b/src/monster-race/race-sex-const.cpp
deleted file mode 100644 (file)
index 024529c..0000000
--- a/src/monster-race/race-sex-const.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "monster-race/race-sex-const.h"

diff --git a/src/monster-race/race-sex-const.h b/src/monster-race/race-sex.h
similarity index 100%
rename from src/monster-race/race-sex-const.h
rename to src/monster-race/race-sex.h

diff --git a/src/monster/monster-describer.cpp b/src/monster/monster-describer.cpp
index e91a18f..04d8e98 100644 (file)
--- a/src/monster/monster-describer.cpp
+++ b/src/monster/monster-describer.cpp
@@ -1,7 +1,7 @@
 #include "monster/monster-describer.h"
 #include "io/files-util.h"
 #include "locale/english.h"
-#include "monster-race/race-sex-const.h"
+#include "monster-race/race-sex.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"

diff --git a/src/system/monster-race-info.cpp b/src/system/monster-race-info.cpp
index 4dec81f..30d98a6 100644 (file)
--- a/src/system/monster-race-info.cpp
+++ b/src/system/monster-race-info.cpp
@@ -3,6 +3,7 @@
 #include "monster-attack/monster-attack-table.h"
 #include "monster-race/race-indice-types.h"
 #include "monster-race/race-resistance-mask.h"
+#include "monster-race/race-sex.h"
 #include "monster/horror-descriptions.h"
 #include "system/redrawing-flags-updater.h"
 #include "tracking/lore-tracker.h"

diff --git a/src/system/monster-race-info.h b/src/system/monster-race-info.h
index 9a3b73f..c57126d 100644 (file)
--- a/src/system/monster-race-info.h
+++ b/src/system/monster-race-info.h
@@ -11,7 +11,6 @@
 #include "monster-race/race-kind-flags.h"
 #include "monster-race/race-misc-flags.h"
 #include "monster-race/race-population-flags.h"
-#include "monster-race/race-sex-const.h"
 #include "monster-race/race-speak-flags.h"
 #include "monster-race/race-special-flags.h"
 #include "monster-race/race-visual-flags.h"
@@ -35,6 +34,7 @@ enum class MonsterRaceId : short;
 enum class RaceBlowEffectType;
 enum class RaceBlowMethodType;
 enum class MonsterSex;
+enum class RaceBlowMethodType;
 
 class MonsterBlow {
 public:

diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp
index 9fa3157..f1bb441 100644 (file)
--- a/src/target/target-describer.cpp
+++ b/src/target/target-describer.cpp
@@ -16,6 +16,7 @@
 #include "io/input-key-acceptor.h"
 #include "locale/english.h"
 #include "lore/lore-util.h"
+#include "monster-race/race-sex.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"