[Refactor] #38862 Moved floor*.c to floor/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index ab396a0..08b73af 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -271,11 +271,11 @@
     <ClCompile Include="..\..\src\dungeon\dungeon.c" />\r
     <ClCompile Include="..\..\src\english.c" />\r
     <ClCompile Include="..\..\src\feature.c" />\r
-    <ClCompile Include="..\..\src\floor-events.c" />\r
-    <ClCompile Include="..\..\src\floor-generate.c" />\r
-    <ClCompile Include="..\..\src\floor-save.c" />\r
-    <ClCompile Include="..\..\src\floor-town.c" />\r
-    <ClCompile Include="..\..\src\floor.c" />\r
+    <ClCompile Include="..\..\src\floor\floor-events.c" />\r
+    <ClCompile Include="..\..\src\floor\floor-generate.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
     <ClCompile Include="..\..\src\geometry.c" />\r
     <ClCompile Include="..\..\src\history.c" />\r
     <ClCompile Include="..\..\src\horror-descriptions.c" />\r
@@ -505,7 +505,7 @@
     <ClCompile Include="..\..\src\view\display-player-misc-info.c" />\r
     <ClCompile Include="..\..\src\view\status-first-page.c" />\r
     <ClCompile Include="..\..\src\market\store.c" />\r
-    <ClCompile Include="..\..\src\floor-streams.c" />\r
+    <ClCompile Include="..\..\src\floor\floor-streams.c" />\r
     <ClCompile Include="..\..\src\targeting.c" />\r
     <ClCompile Include="..\..\src\gameterm.c" />\r
     <ClCompile Include="..\..\src\trap.c" />\r
@@ -631,11 +631,11 @@
     <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
     <ClInclude Include="..\..\src\feature.h" />\r
     <ClInclude Include="..\..\src\files.h" />\r
-    <ClInclude Include="..\..\src\floor-events.h" />\r
-    <ClInclude Include="..\..\src\floor-generate.h" />\r
-    <ClInclude Include="..\..\src\floor-save.h" />\r
-    <ClInclude Include="..\..\src\floor-town.h" />\r
-    <ClInclude Include="..\..\src\floor.h" />\r
+    <ClInclude Include="..\..\src\floor\floor-events.h" />\r
+    <ClInclude Include="..\..\src\floor\floor-generate.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
     <ClInclude Include="..\..\src\gamevalue.h" />\r
     <ClInclude Include="..\..\src\geometry.h" />\r
     <ClInclude Include="..\..\src\grid.h" />\r
@@ -711,7 +711,7 @@
     <ClInclude Include="..\..\src\spells-object.h" />\r
     <ClInclude Include="..\..\src\spells-status.h" />\r
     <ClInclude Include="..\..\src\spells-summon.h" />\r
-    <ClInclude Include="..\..\src\floor-streams.h" />\r
+    <ClInclude Include="..\..\src\floor\floor-streams.h" />\r
     <ClInclude Include="..\..\src\spells-world.h" />\r
     <ClInclude Include="..\..\src\spell\spells1.h" />\r
     <ClInclude Include="..\..\src\market\store.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 7febe94..6b82da2 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -24,18 +24,6 @@
     <ClCompile Include="..\..\src\spells-world.c">
       <Filter>spell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\floor-events.c">
-      <Filter>floor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\floor-generate.c">
-      <Filter>floor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\floor-save.c">
-      <Filter>floor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\floor-streams.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\rooms.c">
       <Filter>floor</Filter>
     </ClCompile>
@@ -157,9 +145,6 @@
     <ClCompile Include="..\..\src\player-skill.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\floor.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\player-class.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -169,9 +154,6 @@
     <ClCompile Include="..\..\src\object-ego.c">
       <Filter>object</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\floor-town.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\player-race.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -829,6 +811,24 @@
     <ClCompile Include="..\..\src\core\system-variables.c">
       <Filter>core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\floor\floor.c">
+      <Filter>floor</Filter>
+    </ClCompile>
+    <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>
+    <ClCompile Include="..\..\src\floor\floor-streams.c">
+      <Filter>floor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\floor\floor-town.c">
+      <Filter>floor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -860,15 +860,6 @@
     <ClInclude Include="..\..\src\spells-world.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\floor.h">
-      <Filter>floor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\floor-events.h">
-      <Filter>floor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\floor-streams.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\rooms.h">
       <Filter>floor</Filter>
     </ClInclude>
@@ -935,12 +926,6 @@
     <ClInclude Include="..\..\src\object-boost.h">
       <Filter>object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\floor-save.h">
-      <Filter>floor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\floor-generate.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster-process.h">
       <Filter>monster</Filter>
     </ClInclude>
@@ -983,9 +968,6 @@
     <ClInclude Include="..\..\src\object-ego.h">
       <Filter>object</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\floor-town.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\player-race.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -1691,6 +1673,24 @@
     <ClInclude Include="..\..\src\core\system-variables.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\floor\floor.h">
+      <Filter>floor</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="..\..\src\floor\floor-streams.h">
+      <Filter>floor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\floor\floor-town.h">
+      <Filter>floor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 73eb62d..9a8e201 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,10 +102,10 @@ hengband_SOURCES = \
        dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
        dungeon/dungeon-file.c dungeon/dungeon-file.h \
        \
-       floor.c floor.h floor-events.c floor-events.h \
-       floor-generate.c floor-generate.h \
-       floor-save.h floor-save.c floor-town.h floor-town.c \
-       floor-streams.c floor-streams.h \
+       floor/floor.c floor/floor.h floor/floor-events.c floor/floor-events.h \
+       floor/floor-generate.c floor/floor-generate.h \
+       floor/floor-save.h floor/floor-save.c floor/floor-town.h floor/floor-town.c \
+       floor/floor-streams.c floor/floor-streams.h \
        floor/pattern-walk.c floor/pattern-walk.h \
        \
        feature.c feature.h \

diff --git a/src/artifact.c b/src/artifact.c
index 134f31b..5e36c7e 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -17,7 +17,7 @@
 #include "cmd-smith.h"
 
 #include "avatar.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "cmd-activate.h"
 #include "object.h"
 #include "object/object-kind.h"

diff --git a/src/birth/birth.c b/src/birth/birth.c
index cbd37a0..b618927 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -31,8 +31,8 @@
 #include "cmd/cmd-help.h"
 #include "dungeon/dungeon-file.h"
 #include "dungeon/dungeon.h"
-#include "floor-town.h"
-#include "floor.h"
+#include "floor/floor-town.h"
+#include "floor/floor.h"
 #include "history.h"
 #include "io/write-diary.h"
 #include "japanese.h"

diff --git a/src/character-dump.c b/src/character-dump.c
index 4606ee8..5c47cc5 100644 (file)
--- a/src/character-dump.c
+++ b/src/character-dump.c
@@ -1,7 +1,7 @@
 #include "character-dump.h"
 #include "core/angband-version.h"
 #include "world/world.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "dungeon/dungeon.h"
 #include "market/store.h"
 #include "cmd/cmd-pet.h"

diff --git a/src/chest.c b/src/chest.c
index 5322022..d478a7c 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -4,7 +4,7 @@
 
 #include "spell/spells-type.h"
 #include "spells-summon.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "trap.h"
 #include "player-status.h"
 #include "player-damage.h"

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index cdcfe3f..bcb71d3 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -44,7 +44,7 @@
 #include "player-personality.h"
 #include "quest.h"
 #include "artifact.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "cmd/feeling-table.h"
 #include "english.h"
 

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index 5a70d44..5fcf308 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -22,7 +22,7 @@
 #include "player/mimic-info-table.h"
 #include "player-class.h"
 #include "player-inventory.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"
 

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 0418859..2c8e090 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "spells-summon.h"
 #include "spells-status.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index 74afeff..753f442 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -4,7 +4,7 @@
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "melee.h"
 #include "sort.h"

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index fdb3529..302fb9f 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -27,7 +27,7 @@
 #include "spells-floor.h"
 #include "object-broken.h"
 #include "cmd-basic.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"
 #include "player-class.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 72eb52a..1bfe1ca 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -30,7 +30,7 @@
 #include "cmd/cmd-basic.h"
 #include "core/show-file.h"
 #include "files.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"
 #include "spell/spells-type.h"

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 1c70422..dc5b318 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -31,7 +31,7 @@
 #include "object-hook.h"
 #include "cmd-basic.h"
 #include "view/display-main-window.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "autopick/autopick-reader-writer.h"
 #include "japanese.h"
 #include "spell/spells-util.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index 27001f9..a227828 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -15,7 +15,7 @@
 #include "spells-floor.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"
 

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 9c3bae4..bef76ba 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -13,7 +13,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "cmd-basic.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 254b6c8..e9999ee 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -12,7 +12,7 @@
 #include "object/object-kind.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 95d73d6..33327f9 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -22,9 +22,9 @@
 #include "birth/birth.h"
 #include "creature.h"
 #include "feature.h"
-#include "floor-events.h"
-#include "floor-save.h"
-#include "floor.h"
+#include "floor/floor-events.h"
+#include "floor/floor-save.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "io/write-diary.h"
 #include "market/arena-info-table.h"

diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c
index 23f5e50..1a2f9d3 100644 (file)
--- a/src/core/turn-compensator.c
+++ b/src/core/turn-compensator.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "core/turn-compensator.h"
 #include "world/world.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "market/store-owners.h"
 #include "market/store-util.h"
 #include "market/store.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 5ce1a6a..a60ba1e 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -47,14 +47,14 @@
 #include "player-skill.h"
 #include "player-race.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "market/building.h"
 #include "world/world.h"
 #include "rooms-vault.h"
 #include "object/object-kind.h"
 #include "object-ego.h"
 #include "monsterrace.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "realm/realm.h"
 
 #include "trap.h"

diff --git a/src/floor-events.c b/src/floor/floor-events.c
similarity index 99%
rename from src/floor-events.c
rename to src/floor/floor-events.c
index a245610..539772f 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor/floor-events.c
@@ -2,8 +2,8 @@
 #include "util.h"
 
 #include "dungeon/dungeon.h"
-#include "floor.h"
-#include "floor-events.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
 #include "grid.h"
 #include "monster.h"
 #include "monster-status.h"

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

diff --git a/src/floor-generate.c b/src/floor/floor-generate.c
similarity index 99%
rename from src/floor-generate.c
rename to src/floor/floor-generate.c
index 0bfa95f..c79e999 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -107,12 +107,12 @@
 #include "market/arena-info-table.h"
 #include "rooms.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-streams.h"
-#include "floor-generate.h"
-#include "floor-events.h"
-#include "floor-generate.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-streams.h"
+#include "floor/floor-generate.h"
+#include "floor/floor-events.h"
+#include "floor/floor-generate.h"
 #include "feature.h"
 #include "trap.h"
 #include "monster.h"

diff --git a/src/floor-generate.h b/src/floor/floor-generate.h
similarity index 99%
rename from src/floor-generate.h
rename to src/floor/floor-generate.h
index 6fe995a..4bf11a8 100644 (file)
--- a/src/floor-generate.h
+++ b/src/floor/floor-generate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "floor.h"
+#include "floor/floor.h"
 
 /*!
  * @file generate.h

diff --git a/src/floor-save.c b/src/floor/floor-save.c
similarity index 99%
rename from src/floor-save.c
rename to src/floor/floor-save.c
index 014e292..e7e36ca 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor/floor-save.c
@@ -18,10 +18,10 @@
 
 #include "artifact.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-events.h"
-#include "floor-generate.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-events.h"
+#include "floor/floor-generate.h"
 #include "feature.h"
 #include "geometry.h"
 #include "grid.h"

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

diff --git a/src/floor-streams.c b/src/floor/floor-streams.c
similarity index 99%
rename from src/floor-streams.c
rename to src/floor/floor-streams.c
index d3c5c52..2542b5c 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -19,10 +19,10 @@
 #include "util.h"
 
 #include "artifact.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
-#include "floor-streams.h"
+#include "floor/floor.h"
+#include "floor/floor-streams.h"
 #include "grid.h"
 #include "monster.h"
 #include "feature.h"

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

diff --git a/src/floor-town.c b/src/floor/floor-town.c
similarity index 81%
rename from src/floor-town.c
rename to src/floor/floor-town.c
index 5faa3bd..b998ad2 100644 (file)
--- a/src/floor-town.c
+++ b/src/floor/floor-town.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 
 /*
  * Maximum number of towns

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

diff --git a/src/floor.c b/src/floor/floor.c
similarity index 99%
rename from src/floor.c
rename to src/floor/floor.c
index 53262ba..027ddc9 100644 (file)
--- a/src/floor.c
+++ b/src/floor/floor.c
@@ -1,7 +1,7 @@
 #include "angband.h"
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-generate.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-generate.h"
 #include "grid.h"
 #include "dungeon/dungeon.h"
 #include "rooms.h"

diff --git a/src/floor.h b/src/floor/floor.h
similarity index 99%
rename from src/floor.h
rename to src/floor/floor.h
index 7534943..4941f13 100644 (file)
--- a/src/floor.h
+++ b/src/floor/floor.h
@@ -3,7 +3,7 @@
 #include "feature.h"
 #include "grid.h"
 #include "object.h"
-#include "floor-save.h"
+#include "floor/floor-save.h"
 
 
 /*!

diff --git a/src/geometry.c b/src/geometry.c
index 572fe9f..ec24021 100644 (file)
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "floor.h"
+#include "floor/floor.h"
 
 /*!
  * キーパッドの方向を南から反時計回り順に列挙 / Global array for looping through the "keypad directions"

diff --git a/src/grid.c b/src/grid.c
index 8a32f69..6146dac 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -23,7 +23,7 @@
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "dungeon/dungeon.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "grid.h"
 #include "trap.h"
 #include "rooms.h"

diff --git a/src/init.c b/src/init.c
index b5b422b..3a0c250 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -50,8 +50,8 @@
 #include "dungeon/dungeon-file.h"
 #include "files.h"
 #include "feature.h"
-#include "floor.h"
-#include "floor-town.h"
+#include "floor/floor.h"
+#include "floor/floor-town.h"
 #include "dungeon/dungeon.h"
 #include "rooms-vault.h"
 #include "player-skill.h"

diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c
index 70f44e0..a6dd611 100644 (file)
--- a/src/io/signal-handlers.c
+++ b/src/io/signal-handlers.c
@@ -13,7 +13,7 @@
 #include "gameterm.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "floor-events.h"
+#include "floor/floor-events.h"
 
 s16b signal_count;             /* Hack -- Count interupts */
 

diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c
index 218921a..3421fa5 100644 (file)
--- a/src/knowledge/knowledge-inventory.c
+++ b/src/knowledge/knowledge-inventory.c
@@ -10,7 +10,7 @@
 #include "core/show-file.h"
 #include "object-flavor.h"
 #include "market/store-util.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "object-hook.h"
 #include "object/object-kind.h"
 

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
index ff47874..a31a23a 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -13,7 +13,7 @@
 #include "dungeon/dungeon-file.h"
 #include "world/world.h"
 #include "market/store-util.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "object-flavor.h"
 
 /*

diff --git a/src/load.c b/src/load.c
index 876f3ea..e46f8d0 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -51,7 +51,7 @@
 
 #include "dungeon/dungeon.h"
 #include "feature.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "trap.h"
 #include "mutation/mutation.h"
 #include "monster.h"
@@ -65,9 +65,9 @@
 #include "wild.h"
 #include "patron.h"
 
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-town.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-town.h"
 #include "grid.h"
 
 #include "cmd-pet.h"

diff --git a/src/main-win.c b/src/main-win.c
index d822f77..6d78e0e 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -102,8 +102,8 @@
 #include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-save.h"
 #include "view/display-main-window.h"
-#include "floor.h"
-#include "floor-events.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
 #include "init.h"
 #include "files.h"
 #include "scores.h"

diff --git a/src/market/black-market.c b/src/market/black-market.c
index 9eaa76b..8578d4b 100644 (file)
--- a/src/market/black-market.c
+++ b/src/market/black-market.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "object-hook.h"
 #include "market/black-market.h"
 #include "market/store-owners.h"

diff --git a/src/market/building.c b/src/market/building.c
index 31a28e9..04950e6 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -23,9 +23,9 @@
 #include "core/special-internal-keys.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-inn.h"
-#include "floor.h"
-#include "floor-events.h"
-#include "floor-save.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
+#include "floor/floor-save.h"
 #include "autopick/autopick.h"
 #include "object/object-kind.h"
 #include "object-boost.h"

diff --git a/src/market/store.c b/src/market/store.c
index 44a62c9..61ae63a 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -23,7 +23,7 @@
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"
 
-#include "floor.h"
+#include "floor/floor.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-basic.h"
 #include "cmd/cmd-diary.h"
@@ -48,7 +48,7 @@
 #include "player-inventory.h"
 #include "object-flavor.h"
 #include "object-hook.h"
-#include "floor-events.h"
+#include "floor/floor-events.h"
 #include "snipe.h"
 #include "files.h"
 #include "player-effects.h"
@@ -58,7 +58,7 @@
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "autopick/autopick-pref-processor.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "japanese.h"
 #include "view/display-main-window.h"
 #include "wild.h"

diff --git a/src/monster-status.c b/src/monster-status.c
index 2701b96..453fdcd 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -9,7 +9,7 @@
 #include "cmd/cmd-draw.h"
 #include "cmd/cmd-dump.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "monster.h"
 #include "monster-status.h"

diff --git a/src/monsterrace-hook.c b/src/monsterrace-hook.c
index a05d148..910bafa 100644 (file)
--- a/src/monsterrace-hook.c
+++ b/src/monsterrace-hook.c
@@ -4,7 +4,7 @@
 #include "monsterrace-hook.h"
 #include "monster.h"
 #include "monster-spell.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "dungeon/dungeon.h"
 #include "monsterrace.h"
 #include "melee.h"

diff --git a/src/mspells3.c b/src/mspells3.c
index c596e99..fb2fbcf 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "spells-summon.h"
 #include "avatar.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index a1b51a9..5e8aa54 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -33,7 +33,7 @@
 #include "object-hook.h"
 #include "cmd-basic.h"
 #include "files.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "targeting.h"
 #include "player-race.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/object-boost.c b/src/object-boost.c
index d2abd4c..a66ae07 100644 (file)
--- a/src/object-boost.c
+++ b/src/object-boost.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "object-boost.h"
 #include "object-boost.h"
 #include "cmd-activate.h"

diff --git a/src/object.h b/src/object.h
index 99d537a..d1b1e2d 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -422,7 +422,7 @@ extern int bow_tval_ammo(object_type *o_ptr);
 /*!
 * todo ここに置くとコンパイルは通る (このファイルの冒頭やobject2.cでincludeするとコンパイルエラー)、しかし圧倒的にダメなので要調整
 */
-#include "floor.h"
+#include "floor/floor.h"
 
 /* object2.c */
 extern void excise_object_idx(floor_type *floor_ptr, OBJECT_IDX o_idx);

diff --git a/src/object1.c b/src/object1.c
index 2a5a2ef..487ad21 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -17,7 +17,7 @@
 #include "util.h"
 
 #include "artifact.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "cmd-activate.h"
 #include "object/object-kind.h"
 #include "object-ego.h"

diff --git a/src/object2.c b/src/object2.c
index edfa029..313cd5e 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -24,7 +24,7 @@
 #include "cmd/cmd-spell.h"
 #include "spell/spells3.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "object/object-kind.h"
 #include "object-boost.h"

diff --git a/src/patron.c b/src/patron.c
index c411707..32b8f80 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -23,7 +23,7 @@
 #include "spells-object.h"
 #include "spells-status.h"
 #include "spells-floor.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "spell/spells2.h"
 
 #ifdef JP

diff --git a/src/player-damage.c b/src/player-damage.c
index 66ae953..e256340 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -12,7 +12,7 @@
 #include "cmd/cmd-process-screen.h"
 #include "market/arena-info-table.h"
 #include "realm/realm-song.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "artifact.h"
 #include "object-flavor.h"
 #include "object-hook.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 2aabefe..18183ba 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -21,7 +21,7 @@
 
 #include "artifact.h"
 #include "cmd-dump.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "market/building.h"
 #include "birth/birth.h"
 #include "grid.h"

diff --git a/src/player-inventory.c b/src/player-inventory.c
index e0bb8f2..c136eab 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -8,7 +8,7 @@
 #include "object/object-kind.h"
 #include "object-flavor.h"
 #include "object-hook.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "player-move.h"
 
 #include "view/display-main-window.h"

diff --git a/src/player-status.c b/src/player-status.c
index 7c0d6a9..914b2e9 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -14,8 +14,8 @@
 #include "player-class.h"
 #include "player-personality.h"
 #include "player-damage.h"
-#include "floor.h"
-#include "floor-events.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
 #include "feature.h"
 #include "artifact.h"
 #include "avatar.h"

diff --git a/src/player/process-death.c b/src/player/process-death.c
index 8a0a8ad..466571e 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -8,7 +8,7 @@
 
 #include "process-death.h"
 #include "world/world.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "player-inventory.h"
 #include "object-flavor.h"
 #include "market/store-util.h"

diff --git a/src/quest.c b/src/quest.c
index 3bff2f6..91dfed5 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -4,9 +4,9 @@
 
 #include "core/system-variables.h"
 #include "dungeon/dungeon.h"
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-events.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-events.h"
 #include "grid.h"
 #include "quest.h"
 #include "monsterrace-hook.h"

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index 2a35b06..a65a349 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -6,7 +6,7 @@
 #include "spell/spells3.h"
 #include "player-status.h"
 #include "player-effects.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "targeting.h"
 #include "realm/realm-life.h"
 #include "spell/spells-type.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 1962fa7..65b1e77 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -2,13 +2,13 @@
 #include "util.h"
 
 #include "grid.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "rooms.h"
 #include "room/rooms-pit-nest.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "sort.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "feature.h"
 #include "dungeon/dungeon.h"
 #include "room/pit-nest-kinds-table.h"

diff --git a/src/rooms-city.c b/src/rooms-city.c
index 21e2b58..c08a9b4 100644 (file)
--- a/src/rooms-city.c
+++ b/src/rooms-city.c
@@ -2,8 +2,8 @@
 #include "util.h"
 
 #include "grid.h"
-#include "floor.h"
-#include "floor-generate.h"
+#include "floor/floor.h"
+#include "floor/floor-generate.h"
 #include "rooms.h"
 #include "rooms-city.h"
 #include "market/store.h"

diff --git a/src/rooms-fractal.c b/src/rooms-fractal.c
index b05e919..64c2321 100644 (file)
--- a/src/rooms-fractal.c
+++ b/src/rooms-fractal.c
@@ -1,9 +1,9 @@
 #include "angband.h"
 #include "grid.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "rooms.h"
 #include "rooms-normal.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "dungeon/dungeon.h"
 
 /*!

diff --git a/src/rooms-normal.c b/src/rooms-normal.c
index 7d43acb..511e960 100644 (file)
--- a/src/rooms-normal.c
+++ b/src/rooms-normal.c
@@ -2,7 +2,7 @@
 #include "grid.h"
 #include "trap.h"
 
-#include "floor.h"
+#include "floor/floor.h"
 #include "dungeon/dungeon.h"
 #include "rooms.h"
 

diff --git a/src/rooms-special.c b/src/rooms-special.c
index 3293de5..f71ca17 100644 (file)
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -2,13 +2,13 @@
 #include "util.h"
 
 #include "grid.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "rooms.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "object/object-kind-hook.h"
 #include "feature.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "dungeon/dungeon.h"
 
 

diff --git a/src/rooms-trap.c b/src/rooms-trap.c
index f2969fb..3f0884c 100644 (file)
--- a/src/rooms-trap.c
+++ b/src/rooms-trap.c
@@ -2,9 +2,9 @@
 #include "util.h"
 
 #include "grid.h"
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "rooms.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "feature.h"
 #include "dungeon/dungeon.h"
 

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 7bebaba..52ae91a 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -2,14 +2,14 @@
 #include "util.h"
 #include "rooms-vault.h"
 
-#include "floor-generate.h"
+#include "floor/floor-generate.h"
 #include "grid.h"
 #include "rooms.h"
 #include "market/store.h"
 #include "trap.h"
 #include "monster.h"
 #include "feature.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "dungeon/dungeon.h"
 #include "geometry.h"
 #include "wild.h"

diff --git a/src/rooms.c b/src/rooms.c
index 24eda61..c08f8bf 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -40,8 +40,8 @@
 #include "util.h"
 
 #include "feature.h"
-#include "floor.h"
-#include "floor-generate.h"
+#include "floor/floor.h"
+#include "floor/floor-generate.h"
 #include "dungeon/dungeon.h"
 #include "grid.h"
 #include "rooms.h"

diff --git a/src/rumor.c b/src/rumor.c
index 7416cc7..7261d27 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -7,7 +7,7 @@
 #include "artifact.h"
 #include "dungeon/dungeon.h"
 #include "monsterrace.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "wild.h"
 #include "world/world.h"
 

diff --git a/src/save.c b/src/save.c
index 01355e2..76d69f2 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -25,10 +25,10 @@
 #include "market/store.h"
 #include "market/store-util.h"
 #include "wild.h"
-#include "floor.h"
-#include "floor-events.h"
-#include "floor-save.h"
-#include "floor-town.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
+#include "floor/floor-save.h"
+#include "floor/floor-town.h"
 #include "io/uid-checker.h"
 #include "files.h"
 #include "world/world.h"

diff --git a/src/scores.c b/src/scores.c
index 6ab3aae..17ed49b 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -26,7 +26,7 @@
 #include "io/uid-checker.h"
 #include "files.h"
 #include "scores.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "world/world.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/sort.c b/src/sort.c
index 7309bea..1176078 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "sort.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "quest.h"
 #include "artifact.h"
 #include "monsterrace.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index b612704..e7141f6 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -53,7 +53,7 @@
 #include "player-inventory.h"
 
 #include "dungeon/dungeon.h"
-#include "floor-events.h"
+#include "floor/floor-events.h"
 #include "feature.h"
 #include "view/display-main-window.h"
 #include "object/object-kind.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index e8dee49..1574348 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -23,7 +23,7 @@
 
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "object-boost.h"
 #include "object-flavor.h"
 #include "object-hook.h"
@@ -51,7 +51,7 @@
 #include "cmd/cmd-spell.h"
 #include "cmd/cmd-dump.h"
 #include "snipe.h"
-#include "floor-save.h"
+#include "floor/floor-save.h"
 #include "files.h"
 #include "player-effects.h"
 #include "player-skill.h"

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 37f550d..95e9118 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -2,7 +2,7 @@
 #include "util.h"
 
 #include "dungeon/dungeon.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "quest.h"
 #include "artifact.h"
@@ -14,8 +14,8 @@
 #include "cmd/cmd-basic.h"
 #include "cmd/cmd-dump.h"
 
-#include "floor-events.h"
-#include "floor-save.h"
+#include "floor/floor-events.h"
+#include "floor/floor-save.h"
 #include "player-damage.h"
 #include "player-effects.h"
 #include "player-move.h"

diff --git a/src/spells-object.c b/src/spells-object.c
index ce5765c..ffbb9e2 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -4,7 +4,7 @@
 
 #include "cmd-basic.h"
 #include "artifact.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
 #include "spell/spells3.h"
 #include "spells-object.h"

diff --git a/src/spells-summon.c b/src/spells-summon.c
index a0eb8d7..62e43b1 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -4,7 +4,7 @@
 #include "spells-summon.h"
 #include "player-inventory.h"
 #include "monster-status.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells2.h"
 

diff --git a/src/targeting.c b/src/targeting.c
index 10bf888..bef83a5 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -28,9 +28,9 @@
 #include "sort.h"
 #include "spells-summon.h"
 #include "grid.h"
-#include "floor.h"
-#include "floor-events.h"
-#include "floor-town.h"
+#include "floor/floor.h"
+#include "floor/floor-events.h"
+#include "floor/floor-town.h"
 #include "player-inventory.h"
 #include "player-move.h"
 #include "player-status.h"

diff --git a/src/trap.c b/src/trap.c
index 9e4b749..e63c42c 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -19,7 +19,7 @@
 #include "grid.h"
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"
-#include "floor-save.h"
+#include "floor/floor-save.h"
 #include "init.h"
 #include "files.h"
 #include "dungeon/dungeon.h"

diff --git a/src/util.c b/src/util.c
index 45a0b5c..d74068d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -21,7 +21,7 @@
 #include "monsterrace-hook.h"
 #include "view/display-main-window.h"
 #include "quest.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "world/world.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 2b546ec..8b85f20 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -43,7 +43,7 @@
 #include "grid.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "feature.h"
 #include "object/object-kind.h"
 #include "targeting.h"

diff --git a/src/warning.c b/src/warning.c
index 0ba44f8..f2cae54 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -5,7 +5,7 @@
 #include "artifact.h"
 #include "player-move.h"
 #include "feature.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "warning.h"
 #include "player-status.h"
 #include "monster.h"

diff --git a/src/wild.c b/src/wild.c
index 2291eda..8e69206 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -15,7 +15,7 @@
 #include "core/system-variables.h"
 
 #include "dungeon/dungeon.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "wild.h"
 #include "world/world.h"
 #include "monster.h"
@@ -29,7 +29,7 @@
 #include "io/tokenizer.h"
 #include "files.h"
 #include "feature.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "realm/realm.h"
 
 #include "view/display-main-window.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index fd33fb0..32e77c8 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -47,8 +47,8 @@
 #include "object-hook.h"
 #include "monster-status.h"
 
-#include "floor.h"
-#include "floor-save.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
 #include "grid.h"
 #include "dungeon/dungeon-file.h"
 #include "files.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index bfb92d5..e85496a 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -25,7 +25,7 @@
 #include "object-hook.h"
 #include "object-ego.h"
 #include "object/object-kind.h"
-#include "floor-town.h"
+#include "floor/floor-town.h"
 #include "files.h"
 
  /*

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 8963b5c..d8800c2 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -5,7 +5,7 @@
 #include "market/store.h"
 #include "market/store-util.h"
 #include "io/write-diary.h"
-#include "floor-events.h"
+#include "floor/floor-events.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-save.h"
 #include "monster-status.h"