[Refactor] #38862 Moved rooms-pitnest.c/h to room/rooms-pit-nest.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 00c4bcc..29de0a5 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -358,7 +358,7 @@
     <ClCompile Include="..\..\src\rooms-city.c" />\r
     <ClCompile Include="..\..\src\rooms-fractal.c" />\r
     <ClCompile Include="..\..\src\rooms-normal.c" />\r
-    <ClCompile Include="..\..\src\rooms-pitnest.c" />\r
+    <ClCompile Include="..\..\src\room\rooms-pit-nest.c" />\r
     <ClCompile Include="..\..\src\rooms-special.c" />\r
     <ClCompile Include="..\..\src\rooms-trap.c" />\r
     <ClCompile Include="..\..\src\rooms-vault.c" />\r
@@ -565,7 +565,7 @@
     <ClInclude Include="..\..\src\rooms-city.h" />\r
     <ClInclude Include="..\..\src\rooms-fractal.h" />\r
     <ClInclude Include="..\..\src\rooms-normal.h" />\r
-    <ClInclude Include="..\..\src\rooms-pitnest.h" />\r
+    <ClInclude Include="..\..\src\room\rooms-pit-nest.h" />\r
     <ClInclude Include="..\..\src\rooms-special.h" />\r
     <ClInclude Include="..\..\src\rooms-trap.h" />\r
     <ClInclude Include="..\..\src\rooms-vault.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index c0f50ba..596877e 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -57,9 +57,6 @@
     <ClCompile Include="..\..\src\rooms-normal.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\rooms-pitnest.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\rooms-special.c">
       <Filter>floor</Filter>
     </ClCompile>
@@ -653,7 +650,10 @@
       <Filter>autopick</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\room\pit-nest-kinds-table.c">
-      <Filter>rooms</Filter>
+      <Filter>room</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\room\rooms-pit-nest.c">
+      <Filter>room</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -710,9 +710,6 @@
     <ClInclude Include="..\..\src\rooms-normal.h">
       <Filter>floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\rooms-pitnest.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\rooms-special.h">
       <Filter>floor</Filter>
     </ClInclude>
@@ -1311,7 +1308,10 @@
       <Filter>autopick</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\room\pit-nest-kinds-table.h">
-      <Filter>rooms</Filter>
+      <Filter>room</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\room\rooms-pit-nest.h">
+      <Filter>room</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1367,7 +1367,7 @@
     <Filter Include="autopick">
       <UniqueIdentifier>{7f5cb078-a335-428e-a2db-27ee6263155b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="rooms">
+    <Filter Include="room">
       <UniqueIdentifier>{318835ed-a803-4459-921e-f6afc5411baa}</UniqueIdentifier>
     </Filter>
   </ItemGroup>

diff --git a/src/Makefile.am b/src/Makefile.am
index a40378b..30835a8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,9 +137,10 @@ hengband_SOURCES = \
        realm-song.h realm-sorcery.c realm-sorcery.h realm-trump.c 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 rooms-pitnest.c rooms-pitnest.h \
+       rooms.h rooms-normal.c rooms-normal.h \
        rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h \
        rooms-vault.c rooms-vault.h \
+       room/rooms-pit-nest.c room/rooms-pit-nest.h \
        room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
        save.c save.h scores.c scores.h selfinfo.c selfinfo.h \
        snipe.c snipe.h \

diff --git a/src/rooms-pitnest.c b/src/room/rooms-pit-nest.c
similarity index 99%
rename from src/rooms-pitnest.c
rename to src/room/rooms-pit-nest.c
index 3f5fdc8..efa2a89 100644 (file)
--- a/src/rooms-pitnest.c
+++ b/src/room/rooms-pit-nest.c
@@ -4,7 +4,7 @@
 #include "grid.h"
 #include "floor-generate.h"
 #include "rooms.h"
-#include "rooms-pitnest.h"
+#include "room/rooms-pit-nest.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "sort.h"

diff --git a/src/rooms-pitnest.h b/src/room/rooms-pit-nest.h
similarity index 100%
rename from src/rooms-pitnest.h
rename to src/room/rooms-pit-nest.h

diff --git a/src/rooms.c b/src/rooms.c
index 7f46466..0542055 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -49,7 +49,7 @@
 #include "rooms-city.h"
 #include "rooms-fractal.h"
 #include "rooms-normal.h"
-#include "rooms-pitnest.h"
+#include "room/rooms-pit-nest.h"
 #include "rooms-special.h"
 #include "rooms-trap.h"
 #include "rooms-vault.h"