[WIP] [Refactor] #39963 Moved realm*.c/h to realm/realm*.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 8e1c8f6..c827dc0 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -297,14 +297,14 @@
     <ClCompile Include="..\..\src\player\race-resistances.c" />\r
     <ClCompile Include="..\..\src\player\temporary-resistances.c" />\r
     <ClCompile Include="..\..\src\quest.c" />\r
-    <ClCompile Include="..\..\src\realm-craft.c" />\r
-    <ClCompile Include="..\..\src\realm-crusade.c" />\r
-    <ClCompile Include="..\..\src\realm-daemon.c" />\r
-    <ClCompile Include="..\..\src\realm-death.c" />\r
-    <ClCompile Include="..\..\src\realm-hissatsu.c" />\r
-    <ClCompile Include="..\..\src\realm-nature.c" />\r
-    <ClCompile Include="..\..\src\realm-song.c" />\r
-    <ClCompile Include="..\..\src\realm-sorcery.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-craft.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-crusade.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-daemon.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-death.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-hissatsu.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-nature.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-song.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-sorcery.c" />\r
     <ClCompile Include="..\..\src\spell\spells-common.c" />\r
     <ClInclude Include="..\..\src\artifact.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-command-menu.h" />\r
@@ -375,12 +375,12 @@
     <ClCompile Include="..\..\src\object2.c" />\r
     <ClCompile Include="..\..\src\racial.c" />\r
     <ClCompile Include="..\..\src\readdib.c" />\r
-    <ClCompile Include="..\..\src\realm-arcane.c" />\r
-    <ClCompile Include="..\..\src\realm-chaos.c" />\r
-    <ClCompile Include="..\..\src\realm-hex.c" />\r
-    <ClCompile Include="..\..\src\realm-life.c" />\r
-    <ClCompile Include="..\..\src\realm-trump.c" />\r
-    <ClCompile Include="..\..\src\realm.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-arcane.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-chaos.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-hex.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-life.c" />\r
+    <ClCompile Include="..\..\src\realm\realm-trump.c" />\r
+    <ClCompile Include="..\..\src\realm\realm.c" />\r
     <ClCompile Include="..\..\src\report.c" />\r
     <ClCompile Include="..\..\src\rooms-city.c" />\r
     <ClCompile Include="..\..\src\rooms-fractal.c" />\r
@@ -575,20 +575,20 @@
     <ClInclude Include="..\..\src\quest.h" />\r
     <ClInclude Include="..\..\src\racial.h" />\r
     <ClInclude Include="..\..\src\readdib.h" />\r
-    <ClInclude Include="..\..\src\realm-arcane.h" />\r
-    <ClInclude Include="..\..\src\realm-chaos.h" />\r
-    <ClInclude Include="..\..\src\realm-craft.h" />\r
-    <ClInclude Include="..\..\src\realm-crusade.h" />\r
-    <ClInclude Include="..\..\src\realm-daemon.h" />\r
-    <ClInclude Include="..\..\src\realm-death.h" />\r
-    <ClInclude Include="..\..\src\realm-hex.h" />\r
-    <ClInclude Include="..\..\src\realm-hissatsu.h" />\r
-    <ClInclude Include="..\..\src\realm-life.h" />\r
-    <ClInclude Include="..\..\src\realm-nature.h" />\r
-    <ClInclude Include="..\..\src\realm-song.h" />\r
-    <ClInclude Include="..\..\src\realm-sorcery.h" />\r
-    <ClInclude Include="..\..\src\realm-trump.h" />\r
-    <ClInclude Include="..\..\src\realm.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-arcane.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-chaos.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-craft.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-crusade.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-daemon.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-death.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-hex.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-hissatsu.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-life.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-nature.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-song.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-sorcery.h" />\r
+    <ClInclude Include="..\..\src\realm\realm-trump.h" />\r
+    <ClInclude Include="..\..\src\realm\realm.h" />\r
     <ClInclude Include="..\..\src\report.h" />\r
     <ClInclude Include="..\..\src\rooms-city.h" />\r
     <ClInclude Include="..\..\src\rooms-fractal.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 3da005d..b9c1e6a 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -142,45 +142,6 @@
     <ClCompile Include="..\..\src\player-effects.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\realm-arcane.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-chaos.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-craft.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-crusade.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-daemon.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-death.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-hex.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-hissatsu.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-life.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-nature.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-song.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-sorcery.c">
-      <Filter>spell</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\realm-trump.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mspells4.c">
       <Filter>spell</Filter>
     </ClCompile>
@@ -301,9 +262,6 @@
     <ClCompile Include="..\..\src\targeting.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\realm.c">
-      <Filter>spell</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\creature.c">
       <Filter>creature</Filter>
     </ClCompile>
@@ -697,6 +655,48 @@
     <ClCompile Include="..\..\src\spell\spells-common.c">
       <Filter>spell</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-arcane.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-chaos.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-craft.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-crusade.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-daemon.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-death.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-hex.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-hissatsu.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-life.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-nature.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-song.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-sorcery.c">
+      <Filter>realm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\realm\realm-trump.c">
+      <Filter>realm</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -830,45 +830,6 @@
     <ClInclude Include="..\..\src\player-effects.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\realm-arcane.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-chaos.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-craft.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-crusade.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-daemon.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-death.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-hex.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-hissatsu.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-life.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-nature.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-song.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-sorcery.h">
-      <Filter>spell</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\realm-trump.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster-spell.h">
       <Filter>spell</Filter>
     </ClInclude>
@@ -974,9 +935,6 @@
     <ClInclude Include="..\..\src\snipe.h">
       <Filter>cmd</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\realm.h">
-      <Filter>spell</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\targeting.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -1397,6 +1355,48 @@
     <ClInclude Include="..\..\src\spell\spells-common.h">
       <Filter>spell</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-arcane.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-chaos.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-craft.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-crusade.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-daemon.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-death.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-hex.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-hissatsu.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-life.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-nature.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-song.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-sorcery.h">
+      <Filter>realm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\realm\realm-trump.h">
+      <Filter>realm</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -1457,6 +1457,9 @@
     <Filter Include="spell">
       <UniqueIdentifier>{4e443fe1-9ff8-4786-b43f-7e4d106760dc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="realm">
+      <UniqueIdentifier>{c4ce5c0c-f907-4e62-abc1-5d9dbe7f1abf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 564870b..fe91209 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,13 +139,20 @@ hengband_SOURCES = \
        quest.h quest.c\
        \
        racial.c racial.h \
-       realm.c realm.h \
-       realm-arcane.c realm-arcane.h realm-chaos.c realm-chaos.h \
-       realm-craft.c realm-craft.h realm-crusade.c realm-crusade.h \
-       realm-daemon.c realm-daemon.h realm-death.c realm-death.h \
-       realm-hex.c realm-hex.h realm-hissatsu.c realm-hissatsu.h \
-       realm-life.c realm-life.h realm-nature.c realm-nature.h realm-song.c \
-       realm-song.h realm-sorcery.c realm-sorcery.h realm-trump.c realm-trump.h \
+       realm/realm.c realm/realm.h \
+       realm/realm-arcane.c realm/realm-arcane.h \
+       realm/realm-chaos.c realm/realm-chaos.h \
+       realm/realm-craft.c realm/realm-craft.h \
+       realm/realm-crusade.c realm/realm-crusade.h \
+       realm/realm-daemon.c realm/realm-daemon.h \
+       realm/realm-death.c realm/realm-death.h \
+       realm/realm-hex.c realm/realm-hex.h 
+       realm/realm-hissatsu.c realm/realm-hissatsu.h \
+       realm/realm-life.c realm/realm-life.h 
+       realm/realm-nature.c realm/realm-nature.h realm/realm-song.c \
+       realm/realm-song.h realm/realm-sorcery.c \
+       realm/realm-sorcery.h realm/realm-trump.c realm/realm-trump.h \
+       \
        report.c report.h \
        rooms.c rooms-city.c rooms-city.h rooms-fractal.c rooms-fractal.h \
        rooms.h rooms-normal.c rooms-normal.h \

diff --git a/src/realm-arcane.c b/src/realm/realm-arcane.c
similarity index 100%
rename from src/realm-arcane.c
rename to src/realm/realm-arcane.c

diff --git a/src/realm-arcane.h b/src/realm/realm-arcane.h
similarity index 100%
rename from src/realm-arcane.h
rename to src/realm/realm-arcane.h

diff --git a/src/realm-chaos.c b/src/realm/realm-chaos.c
similarity index 100%
rename from src/realm-chaos.c
rename to src/realm/realm-chaos.c

diff --git a/src/realm-chaos.h b/src/realm/realm-chaos.h
similarity index 100%
rename from src/realm-chaos.h
rename to src/realm/realm-chaos.h

diff --git a/src/realm-craft.c b/src/realm/realm-craft.c
similarity index 100%
rename from src/realm-craft.c
rename to src/realm/realm-craft.c

diff --git a/src/realm-craft.h b/src/realm/realm-craft.h
similarity index 100%
rename from src/realm-craft.h
rename to src/realm/realm-craft.h

diff --git a/src/realm-crusade.c b/src/realm/realm-crusade.c
similarity index 100%
rename from src/realm-crusade.c
rename to src/realm/realm-crusade.c

diff --git a/src/realm-crusade.h b/src/realm/realm-crusade.h
similarity index 100%
rename from src/realm-crusade.h
rename to src/realm/realm-crusade.h

diff --git a/src/realm-daemon.c b/src/realm/realm-daemon.c
similarity index 100%
rename from src/realm-daemon.c
rename to src/realm/realm-daemon.c

diff --git a/src/realm-daemon.h b/src/realm/realm-daemon.h
similarity index 100%
rename from src/realm-daemon.h
rename to src/realm/realm-daemon.h

diff --git a/src/realm-death.c b/src/realm/realm-death.c
similarity index 100%
rename from src/realm-death.c
rename to src/realm/realm-death.c

diff --git a/src/realm-death.h b/src/realm/realm-death.h
similarity index 100%
rename from src/realm-death.h
rename to src/realm/realm-death.h

diff --git a/src/realm-hex.c b/src/realm/realm-hex.c
similarity index 100%
rename from src/realm-hex.c
rename to src/realm/realm-hex.c

diff --git a/src/realm-hex.h b/src/realm/realm-hex.h
similarity index 100%
rename from src/realm-hex.h
rename to src/realm/realm-hex.h

diff --git a/src/realm-hissatsu.c b/src/realm/realm-hissatsu.c
similarity index 100%
rename from src/realm-hissatsu.c
rename to src/realm/realm-hissatsu.c

diff --git a/src/realm-hissatsu.h b/src/realm/realm-hissatsu.h
similarity index 100%
rename from src/realm-hissatsu.h
rename to src/realm/realm-hissatsu.h

diff --git a/src/realm-life.c b/src/realm/realm-life.c
similarity index 100%
rename from src/realm-life.c
rename to src/realm/realm-life.c

diff --git a/src/realm-life.h b/src/realm/realm-life.h
similarity index 100%
rename from src/realm-life.h
rename to src/realm/realm-life.h

diff --git a/src/realm-nature.c b/src/realm/realm-nature.c
similarity index 100%
rename from src/realm-nature.c
rename to src/realm/realm-nature.c

diff --git a/src/realm-nature.h b/src/realm/realm-nature.h
similarity index 100%
rename from src/realm-nature.h
rename to src/realm/realm-nature.h

diff --git a/src/realm-song.c b/src/realm/realm-song.c
similarity index 100%
rename from src/realm-song.c
rename to src/realm/realm-song.c

diff --git a/src/realm-song.h b/src/realm/realm-song.h
similarity index 100%
rename from src/realm-song.h
rename to src/realm/realm-song.h

diff --git a/src/realm-sorcery.c b/src/realm/realm-sorcery.c
similarity index 100%
rename from src/realm-sorcery.c
rename to src/realm/realm-sorcery.c

diff --git a/src/realm-sorcery.h b/src/realm/realm-sorcery.h
similarity index 100%
rename from src/realm-sorcery.h
rename to src/realm/realm-sorcery.h

diff --git a/src/realm-trump.c b/src/realm/realm-trump.c
similarity index 100%
rename from src/realm-trump.c
rename to src/realm/realm-trump.c

diff --git a/src/realm-trump.h b/src/realm/realm-trump.h
similarity index 100%
rename from src/realm-trump.h
rename to src/realm/realm-trump.h

diff --git a/src/realm.c b/src/realm/realm.c
similarity index 100%
rename from src/realm.c
rename to src/realm/realm.c

diff --git a/src/realm.h b/src/realm/realm.h
similarity index 100%
rename from src/realm.h
rename to src/realm/realm.h