[Refactor] #38862 Moved geometry.c/h to floor/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index a0b6add..17669f6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -276,7 +276,7 @@
     <ClCompile Include="..\..\src\floor\floor-save.c" />\r
     <ClCompile Include="..\..\src\floor\floor-town.c" />\r
     <ClCompile Include="..\..\src\floor\floor.c" />\r
-    <ClCompile Include="..\..\src\geometry.c" />\r
+    <ClCompile Include="..\..\src\floor\geometry.c" />\r
     <ClCompile Include="..\..\src\history.c" />\r
     <ClCompile Include="..\..\src\monster\horror-descriptions.c" />\r
     <ClCompile Include="..\..\src\init.c" />\r
@@ -468,7 +468,7 @@
     <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\io\report.c" />\r
     <ClCompile Include="..\..\src\room\rooms-city.c" />\r
     <ClCompile Include="..\..\src\room\rooms-fractal.c" />\r
     <ClCompile Include="..\..\src\room\rooms-normal.c" />\r
@@ -637,7 +637,7 @@
     <ClInclude Include="..\..\src\floor\floor-town.h" />\r
     <ClInclude Include="..\..\src\floor\floor.h" />\r
     <ClInclude Include="..\..\src\gamevalue.h" />\r
-    <ClInclude Include="..\..\src\geometry.h" />\r
+    <ClInclude Include="..\..\src\floor\geometry.h" />\r
     <ClInclude Include="..\..\src\grid\grid.h" />\r
     <ClInclude Include="..\..\src\system\h-basic.h" />\r
     <ClInclude Include="..\..\src\system\h-config.h" />\r
@@ -691,7 +691,7 @@
     <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\io\report.h" />\r
     <ClInclude Include="..\..\src\room\rooms-city.h" />\r
     <ClInclude Include="..\..\src\room\rooms-fractal.h" />\r
     <ClInclude Include="..\..\src\room\rooms-normal.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 8d4af5a..6dc749a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -11,9 +11,6 @@
     <ClCompile Include="..\..\src\chuukei.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\geometry.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mind.c">
       <Filter>spell</Filter>
     </ClCompile>
@@ -35,9 +32,6 @@
     <ClCompile Include="..\..\src\scores.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\report.c">
-      <Filter>io</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\racial.c">
       <Filter>cmd</Filter>
     </ClCompile>
@@ -833,6 +827,12 @@
     <ClCompile Include="..\..\src\market\rumor.c">
       <Filter>market</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\io\report.c">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\floor\geometry.c">
+      <Filter>floor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -845,9 +845,6 @@
     <ClInclude Include="..\..\src\chuukei.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\geometry.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\mind.h">
       <Filter>spell</Filter>
     </ClInclude>
@@ -878,9 +875,6 @@
     <ClInclude Include="..\..\src\targeting.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\report.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\inet.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -1709,6 +1703,12 @@
     <ClInclude Include="..\..\src\market\umor.h">
       <Filter>market</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\io\report.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\floor\geometry.h">
+      <Filter>floor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 418854a..10eefda 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -31,7 +31,7 @@
 #include "player/avatar.h"
 #include "player/player-status.h"
 #include "realm/realm-hex.h"
-#include "geometry.h"
+#include "floor/geometry.h"
 #include "floor/wild.h"
 #include "grid/grid.h"
 #include "player/player-move.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index ff5603b..4b8d0db 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -23,7 +23,7 @@
 #include "floor/floor-events.h"
 #include "floor/floor-generate.h"
 #include "grid/feature.h"
-#include "geometry.h"
+#include "floor/geometry.h"
 #include "grid/grid.h"
 #include "monster/monster.h"
 #include "quest.h"

diff --git a/src/geometry.c b/src/floor/geometry.c
similarity index 99%
rename from src/geometry.c
rename to src/floor/geometry.c
index 770c8cf..8e68cd7 100644 (file)
--- a/src/geometry.c
+++ b/src/floor/geometry.c
@@ -1,5 +1,6 @@
 #include "system/angband.h"
 #include "floor/floor.h"
+#include "floor/geometry.h"
 
 /*!
  * キーパッドの方向を南から反時計回り順に列挙 / Global array for looping through the "keypad directions"

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

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 599db4a..1d4fe62 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -11,7 +11,7 @@
 #include "grid/feature.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"
-#include "geometry.h"
+#include "floor/geometry.h"
 #include "floor/wild.h"
 #include "market/store-util.h"
 

diff --git a/src/util.h b/src/util.h
index 7f8c7ff..04fa94e 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "geometry.h"
+#include "floor/geometry.h"
 
 /*
  * Hack -- allow use of "ASCII" and "EBCDIC" for "indexes", "digits",