[Refactor] #40014 Renamed monster.h to monster-type-definition.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index c5ce6cb..0243fde 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -534,7 +534,6 @@
     <ClInclude Include="..\..\src\monster\monster-description-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-flag-types.h" />\r
     <ClInclude Include="..\..\src\monster\monster-timed-effect-types.h" />\r
-    <ClInclude Include="..\..\src\monster\monster-type-definition.h" />\r
     <ClInclude Include="..\..\src\monster\monster1.h" />\r
     <ClInclude Include="..\..\src\monster\monster2.h" />\r
     <ClInclude Include="..\..\src\monster\place-monster-types.h" />\r
@@ -984,7 +983,7 @@
     <ClInclude Include="..\..\src\monster\monster-process.h" />\r
     <ClInclude Include="..\..\src\mspell\monster-spell.h" />\r
     <ClInclude Include="..\..\src\monster\monster-status.h" />\r
-    <ClInclude Include="..\..\src\monster\monster.h" />\r
+    <ClInclude Include="..\..\src\system\monster-type-definition.h" />\r
     <ClInclude Include="..\..\src\monster-race\monster-race-hook.h" />\r
     <ClInclude Include="..\..\src\monster-race\monster-race.h" />\r
     <ClInclude Include="..\..\src\mutation\mutation.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 029bd6e..4302936 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1783,9 +1783,6 @@
     <ClInclude Include="..\..\src\player\player-status.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster\monster.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster\monster-dist-offsets.h">
       <Filter>monster</Filter>
     </ClInclude>
@@ -2707,9 +2704,6 @@
     <ClInclude Include="..\..\src\monster\monster-timed-effect-types.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster\monster-type-definition.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\player\eldritch-horror.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -2719,6 +2713,9 @@
     <ClInclude Include="..\..\src\monster\monster1.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\system\monster-type-definition.h">
+      <Filter>system</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ae88a91..7b06740 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,7 +278,6 @@ hengband_SOURCES = \
        \
        monster/creature.h monster/creature.c \
        monster/horror-descriptions.c monster/horror-descriptions.h \
-       monster/monster.h \
        monster/monster1.c monster/monster1.h \
        monster/monster2.c monster/monster2.h \
        monster/monster-attack.c monster/monster-attack.h \
@@ -490,6 +489,7 @@ hengband_SOURCES = \
        system/angband.h system/angband-version.h \
        system/h-basic.h system/h-config.h \
        system/h-define.h system/h-system.h system/h-type.h \
+       system/monster-type-definition.h \
        system/system-variables.c system/system-variables.h \
        system/gamevalue.h \
        \

diff --git a/src/system/angband.h b/src/system/angband.h
index 4f69a35..eda7a1b 100644 (file)
--- a/src/system/angband.h
+++ b/src/system/angband.h
@@ -39,7 +39,7 @@
 #include "system/gamevalue.h"
 #include "cmd-io/cmd-gameoption.h"
 
-#include "monster/monster.h"
+#include "system/monster-type-definition.h"
 #include "monster-race/monster-race.h"
 #include "player/player-status.h"
 

diff --git a/src/monster/monster.h b/src/system/monster-type-definition.h
similarity index 100%
rename from src/monster/monster.h
rename to src/system/monster-type-definition.h