[Refactor] #38862 Moved feature.c/h, grid.c/h and trap.c/h to grid/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index cf56239..721df8e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -270,7 +270,7 @@
     <ClCompile Include="..\..\src\dungeon\dungeon-file.c" />\r
     <ClCompile Include="..\..\src\dungeon\dungeon.c" />\r
     <ClCompile Include="..\..\src\locale\english.c" />\r
-    <ClCompile Include="..\..\src\feature.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-save.c" />\r
@@ -445,7 +445,7 @@
     <ClInclude Include="..\..\src\chuukei.h" />\r
     <ClCompile Include="..\..\src\player\player-move.c" />\r
     <ClCompile Include="..\..\src\files.c" />\r
-    <ClCompile Include="..\..\src\grid.c" />\r
+    <ClCompile Include="..\..\src\grid\grid.c" />\r
     <ClCompile Include="..\..\src\inet.c" />\r
     <ClCompile Include="..\..\src\locale\japanese.c" />\r
     <ClCompile Include="..\..\src\io\load.c" />\r
@@ -508,7 +508,7 @@
     <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
+    <ClCompile Include="..\..\src\grid\trap.c" />\r
     <ClCompile Include="..\..\src\util.c" />\r
     <ClCompile Include="..\..\src\view\display-main-window.c" />\r
     <ClCompile Include="..\..\src\warning.c" />\r
@@ -629,7 +629,7 @@
     <ClInclude Include="..\..\src\creature.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon-file.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
-    <ClInclude Include="..\..\src\feature.h" />\r
+    <ClInclude Include="..\..\src\grid\feature.h" />\r
     <ClInclude Include="..\..\src\files.h" />\r
     <ClInclude Include="..\..\src\floor\floor-events.h" />\r
     <ClInclude Include="..\..\src\floor\floor-generate.h" />\r
@@ -638,7 +638,7 @@
     <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
+    <ClInclude Include="..\..\src\grid\grid.h" />\r
     <ClInclude Include="..\..\src\system\h-basic.h" />\r
     <ClInclude Include="..\..\src\system\h-config.h" />\r
     <ClInclude Include="..\..\src\system\h-define.h" />\r
@@ -717,7 +717,7 @@
     <ClInclude Include="..\..\src\market\store.h" />\r
     <ClInclude Include="..\..\src\targeting.h" />\r
     <ClInclude Include="..\..\src\gameterm.h" />\r
-    <ClInclude Include="..\..\src\trap.h" />\r
+    <ClInclude Include="..\..\src\grid\trap.h" />\r
     <ClInclude Include="..\..\src\util.h" />\r
     <ClInclude Include="..\..\src\view\display-main-window.h" />\r
     <ClInclude Include="..\..\src\warning.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index c3ca188..15b8dc0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -12,9 +12,6 @@
     <ClCompile Include="..\..\src\avatar.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\feature.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\init.c" />
     <ClCompile Include="..\..\src\files.c">
       <Filter>io</Filter>
@@ -25,9 +22,6 @@
     <ClCompile Include="..\..\src\geometry.c">
       <Filter>floor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\grid.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\rumor.c">
       <Filter>market</Filter>
     </ClCompile>
@@ -55,9 +49,6 @@
     <ClCompile Include="..\..\src\scores.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\trap.c">
-      <Filter>floor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\z-util.c">
       <Filter>core</Filter>
     </ClCompile>
@@ -829,6 +820,15 @@
     <ClCompile Include="..\..\src\object\chest.c">
       <Filter>object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\grid\grid.c">
+      <Filter>grid</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\grid\trap.c">
+      <Filter>grid</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\grid\feature.c">
+      <Filter>grid</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -843,9 +843,6 @@
     <ClInclude Include="..\..\src\avatar.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\feature.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\files.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -855,9 +852,6 @@
     <ClInclude Include="..\..\src\geometry.h">
       <Filter>floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\grid.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\rumor.h">
       <Filter>market</Filter>
     </ClInclude>
@@ -885,9 +879,6 @@
     <ClInclude Include="..\..\src\scores.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\trap.h">
-      <Filter>floor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\z-util.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -1701,6 +1692,15 @@
     <ClInclude Include="..\..\src\object\chest.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\grid\feature.h">
+      <Filter>grid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\grid\grid.h">
+      <Filter>grid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\grid\trap.h">
+      <Filter>grid</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -1785,6 +1785,9 @@
     <Filter Include="system">
       <UniqueIdentifier>{12dd43b2-8ba5-4fc4-8d11-1901ec804390}</UniqueIdentifier>
     </Filter>
+    <Filter Include="grid">
+      <UniqueIdentifier>{93b0c1d1-0841-44fe-8503-d6729d290350}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 44b3622..23efdbd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,11 +109,11 @@ hengband_SOURCES = \
        \
        locale/japanese.c locale/japanese.h locale/english.c locale/english.h \
        \
-       feature.c feature.h \
+       grid/feature.c grid/feature.h \
+       grid/grid.c grid/grid.h grid/trap.c grid/trap.h \
        geometry.c geometry.h \
        \
        gamevalue.h \
-       grid.c grid.h\
        history.h history.c \
        inet.c inet.h init.c init.h \
        load.c load.h \
@@ -240,7 +240,7 @@ hengband_SOURCES = \
        spells-summon.c spells-summon.h \
        spells-world.c spells-world.h \
        \
-       sort.c sort.h gameterm.c gameterm.h trap.c trap.h util.c util.h \
+       sort.c sort.h gameterm.c gameterm.h util.c util.h \
        wild.h wild.c warning.c warning.h \
        \
        view-mainwindow.c view-mainwindow.h targeting.c targeting.h \

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 2511bed..46ca877 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -21,7 +21,7 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-save.h"
 #include "object/chest.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "dungeon/dungeon.h"
 #include "melee.h"
 #include "object/object-hook.h"
@@ -33,7 +33,7 @@
 #include "realm/realm-hex.h"
 #include "geometry.h"
 #include "wild.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
 #include "player/player-personality.h"

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 7ed5692..cd8453f 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -16,7 +16,7 @@
 #include "main/sound-definitions-table.h"
 
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-status.h"
 #include "monster/monster-status.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index a10d5a3..e6ed4d0 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -5,7 +5,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "melee.h"
 #include "sort.h"
 #include "player/player-move.h"

diff --git a/src/cmd/dump-util.c b/src/cmd/dump-util.c
index 87a24d8..0ca1e7b 100644 (file)
--- a/src/cmd/dump-util.c
+++ b/src/cmd/dump-util.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "dump-util.h"
 #include "gameterm.h"
 

diff --git a/src/cmd/lighting-level-table.c b/src/cmd/lighting-level-table.c
index 8daf77e..6949b08 100644 (file)
--- a/src/cmd/lighting-level-table.c
+++ b/src/cmd/lighting-level-table.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "cmd/lighting-level-table.h"
-#include "feature.h"
+#include "grid/feature.h"
 
 /*!
  * @brief キャラクタ色の明暗表現

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 85fd709..1027306 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -28,7 +28,7 @@
 #include "realm/realm-song.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "dungeon/dungeon.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 2bb84ae..66fc1e7 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -16,7 +16,7 @@
 #include "object/object-hook.h"
 #include "object/object-broken.h"
 #include "effect/effect-characteristics.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "object/object-flavor.h"
 
 #include "shoot.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index b2d4f3c..4890df7 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -21,11 +21,11 @@
 #include "chuukei.h"
 #include "birth/birth.h"
 #include "creature.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor-events.h"
 #include "floor/floor-save.h"
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "io/write-diary.h"
 #include "market/arena-info-table.h"
 #include "market/building.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 28724aa..dcd4b6a 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -39,8 +39,8 @@
 #include "files.h"
 #include "dungeon/dungeon-file.h"
 #include "room/rooms-vault.h"
-#include "feature.h"
-#include "grid.h"
+#include "grid/feature.h"
+#include "grid/grid.h"
 #include "quest.h"
 #include "monster/monster.h"
 #include "files.h"
@@ -57,7 +57,7 @@
 #include "floor/floor-town.h"
 #include "realm/realm.h"
 
-#include "trap.h"
+#include "grid/trap.h"
 #include "object/artifact.h"
 #include "cmd-activate.h"
 #include "gameterm.h"

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index 16b2d44..4192423 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -3,7 +3,7 @@
 #include "room/rooms.h"
 #include "dungeon/dungeon.h"
 #include "main/sound-definitions-table.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "player/player-effects.h"
 #include "world/world.h"
 #include "spell/spells-type.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index ceaf808..6e140af 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -4,7 +4,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
 #include "quest.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 12d93fa..f011cba 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -103,7 +103,7 @@
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "market/arena-info-table.h"
 #include "room/rooms.h"
 #include "dungeon/dungeon.h"
@@ -113,8 +113,8 @@
 #include "floor/floor-generate.h"
 #include "floor/floor-events.h"
 #include "floor/floor-generate.h"
-#include "feature.h"
-#include "trap.h"
+#include "grid/feature.h"
+#include "grid/trap.h"
 #include "monster/monster.h"
 #include "quest.h"
 #include "player/player-status.h"
@@ -122,7 +122,7 @@
 #include "monster/monster-status.h"
 #include "dungeon/dungeon-file.h"
 #include "init.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "spell/spells1.h"
 
 #include "world/world.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index c192a35..4b8212e 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -22,9 +22,9 @@
 #include "floor/floor-save.h"
 #include "floor/floor-events.h"
 #include "floor/floor-generate.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "geometry.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monster.h"
 #include "quest.h"
 #include "wild.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 9ada0e3..00ae3f9 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -23,9 +23,9 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "floor/floor-streams.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monster.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "spell/spells1.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 57c3663..b43e78a 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -2,7 +2,7 @@
 #include "floor/floor.h"
 #include "floor/floor-save.h"
 #include "floor/floor-generate.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "dungeon/dungeon.h"
 #include "room/rooms.h"
 #include "quest.h"
@@ -12,7 +12,7 @@
 #include "object/object.h"
 #include "object/artifact.h"
 #include "object/object-kind.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "effect/spells-effect-util.h"
 #include "effect/effect-characteristics.h"
 

diff --git a/src/floor/floor.h b/src/floor/floor.h
index 55291af..437fc47 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "feature.h"
-#include "grid.h"
+#include "grid/feature.h"
+#include "grid/grid.h"
 #include "object/object.h"
 #include "floor/floor-save.h"
 

diff --git a/src/feature.c b/src/grid/feature.c
similarity index 99%
rename from src/feature.c
rename to src/grid/feature.c
index e23012a..cc7511b 100644 (file)
--- a/src/feature.c
+++ b/src/grid/feature.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "feature.h"
+#include "grid/feature.h"
 
 /*** Terrain feature variables ***/
 

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

diff --git a/src/grid.c b/src/grid/grid.c
similarity index 99%
rename from src/grid.c
rename to src/grid/grid.c
index 8305103..c1e9e03 100644 (file)
--- a/src/grid.c
+++ b/src/grid/grid.c
@@ -24,12 +24,12 @@
 #include "object/object-hook.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
-#include "grid.h"
-#include "trap.h"
+#include "grid/grid.h"
+#include "grid/trap.h"
 #include "room/rooms.h"
 #include "monster/monster.h"
 #include "quest.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "monster/monster-status.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"

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

diff --git a/src/trap.c b/src/grid/trap.c
similarity index 99%
rename from src/trap.c
rename to src/grid/trap.c
index ae7bc14..711ea5d 100644 (file)
--- a/src/trap.c
+++ b/src/grid/trap.c
@@ -5,7 +5,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-save.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "player/player-damage.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
@@ -14,9 +14,9 @@
 #include "spell/spells-summon.h"
 #include "quest.h"
 #include "object/artifact.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "player/player-status.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor-save.h"

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

diff --git a/src/init.c b/src/init.c
index c3951d7..b0e1ef0 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -43,13 +43,13 @@
 #include "market/building.h"
 #include "init.h"
 #include "quest.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "room/rooms.h"
 #include "market/store.h"
 #include "wild.h"
 #include "dungeon/dungeon-file.h"
 #include "files.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor.h"
 #include "floor/floor-town.h"
 #include "dungeon/dungeon.h"

diff --git a/src/io/load.c b/src/io/load.c
index 70a9b87..3cdcd83 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -50,9 +50,9 @@
 #include "report.h"
 
 #include "dungeon/dungeon.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor-generate.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "mutation/mutation.h"
 #include "monster/monster.h"
 #include "market/store-util.h"
@@ -68,7 +68,7 @@
 #include "floor/floor.h"
 #include "floor/floor-save.h"
 #include "floor/floor-town.h"
-#include "grid.h"
+#include "grid/grid.h"
 
 #include "cmd-pet.h"
 #include "dungeon/dungeon-file.h"

diff --git a/src/mind.c b/src/mind.c
index cf5dd4e..95b3ad3 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -31,8 +31,8 @@
 #include "spell/spells-status.h"
 #include "cmd-spell.h"
 #include "spell/spells-floor.h"
-#include "feature.h"
-#include "grid.h"
+#include "grid/feature.h"
+#include "grid/grid.h"
 #include "cmd-basic.h"
 #include "monster/monster-status.h"
 #include "player/player-effects.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index c28e388..a00bad4 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -30,8 +30,8 @@
 #include "spell/spells-summon.h"
 #include "avatar.h"
 #include "realm/realm-hex.h"
-#include "feature.h"
-#include "grid.h"
+#include "grid/feature.h"
+#include "grid/grid.h"
 #include "player/player-move.h"
 #include "monster/monster-status.h"
 #include "spell/monster-spell.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 0b6734f..d27db4c 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -10,7 +10,7 @@
 #include "cmd/cmd-dump.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
 #include "spell/monster-spell.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index e45d03a..8803ec9 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -27,7 +27,7 @@
 #include "spell/spells-type.h"
 #include "spell/spells-summon.h"
 #include "quest.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "player/player-move.h"
 #include "player/player-status.h"
 #include "player/player-race.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index ecc828c..149ff94 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -28,7 +28,7 @@
 #include "object/object-hook.h"
 #include "spell/spells-object.h"
 #include "files.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monster.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"

diff --git a/src/object/chest.c b/src/object/chest.c
index 4df7360..94bb9df 100644 (file)
--- a/src/object/chest.c
+++ b/src/object/chest.c
@@ -6,12 +6,12 @@
 #include "spell/spells-type.h"
 #include "spell/spells-summon.h"
 #include "floor/floor.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "player/player-status.h"
 #include "player/player-damage.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 071bafe..eec8327 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -21,7 +21,7 @@
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "snipe.h"
 #include "files.h"
 #include "world/world.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 699b500..db15e00 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -25,7 +25,7 @@
 #include "spell/spells3.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "object/object-kind.h"
 #include "object/object-boost.h"
 #include "object/object-ego.h"
@@ -34,7 +34,7 @@
 #include "object/object-curse.h"
 #include "object/object-kind-hook.h"
 #include "object/artifact.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "player/player-status.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 6b6ce49..fe03a83 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -24,7 +24,7 @@
 #include "floor/floor.h"
 #include "market/building.h"
 #include "birth/birth.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "mutation/mutation.h"
 #include "quest.h"
 #include "avatar.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 91630b5..912ca3d 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -150,8 +150,8 @@
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "melee.h"
-#include "grid.h"
-#include "trap.h"
+#include "grid/grid.h"
+#include "grid/trap.h"
 #include "quest.h"
 #include "object/artifact.h"
 #include "player/player-move.h"
@@ -162,7 +162,7 @@
 #include "player-inventory.h"
 #include "player/player-personality.h"
 #include "spell/spells-floor.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "warning.h"
 #include "monster/monster.h"
 #include "spell/monster-spell.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 6f0b824..952c64f 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -16,7 +16,7 @@
 #include "player/player-damage.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "object/artifact.h"
 #include "avatar.h"
 #include "spell/technic-info-table.h"

diff --git a/src/quest.c b/src/quest.c
index f18f7ea..c0adf22 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -7,14 +7,14 @@
 #include "floor/floor.h"
 #include "floor/floor-save.h"
 #include "floor/floor-events.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "quest.h"
 #include "monster/monsterrace-hook.h"
 #include "monster/monster.h"
 #include "player/player-status.h"
 #include "player/player-personality.h"
 #include "object/artifact.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "world/world.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 3ea8eec..f3c7279 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -31,7 +31,7 @@
 #include "player/player-skill.h"
 #include "player-inventory.h"
 #include "realm/realm-hex.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monsterrace.h"
 #include "targeting.h"
 #include "realm/realm-song.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index acd66d2..8951f6f 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -14,9 +14,9 @@
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-damage.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "spell/technic-info-table.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells-floor.h"

diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c
index cebfc29..afdf0d8 100644 (file)
--- a/src/room/rooms-city.c
+++ b/src/room/rooms-city.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "grid.h"
+#include "grid/grid.h"
 #include "floor/floor.h"
 #include "floor/floor-generate.h"
 #include "room/rooms.h"

diff --git a/src/room/rooms-fractal.c b/src/room/rooms-fractal.c
index eec6a4d..f73d0bb 100644 (file)
--- a/src/room/rooms-fractal.c
+++ b/src/room/rooms-fractal.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "floor/floor-generate.h"
 #include "room/rooms.h"
 #include "room/rooms-normal.h"

diff --git a/src/room/rooms-normal.c b/src/room/rooms-normal.c
index b77d528..1f47c9e 100644 (file)
--- a/src/room/rooms-normal.c
+++ b/src/room/rooms-normal.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
-#include "grid.h"
-#include "trap.h"
+#include "grid/grid.h"
+#include "grid/trap.h"
 
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 3733821..7fc0b35 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "grid.h"
+#include "grid/grid.h"
 #include "floor/floor-generate.h"
 #include "rooms.h"
 #include "room/rooms-pit-nest.h"
@@ -9,7 +9,7 @@
 #include "monster/monsterrace-hook.h"
 #include "sort.h"
 #include "floor/floor.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "dungeon/dungeon.h"
 #include "room/pit-nest-kinds-table.h"
 

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index 366fc97..0afb079 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -1,13 +1,13 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "grid.h"
+#include "grid/grid.h"
 #include "floor/floor-generate.h"
 #include "room/rooms.h"
 #include "monster/monster.h"
 #include "monster/monsterrace-hook.h"
 #include "object/object-kind-hook.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"
 

diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c
index 79e7c7b..e5faf44 100644 (file)
--- a/src/room/rooms-trap.c
+++ b/src/room/rooms-trap.c
@@ -1,11 +1,11 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "grid.h"
+#include "grid/grid.h"
 #include "floor/floor-generate.h"
 #include "room/rooms.h"
 #include "floor/floor.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "dungeon/dungeon.h"
 
 /*!

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 9c721be..e27a8a9 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -3,12 +3,12 @@
 #include "room/rooms-vault.h"
 
 #include "floor/floor-generate.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "room/rooms.h"
 #include "market/store.h"
-#include "trap.h"
+#include "grid/trap.h"
 #include "monster/monster.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"
 #include "geometry.h"

diff --git a/src/room/rooms.c b/src/room/rooms.c
index bb1a515..bcc6f32 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -39,11 +39,11 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor.h"
 #include "floor/floor-generate.h"
 #include "dungeon/dungeon.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "room/rooms.h"
 
 #include "room/rooms-city.h"
@@ -54,7 +54,7 @@
 #include "room/rooms-trap.h"
 #include "room/rooms-vault.h"
 
-#include "trap.h"
+#include "grid/trap.h"
 
 #include "monster/monster.h"
 

diff --git a/src/spell/mspells1.c b/src/spell/mspells1.c
index fa7ed39..3d99dc6 100644 (file)
--- a/src/spell/mspells1.c
+++ b/src/spell/mspells1.c
@@ -43,7 +43,7 @@
 
 #include "effect/effect-characteristics.h"
 #include "dungeon/dungeon.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "object/object-curse.h"
 #include "quest.h"
 #include "realm/realm-hex.h"

diff --git a/src/spell/mspells2.c b/src/spell/mspells2.c
index 9717274..340222f 100644 (file)
--- a/src/spell/mspells2.c
+++ b/src/spell/mspells2.c
@@ -17,7 +17,7 @@
 
 #include "cmd-pet.h"
 #include "effect/effect-characteristics.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "quest.h"
 #include "realm/realm-hex.h"
 #include "player/player-move.h"

diff --git a/src/spell/mspells3.c b/src/spell/mspells3.c
index 80025af..5a0bda8 100644 (file)
--- a/src/spell/mspells3.c
+++ b/src/spell/mspells3.c
@@ -16,7 +16,7 @@
 #include "main/sound-definitions-table.h"
 
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "spells-summon.h"
 #include "avatar.h"
 #include "spells-status.h"

diff --git a/src/spell/mspells4.c b/src/spell/mspells4.c
index e5d984a..8d3f334 100644 (file)
--- a/src/spell/mspells4.c
+++ b/src/spell/mspells4.c
@@ -10,7 +10,7 @@
 #include "main/sound-definitions-table.h"
 
 #include "effect/effect-characteristics.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "spells-summon.h"
 #include "object/artifact.h"
 #include "player/player-status.h"

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index 474d863..15e56ca 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -3,7 +3,7 @@
 
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "quest.h"
 #include "object/artifact.h"
 #include "object/object-kind.h"
@@ -19,7 +19,7 @@
 #include "player/player-damage.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "view/display-main-window.h"
 
 #include "monster/monster-status.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 950bfc3..c9e70e7 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -5,7 +5,7 @@
 #include "cmd-basic.h"
 #include "object/artifact.h"
 #include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "spell/spells3.h"
 #include "spell/spells-object.h"
 #include "object/object-boost.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 6e51b67..4c82577 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -24,8 +24,8 @@
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-dump.h"
 #include "effect/effect-characteristics.h"
-#include "grid.h"
-#include "trap.h"
+#include "grid/grid.h"
+#include "grid/trap.h"
 #include "monster/monsterrace-hook.h"
 #include "melee.h"
 #include "world/world.h"
@@ -54,7 +54,7 @@
 
 #include "dungeon/dungeon.h"
 #include "floor/floor-events.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "view/display-main-window.h"
 #include "object/object-kind.h"
 #include "monster/monsterrace.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 0d99b82..0ba8a9f 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -41,7 +41,7 @@
 #include "spell/spells3.h"
 #include "spell/spells-floor.h"
 #include "spell/technic-info-table.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "market/building-util.h"
 #include "monster/monster-process.h"
 #include "monster/monster-status.h"

diff --git a/src/targeting.c b/src/targeting.c
index c0b68d2..18f95eb 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -27,7 +27,7 @@
 #include "object/object-kind-hook.h"
 #include "sort.h"
 #include "spell/spells-summon.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"
 #include "floor/floor-town.h"
@@ -36,7 +36,7 @@
 #include "player/player-status.h"
 #include "monster/monster-status.h"
 #include "view/display-main-window.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "quest.h"
 #include "dungeon/dungeon.h"
 #include "world/world.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 073108b..4e4feb4 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -40,11 +40,11 @@
 
 #include "object/object-flavor.h"
 
-#include "grid.h"
+#include "grid/grid.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor-town.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "object/object-kind.h"
 #include "targeting.h"
 

diff --git a/src/warning.c b/src/warning.c
index 1bdd11d..a545494 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -4,7 +4,7 @@
 
 #include "object/artifact.h"
 #include "player/player-move.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor.h"
 #include "warning.h"
 #include "player/player-status.h"

diff --git a/src/wild.c b/src/wild.c
index e26e5b0..76dc52f 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -22,13 +22,13 @@
 #include "realm/realm-hex.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "monster/monster-status.h"
 #include "quest.h"
 #include "dungeon/dungeon-file.h"
 #include "io/tokenizer.h"
 #include "files.h"
-#include "feature.h"
+#include "grid/feature.h"
 #include "floor/floor-town.h"
 #include "realm/realm.h"
 

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index a3bd654..aec930a 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -49,7 +49,7 @@
 
 #include "floor/floor.h"
 #include "floor/floor-save.h"
-#include "grid.h"
+#include "grid/grid.h"
 #include "dungeon/dungeon-file.h"
 #include "files.h"
 #include "spell/monster-spell.h"