[Refactor] #40572 Renamed floor-generate.c/h to floor-generator.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 33e1fba..35cc826 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -622,7 +622,7 @@
     <ClCompile Include="..\..\src\locale\english.c" />\r
     <ClCompile Include="..\..\src\grid\feature.c" />\r
     <ClCompile Include="..\..\src\floor\floor-events.c" />\r
-    <ClCompile Include="..\..\src\floor\floor-generate.c" />\r
+    <ClCompile Include="..\..\src\floor\floor-generator.c" />\r
     <ClCompile Include="..\..\src\floor\floor-save.c" />\r
     <ClCompile Include="..\..\src\floor\floor-town.c" />\r
     <ClCompile Include="..\..\src\floor\floor.c" />\r
@@ -1491,7 +1491,7 @@
     <ClInclude Include="..\..\src\grid\feature.h" />\r
     <ClInclude Include="..\..\src\io\files-util.h" />\r
     <ClInclude Include="..\..\src\floor\floor-events.h" />\r
-    <ClInclude Include="..\..\src\floor\floor-generate.h" />\r
+    <ClInclude Include="..\..\src\floor\floor-generator.h" />\r
     <ClInclude Include="..\..\src\floor\floor-save.h" />\r
     <ClInclude Include="..\..\src\floor\floor-town.h" />\r
     <ClInclude Include="..\..\src\floor\floor.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 1251380..a214c36 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -380,9 +380,6 @@
     <ClCompile Include="..\..\src\floor\floor-events.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\floor\floor-generate.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\floor\floor-save.c">
       <Filter>floor</Filter>
     </ClCompile>
@@ -1973,6 +1970,9 @@
     <ClCompile Include="..\..\src\floor\object-allocator.c">
       <Filter>floor</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\floor\floor-generator.c">
+      <Filter>floor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -2386,9 +2386,6 @@
     <ClInclude Include="..\..\src\floor\floor-events.h">
       <Filter>floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\floor\floor-generate.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\floor\floor-save.h">
       <Filter>floor</Filter>
     </ClInclude>
@@ -4294,6 +4291,9 @@
     <ClInclude Include="..\..\src\floor\floor-generator-util.h">
       <Filter>floor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\floor\floor-generator.h">
+      <Filter>floor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 550b220..0cd6888 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -210,7 +210,7 @@ hengband_SOURCES = \
        floor/floor-base-definitions.h \
        floor/floor-events.c floor/floor-events.h \
        floor/floor-generator-util.h \
-       floor/floor-generate.c floor/floor-generate.h \
+       floor/floor-generator.c floor/floor-generator.h \
        floor/floor-object.c floor/floor-object.h \
        floor/floor-save.h floor/floor-save.c \
        floor/floor-streams.c floor/floor-streams.h \

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generator.c
similarity index 99%
rename from src/floor/floor-generate.c
rename to src/floor/floor-generator.c
index f0d746b..dc6f838 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generator.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen. \n
  */
 
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "cmd-building/cmd-building.h"
 #include "cmd-io/cmd-dump.h"
 #include "dungeon/dungeon-flag-types.h"
@@ -21,7 +21,6 @@
 #include "floor/floor-allocation-types.h"
 #include "floor/floor-events.h"
 #include "floor/floor-generator-util.h"
-#include "floor/floor-generate.h"
 #include "floor/floor-save.h"
 #include "floor/floor-streams.h"
 #include "floor/floor.h" // todo 相互依存している、後で消す.

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

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 9277af5..f6ea5f2 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -18,7 +18,7 @@
 #include "dungeon/quest.h"
 #include "floor/cave.h"
 #include "floor/floor-events.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "floor/geometry.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index de36f23..3e7247d 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -1,5 +1,4 @@
 /*!
- * @file streams.c
  * @brief ダンジョン生成に利用する関数群 / Used by dungeon generation.
  * @date 2014/07/15
  * @author
@@ -20,7 +19,7 @@
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/floor-generator-util.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor-object.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index d920b16..2a97388 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -9,7 +9,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/cave.h"
 #include "floor/floor-generator-util.h"
-#include "floor/floor-generate.h" // todo 相互依存している、後で消す.
+#include "floor/floor-generator.h" // todo 相互依存している、後で消す.
 #include "floor/floor-object.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 0b76ca3..bd8b929 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -22,7 +22,7 @@
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "floor/cave.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor.h"
 #include "game-option/game-play-options.h"
 #include "game-option/map-screen-options.h"

diff --git a/src/load/floor-loader.c b/src/load/floor-loader.c
index 6819c03..797b726 100644 (file)
--- a/src/load/floor-loader.c
+++ b/src/load/floor-loader.c
@@ -1,5 +1,5 @@
 #include "load/floor-loader.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "game-option/birth-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"

diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c
index 999410c..9e5864f 100644 (file)
--- a/src/room/rooms-city.c
+++ b/src/room/rooms-city.c
@@ -1,5 +1,5 @@
 #include "room/rooms-city.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
 #include "game-option/cheat-types.h"

diff --git a/src/room/rooms-fractal.c b/src/room/rooms-fractal.c
index 6abdf50..30ddeb9 100644 (file)
--- a/src/room/rooms-fractal.c
+++ b/src/room/rooms-fractal.c
@@ -1,7 +1,7 @@
 #include "room/rooms-fractal.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "grid/grid.h"
 #include "room/cave-filler.h"
 #include "room/rooms-normal.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 4d34211..7871767 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -1,6 +1,6 @@
 #include "room/rooms-pit-nest.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor.h"
 #include "game-option/cheat-options.h"
 #include "game-option/cheat-types.h"

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index 5f30aee..e9248fa 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -1,7 +1,7 @@
 #include "room/rooms-special.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor.h"
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"

diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c
index f043a33..6017aef 100644 (file)
--- a/src/room/rooms-trap.c
+++ b/src/room/rooms-trap.c
@@ -1,6 +1,6 @@
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor.h"
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 676fecf..0677315 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -9,7 +9,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/cave.h"
 #include "floor/floor-generator-util.h"
-#include "floor/floor-generate.h"
+#include "floor/floor-generator.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
 #include "game-option/cheat-types.h"