[Refactor] #38862 Moved angband.h, h-*.h and system-variables.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index b97f34f..b8dab64 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -264,7 +264,7 @@
     <ClCompile Include="..\..\src\cmd\object-group-table.c" />\r
     <ClCompile Include="..\..\src\combat\melee.c" />\r
     <ClCompile Include="..\..\src\combat\shoot.c" />\r
-    <ClCompile Include="..\..\src\core\system-variables.c" />\r
+    <ClCompile Include="..\..\src\system\system-variables.c" />\r
     <ClCompile Include="..\..\src\core\show-file.c" />\r
     <ClCompile Include="..\..\src\creature.c" />\r
     <ClCompile Include="..\..\src\dungeon\dungeon-file.c" />\r
@@ -624,8 +624,8 @@
     <ClInclude Include="japanese.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="..\..\src\angband.h" />\r
-    <ClInclude Include="..\..\src\core\system-variables.h" />\r
+    <ClInclude Include="..\..\src\system\angband.h" />\r
+    <ClInclude Include="..\..\src\system\system-variables.h" />\r
     <ClInclude Include="..\..\src\creature.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon-file.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
@@ -639,11 +639,11 @@
     <ClInclude Include="..\..\src\gamevalue.h" />\r
     <ClInclude Include="..\..\src\geometry.h" />\r
     <ClInclude Include="..\..\src\grid.h" />\r
-    <ClInclude Include="..\..\src\h-basic.h" />\r
-    <ClInclude Include="..\..\src\h-config.h" />\r
-    <ClInclude Include="..\..\src\h-define.h" />\r
-    <ClInclude Include="..\..\src\h-system.h" />\r
-    <ClInclude Include="..\..\src\h-type.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
+    <ClInclude Include="..\..\src\system\h-system.h" />\r
+    <ClInclude Include="..\..\src\system\h-type.h" />\r
     <ClInclude Include="..\..\src\history.h" />\r
     <ClInclude Include="..\..\src\inet.h" />\r
     <ClInclude Include="..\..\src\init.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 567c2df..9ea47b9 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -709,9 +709,6 @@
     <ClCompile Include="..\..\src\core\game-play.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\system-variables.c">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\floor\floor.c">
       <Filter>floor</Filter>
     </ClCompile>
@@ -829,14 +826,12 @@
     <ClCompile Include="..\..\src\player-inventory.c">
       <Filter>inventory</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\system\system-variables.c">
+      <Filter>system</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
-    <ClInclude Include="..\..\src\h-basic.h" />
-    <ClInclude Include="..\..\src\h-config.h" />
-    <ClInclude Include="..\..\src\h-define.h" />
-    <ClInclude Include="..\..\src\h-system.h" />
-    <ClInclude Include="..\..\src\h-type.h" />
     <ClInclude Include="..\..\src\init.h" />
     <ClInclude Include="..\..\src\readdib.h" />
     <ClInclude Include="..\..\src\z-form.h" />
@@ -896,9 +891,6 @@
     <ClInclude Include="..\..\src\mind.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\angband.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\history.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -1577,9 +1569,6 @@
     <ClInclude Include="..\..\src\core\game-play.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\system-variables.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\floor\floor.h">
       <Filter>floor</Filter>
     </ClInclude>
@@ -1691,6 +1680,27 @@
     <ClInclude Include="..\..\src\player-inventory.h">
       <Filter>inventory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\system\angband.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\h-basic.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\h-config.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\h-define.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\h-system.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\h-type.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\system-variables.h">
+      <Filter>system</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -1772,6 +1782,9 @@
     <Filter Include="dungeon">
       <UniqueIdentifier>{b37a544f-cca2-4c1f-b069-f109a6b6b119}</UniqueIdentifier>
     </Filter>
+    <Filter Include="system">
+      <UniqueIdentifier>{12dd43b2-8ba5-4fc4-8d11-1901ec804390}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index aa4f6a6..beb46ca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,9 @@ bin_PROGRAMS = hengband
 hengband_SOURCES = \
        artifact.c artifact.h \
        \
-       angband.h\
+       system/angband.h system/h-basic.h system/h-config.h \
+       system/h-define.h system/h-system.h system/h-type.h \
+       system/system-variables.c system/system-variables.h \
        \
        autopick/autopick.c autopick/autopick.h \
        autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \
@@ -85,7 +87,6 @@ hengband_SOURCES = \
        io/input-key-processor.c io/input-key-processor.h \
        \
        character-dump.c character-dump.h files.c files.h \
-       core/system-variables.c core/system-variables.h \
        core/game-play.c core/game-play.h \
        core/show-file.c core/show-file.h \
        core/stuff-handler.c core/stuff-handler.h \
@@ -112,9 +113,9 @@ hengband_SOURCES = \
        geometry.c geometry.h \
        \
        gamevalue.h \
-       grid.c grid.h h-basic.h h-config.h h-define.h \
+       grid.c grid.h\
        history.h history.c \
-       h-system.h h-type.h inet.c inet.h init.c init.h \
+       inet.c inet.h init.c init.h \
        japanese.c japanese.h english.c english.h \
        load.c load.h \
        main.c main-x11.c main-gcu.c \
@@ -285,7 +286,7 @@ hengband_SOURCES = \
        \
        world/world.c world/world.h \
        world/world-movement-processor.c world/world-movement-processor.h \
-       world/world-turn-processor.c world/world-turn-processor.h \
+       world/world-turn-processor.c world/world-turn-processor.h
 
 EXTRA_hengband_SOURCES = \
        angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \

diff --git a/src/artifact.c b/src/artifact.c
index dcf9bd1..ee3d463 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -10,7 +10,7 @@
  * 2013 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "artifact.h"

diff --git a/src/autopick/autopick-command-menu.c b/src/autopick/autopick-command-menu.c
index ca1074c..40c426a 100644 (file)
--- a/src/autopick/autopick-command-menu.c
+++ b/src/autopick/autopick-command-menu.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-command-menu.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-menu-data-table.h"

diff --git a/src/autopick/autopick-describer.c b/src/autopick/autopick-describer.c
index 495f19d..2015e87 100644 (file)
--- a/src/autopick/autopick-describer.c
+++ b/src/autopick/autopick-describer.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-describer.h"
 #include "autopick/autopick-key-flag-process.h"

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index b618117..f0b6281 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -3,7 +3,7 @@
  * @date 2020/04/25
  * @author Hourier
  */
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick-methods-table.h"
 #include "autopick/autopick-destroyer.h"

diff --git a/src/autopick/autopick-drawer.c b/src/autopick/autopick-drawer.c
index d47d20f..9b69a40 100644 (file)
--- a/src/autopick/autopick-drawer.c
+++ b/src/autopick/autopick-drawer.c
@@ -3,7 +3,7 @@
  * @date 2020/04/26
  * @author Hourier
  */
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-drawer.h"
 #include "autopick/autopick-dirty-flags.h"

diff --git a/src/autopick/autopick-editor-command.c b/src/autopick/autopick-editor-command.c
index cd3a9d8..2cd32ee 100644 (file)
--- a/src/autopick/autopick-editor-command.c
+++ b/src/autopick/autopick-editor-command.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-editor-command.h"
 #include "autopick/autopick-editor-util.h"

diff --git a/src/autopick/autopick-editor-util.c b/src/autopick/autopick-editor-util.c
index 0b7f6db..65e4c7b 100644 (file)
--- a/src/autopick/autopick-editor-util.c
+++ b/src/autopick/autopick-editor-util.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-editor-util.h"
 #include "autopick/autopick-flags-table.h"

diff --git a/src/autopick/autopick-entry.c b/src/autopick/autopick-entry.c
index 158034a..315c8e3 100644 (file)
--- a/src/autopick/autopick-entry.c
+++ b/src/autopick/autopick-entry.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-flags-table.h"

diff --git a/src/autopick/autopick-finder.c b/src/autopick/autopick-finder.c
index 29b91e0..8e0c4e0 100644 (file)
--- a/src/autopick/autopick-finder.c
+++ b/src/autopick/autopick-finder.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-dirty-flags.h"
 #include "autopick/autopick-entry.h"

diff --git a/src/autopick/autopick-initializer.c b/src/autopick/autopick-initializer.c
index afc77e0..f9427e3 100644 (file)
--- a/src/autopick/autopick-initializer.c
+++ b/src/autopick/autopick-initializer.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-initializer.h"

diff --git a/src/autopick/autopick-inserter-killer.c b/src/autopick/autopick-inserter-killer.c
index dcd17c9..ff8a2c7 100644 (file)
--- a/src/autopick/autopick-inserter-killer.c
+++ b/src/autopick/autopick-inserter-killer.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-inserter-killer.h"
 #include "autopick/autopick-dirty-flags.h"

diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c
index e807570..92f65e6 100644 (file)
--- a/src/autopick/autopick-matcher.c
+++ b/src/autopick/autopick-matcher.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-key-flag-process.h"
 #include "autopick/autopick-flags-table.h"
 #include "autopick/autopick-matcher.h"

diff --git a/src/autopick/autopick-menu-data-table.c b/src/autopick/autopick-menu-data-table.c
index 7b5b9fb..33871e0 100644 (file)
--- a/src/autopick/autopick-menu-data-table.c
+++ b/src/autopick/autopick-menu-data-table.c
@@ -3,7 +3,7 @@
  * @date 2020/04/25
  * @author Hourier
  */
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-editor-table.h"
 #include "autopick/autopick-commands-table.h"
 #include "autopick/autopick-keys-table.h"

diff --git a/src/autopick/autopick-pref-processor.c b/src/autopick/autopick-pref-processor.c
index 4afbcbf..bbca7ca 100644 (file)
--- a/src/autopick/autopick-pref-processor.c
+++ b/src/autopick/autopick-pref-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-pref-processor.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-entry.h"

diff --git a/src/autopick/autopick-reader-writer.c b/src/autopick/autopick-reader-writer.c
index 79875a3..f55f1ef 100644 (file)
--- a/src/autopick/autopick-reader-writer.c
+++ b/src/autopick/autopick-reader-writer.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-initializer.h"
 #include "autopick/autopick-pref-processor.h"

diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c
index 66652fd..82b932d 100644 (file)
--- a/src/autopick/autopick-registry.c
+++ b/src/autopick/autopick-registry.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
  
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-registry.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-methods-table.h"

diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c
index 8b8b5a4..c3b6883 100644 (file)
--- a/src/autopick/autopick-util.c
+++ b/src/autopick/autopick-util.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-menu-data-table.h"
 

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index de10014..15df457 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -11,7 +11,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "autopick/autopick-methods-table.h"

diff --git a/src/avatar.c b/src/avatar.c
index 664ba2c..fa6504f 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -13,7 +13,7 @@
     included in all such copies.
 */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "avatar.h"
 #include "realm/realm.h"
 #include "player/player-race.h"

diff --git a/src/birth/birth-explanations-table.c b/src/birth/birth-explanations-table.c
index d7a5ce4..368164a 100644 (file)
--- a/src/birth/birth-explanations-table.c
+++ b/src/birth/birth-explanations-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "birth/birth-explanations-table.h"
 
 /*! 種族の解説メッセージテーブル */

diff --git a/src/birth/birth.c b/src/birth/birth.c
index 23fb188..d071f8a 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -11,8 +11,8 @@
  * 2013 Deskull Doxygen向けのコメント整理\n
  */
 
-#include "angband.h"
-#include "core/system-variables.h"
+#include "system/angband.h"
+#include "system/system-variables.h"
 #include "core/show-file.h"
 #include "gameterm.h"
 #include "io/read-pref-file.h"

diff --git a/src/character-dump.h b/src/character-dump.h
index ea354ed..81664d7 100644 (file)
--- a/src/character-dump.h
+++ b/src/character-dump.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "files.h"
 
 void make_character_dump(player_type *creature_ptr, FILE *fff, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name);

diff --git a/src/chest.c b/src/chest.c
index 2eb9da3..292633f 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/chuukei.c b/src/chuukei.c
index 9eb42b1..c3519d4 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -6,7 +6,7 @@
     2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 
 #include "io/signal-handlers.h"
 #include "files.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index f4adf61..b3eb141 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -6,7 +6,7 @@
 * cmd6.cより分離。
 */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "main/sound-definitions-table.h"
 
 #include "cmd/cmd-activate.h"

diff --git a/src/cmd/cmd-autopick.c b/src/cmd/cmd-autopick.c
index 2105d58..f2dafaa 100644 (file)
--- a/src/cmd/cmd-autopick.c
+++ b/src/cmd/cmd-autopick.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-autopick.h"
 #include "cmd/cmd-save.h"
 #include "autopick/autopick-util.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index ea7622e..60e03b6 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -10,10 +10,10 @@
  * are included in all such copies.  Other copyrights may also apply.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 

diff --git a/src/cmd/cmd-diary.c b/src/cmd/cmd-diary.c
index 339cddf..ef5f5ad 100644 (file)
--- a/src/cmd/cmd-diary.c
+++ b/src/cmd/cmd-diary.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-diary.h"
 #include "chuukei.h"
 #include "core/show-file.h"

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index bb3e86c..0c8cf28 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "cmd/cmd-draw.h"
 #include "files.h"

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 6f561d7..bf98d7c 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -30,7 +30,7 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/dump-util.h"
 #include "gameterm.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index ed56c87..14d653e 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -7,7 +7,7 @@
  */
 
 
-#include "angband.h"
+#include "system/angband.h"
 #include "main/sound-definitions-table.h"
 #include "util.h"
 

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index 0cffe6a..45a0887 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 
 #include "autopick/autopick.h"
 #include "io/write-diary.h"

diff --git a/src/cmd/cmd-help.h b/src/cmd/cmd-help.h
index b141d9e..44d74a8 100644 (file)
--- a/src/cmd/cmd-help.h
+++ b/src/cmd/cmd-help.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void do_cmd_help(player_type *creature_ptr);

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index 41d89f4..a39524a 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/cmd/cmd-inn.c b/src/cmd/cmd-inn.c
index 504a7bd..828ba9e 100644 (file)
--- a/src/cmd/cmd-inn.c
+++ b/src/cmd/cmd-inn.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-inn.h"
 #include "cmd/cmd-magiceat.h"
 #include "io/write-diary.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 3207fb7..5c2db57 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -10,7 +10,7 @@
  * are included in all such copies.  Other copyrights may also apply.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/cmd/cmd-knowledge.c b/src/cmd/cmd-knowledge.c
index 0902a9d..f9a5e2a 100644 (file)
--- a/src/cmd/cmd-knowledge.c
+++ b/src/cmd/cmd-knowledge.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-knowledge.h"
 #include "cmd/cmd-draw.h"
 #include "knowledge/knowledge-autopick.h"

diff --git a/src/cmd/cmd-macro.c b/src/cmd/cmd-macro.c
index 78b72c2..866b8a1 100644 (file)
--- a/src/cmd/cmd-macro.c
+++ b/src/cmd/cmd-macro.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd-macro.h"
 #include "cmd-gameoption.h"
 #include "files.h"

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index ef6b0d8..9d3754c 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -52,7 +52,7 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 86959b0..3f3af39 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index fd7eba7..a10d5a3 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 

diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c
index 3666da8..05e87b3 100644 (file)
--- a/src/cmd/cmd-process-screen.c
+++ b/src/cmd/cmd-process-screen.c
@@ -5,7 +5,7 @@
 * @Author Hourier
 */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-draw.h"
 #include "files.h"

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 6b92c35..0b2e22c 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -6,7 +6,7 @@
  * cmd6.cより分離。
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 5521896..8857fb0 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -6,7 +6,7 @@
  * cmd6.cより分離。
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/cmd-save.h b/src/cmd/cmd-save.h
index 835e696..1a5f362 100644 (file)
--- a/src/cmd/cmd-save.h
+++ b/src/cmd/cmd-save.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void do_cmd_save_game(player_type *creature_ptr, int is_autosave);
 void do_cmd_save_and_exit(player_type *player_ptr);

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index 06b8b8b..0d176fa 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "gameterm.h"
 

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 1a6df00..b6d2f54 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -6,7 +6,7 @@
     2013 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index 17801da..644d171 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index 03fc912..48a6837 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/cmd-visuals.h"
 #include "cmd/cmd-draw.h"
 #include "knowledge/knowledge-features.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 3ab9023..0604d3b 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index ee76bc6..def5e67 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/diary-subtitle-table.c b/src/cmd/diary-subtitle-table.c
index 4df9683..3ff0543 100644 (file)
--- a/src/cmd/diary-subtitle-table.c
+++ b/src/cmd/diary-subtitle-table.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "diary-subtitle-table.h"
 
 concptr subtitle[MAX_SUBTITLE] = {

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

diff --git a/src/cmd/feeling-table.c b/src/cmd/feeling-table.c
index 6d3efb0..1181133 100644 (file)
--- a/src/cmd/feeling-table.c
+++ b/src/cmd/feeling-table.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "feeling-table.h"
 
 concptr do_cmd_feeling_text[MAX_FEELING_TEXT] =

diff --git a/src/cmd/lighting-level-table.c b/src/cmd/lighting-level-table.c
index 9134915..8daf77e 100644 (file)
--- a/src/cmd/lighting-level-table.c
+++ b/src/cmd/lighting-level-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/lighting-level-table.h"
 #include "feature.h"
 

diff --git a/src/cmd/monster-group-table.c b/src/cmd/monster-group-table.c
index c40e157..4212b31 100644 (file)
--- a/src/cmd/monster-group-table.c
+++ b/src/cmd/monster-group-table.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/monster-group-table.h"
 
 /*

diff --git a/src/cmd/object-group-table.c b/src/cmd/object-group-table.c
index cd8c02d..f97dd25 100644 (file)
--- a/src/cmd/object-group-table.c
+++ b/src/cmd/object-group-table.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "object-group-table.h"
 #include "object/object.h"
 

diff --git a/src/combat/melee.c b/src/combat/melee.c
index aa688a9..4260e36 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -11,7 +11,7 @@
  * @details
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 07c1421..3334bab 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/core/game-closer.c b/src/core/game-closer.c
index 9b624d1..be87d9b 100644 (file)
--- a/src/core/game-closer.c
+++ b/src/core/game-closer.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/game-closer.h"
 #include "cmd/cmd-save.h"
 #include "core/stuff-handler.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index f1113f1..7b82f77 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -10,7 +10,7 @@
  * 2013 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/game-play.h"
 #include "io/signal-handlers.h"
 #include "util.h"
@@ -56,7 +56,7 @@
 #include "scores.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 
 /*!
  * @brief 1ゲームプレイの主要ルーチン / Actually play a game

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index a06f186..0787d1c 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/hp-mp-processor.h"
 #include "realm/realm-song.h"
 #include "player/player-damage.h"

diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c
index a56bb43..29acf34 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-magiceat.h"
 #include "monster/monster-status.h"

diff --git a/src/core/magic-effects-timeout-reducer.c b/src/core/magic-effects-timeout-reducer.c
index 7923a47..1faa188 100644 (file)
--- a/src/core/magic-effects-timeout-reducer.c
+++ b/src/core/magic-effects-timeout-reducer.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/magic-effects-timeout-reducer.h"
 #include "player/player-effects.h"
 

diff --git a/src/core/output-updater.c b/src/core/output-updater.c
index 9d57694..ab577b7 100644 (file)
--- a/src/core/output-updater.c
+++ b/src/core/output-updater.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/output-updater.h"
 #include "view/display-main-window.h"
 

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index b473b0e..1db9a17 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/player-processor.h"
 #include "player/player-move.h"
 #include "player/player-skill.h"

diff --git a/src/core/show-file.h b/src/core/show-file.h
index 685cd45..2401f06 100644 (file)
--- a/src/core/show-file.h
+++ b/src/core/show-file.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 bool show_file(player_type *player_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode);

diff --git a/src/core/stuff-handler.c b/src/core/stuff-handler.c
index cae7ee7..045dedc 100644 (file)
--- a/src/core/stuff-handler.c
+++ b/src/core/stuff-handler.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "view/display-main-window.h"
 

diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c
index 1a2f9d3..3b64701 100644 (file)
--- a/src/core/turn-compensator.c
+++ b/src/core/turn-compensator.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/turn-compensator.h"
 #include "world/world.h"
 #include "floor/floor-town.h"

diff --git a/src/creature.c b/src/creature.c
index a192c5d..0b4afa0 100644 (file)
--- a/src/creature.c
+++ b/src/creature.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "creature.h"
 
 /*!

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 6943cf7..a2d460f 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -31,9 +31,9 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 
 #include "io/tokenizer.h"
 #include "files.h"

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index 4ff3e90..3eea6cc 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "dungeon/dungeon-processor.h"
 #include "world/world.h"
 #include "targeting.h"

diff --git a/src/dungeon/dungeon.c b/src/dungeon/dungeon.c
index 88b40cc..4d19e84 100644 (file)
--- a/src/dungeon/dungeon.c
+++ b/src/dungeon/dungeon.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "dungeon/dungeon.h"
 #include "world/world.h"
 

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index e6df9fd..16b2d44 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-feature.h"
 #include "room/rooms.h"
 #include "dungeon/dungeon.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index ff9bb61..c355241 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect-item.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index 0f45f44..f2b0f5a 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-charm.h"
 #include "avatar.h"

diff --git a/src/effect/effect-monster-curse.c b/src/effect/effect-monster-curse.c
index 890cacd..4116a70 100644 (file)
--- a/src/effect/effect-monster-curse.c
+++ b/src/effect/effect-monster-curse.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-curse.h"
 

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index af999bd..359abd6 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-domination.h"
 #include "player/player-effects.h"

diff --git a/src/effect/effect-monster-evil.c b/src/effect/effect-monster-evil.c
index b8bcc78..9bb61ff 100644 (file)
--- a/src/effect/effect-monster-evil.c
+++ b/src/effect/effect-monster-evil.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-evil.h"
 #include "monster/monsterrace-hook.h"

diff --git a/src/effect/effect-monster-lite-dark.c b/src/effect/effect-monster-lite-dark.c
index 7d4c274..f15c8a2 100644 (file)
--- a/src/effect/effect-monster-lite-dark.c
+++ b/src/effect/effect-monster-lite-dark.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-lite-dark.h"
 

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index 4b6b7ee..16e182a 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-oldies.h"
 #include "avatar.h"

diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c
index b844924..240f1db 100644 (file)
--- a/src/effect/effect-monster-psi.c
+++ b/src/effect/effect-monster-psi.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-psi.h"
 #include "player/player-damage.h"

diff --git a/src/effect/effect-monster-resist-hurt.c b/src/effect/effect-monster-resist-hurt.c
index fede5e6..505810b 100644 (file)
--- a/src/effect/effect-monster-resist-hurt.c
+++ b/src/effect/effect-monster-resist-hurt.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-resist-hurt.h"
 #include "monster/monster-status.h"

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index 691ec59..dd2596e 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-spirit.h"
 #include "monster-spell.h"

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index e456c57..906920a 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -6,7 +6,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "effect-monster-util.h"
 #include "effect/effect-monster-switcher.h"
 #include "player/player-damage.h"

diff --git a/src/effect/effect-monster-util.c b/src/effect/effect-monster-util.c
index 5ac1f42..bcddf46 100644 (file)
--- a/src/effect/effect-monster-util.c
+++ b/src/effect/effect-monster-util.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster-util.h"
 
 /*!

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 03c0542..634be8a 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-monster.h"
 #include "spells-effect-util.h"
 #include "io/write-diary.h"

diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c
index d53b6d1..af30954 100644 (file)
--- a/src/effect/effect-player-curse.c
+++ b/src/effect/effect-player-curse.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-curse.h"
 #include "player/player-damage.h"

diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c
index e5da4fe..3e25523 100644 (file)
--- a/src/effect/effect-player-oldies.c
+++ b/src/effect/effect-player-oldies.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-oldies.h"
 #include "player/player-effects.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 9183fc8..dc4af21 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-resist-hurt.h"
 #include "player/player-damage.h"

diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c
index dff4921..ad596b0 100644 (file)
--- a/src/effect/effect-player-spirit.c
+++ b/src/effect/effect-player-spirit.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-spirit.h"
 #include "monster-spell.h"

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index 8450e6f..ae8d977 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect-player-util.h"
 #include "effect/effect-player-curse.h"
 #include "effect/effect-player-switcher.h"

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index 304ead0..8958dc6 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player.h"
 #include "effect/effect-player-switcher.h"

diff --git a/src/effect/spells-effect-util.c b/src/effect/spells-effect-util.c
index 9850868..6de779b 100644 (file)
--- a/src/effect/spells-effect-util.c
+++ b/src/effect/spells-effect-util.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/spells-effect-util.h"
 
 int rakubadam_m;

diff --git a/src/english.c b/src/english.c
index 4acee56..415fa49 100644 (file)
--- a/src/english.c
+++ b/src/english.c
@@ -1,5 +1,5 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "japanese.h"
 

diff --git a/src/feature.c b/src/feature.c
index e63a1f9..e23012a 100644 (file)
--- a/src/feature.c
+++ b/src/feature.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "feature.h"
 
 /*** Terrain feature variables ***/

diff --git a/src/files.c b/src/files.c
index ef9b256..8580fbb 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -12,10 +12,10 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "core/system-variables.h" // 暫定。後で消す.
+#include "system/system-variables.h" // 暫定。後で消す.
 #include "character-dump.h"
 
 concptr ANGBAND_DIR; //!< Path name: The main "lib" directory This variable is not actually used anywhere in the code

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index ed92112..ceaf808 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "dungeon/dungeon.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 6885a8f..12d93fa 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -96,9 +96,9 @@
  * way from granite.  \n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "market/building.h"
 
 #include "io/write-diary.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 4ea45bd..4b815c6 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -10,9 +10,9 @@
  * 2014 Deskull rearranged comment for Doxygen. \n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "market/building.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "load.h"
 #include "util.h"
 

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 86f2e74..22e1be5 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -15,7 +15,7 @@
  * generated, ie streams and level destruction.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "artifact.h"

diff --git a/src/floor/floor-town.c b/src/floor/floor-town.c
index b998ad2..b649aa5 100644 (file)
--- a/src/floor/floor-town.c
+++ b/src/floor/floor-town.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "floor/floor-town.h"
 
 /*

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 7729739..df61af4 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "floor/floor.h"
 #include "floor/floor-save.h"
 #include "floor/floor-generate.h"

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index a52251e..4273aa3 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "floor/pattern-walk.h"
 #include "dungeon/dungeon.h"
 #include "io/write-diary.h"

diff --git a/src/gameterm.c b/src/gameterm.c
index 02082fa..a1b4378 100644 (file)
--- a/src/gameterm.c
+++ b/src/gameterm.c
@@ -1,8 +1,8 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "gameterm.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 
 
 /*

diff --git a/src/geometry.c b/src/geometry.c
index ec24021..770c8cf 100644 (file)
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "floor/floor.h"
 
 /*!

diff --git a/src/grid.c b/src/grid.c
index 2c64e1c..8305103 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -15,7 +15,7 @@
  * 2013 Deskull Doxygen向けのコメント整理\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "gameterm.h"
 

diff --git a/src/history.c b/src/history.c
index d664c7d..48f6ffc 100644 (file)
--- a/src/history.c
+++ b/src/history.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "history.h"
 
 

diff --git a/src/horror-descriptions.c b/src/horror-descriptions.c
index fd5c3b4..beb5ae7 100644 (file)
--- a/src/horror-descriptions.c
+++ b/src/horror-descriptions.c
@@ -7,7 +7,7 @@
  * いくら増やしてもよいが、horror_desc_evil とhorror_desc_neutralの個数は同一にすること
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "horror-descriptions.h"
 
 /*!

diff --git a/src/inet.c b/src/inet.c
index d5e2191..19ddb8b 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -1,6 +1,6 @@
 /* File: inet.c */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "files.h"
 #include "inet.h"

diff --git a/src/init.c b/src/init.c
index 9993fb9..725f7fd 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -30,11 +30,11 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/angband-version.h"
 #include "io/read-pref-file.h"
 #include "gameterm.h"

diff --git a/src/init.h b/src/init.h
index 46e0af4..eb74b7e 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -13,7 +13,7 @@
 #ifndef INCLUDED_INIT_H
 #define INCLUDED_INIT_H
 
-#include "h-basic.h"
+#include "system/h-basic.h"
 
 typedef struct header header;
 

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 6ab6598..50f6c0f 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "inventory/inventory-curse.h"
 #include "object/object-flavor.h"
 #include "spells-summon.h"

diff --git a/src/inventory/pack-overflow.c b/src/inventory/pack-overflow.c
index f5939ec..cea9ad8 100644 (file)
--- a/src/inventory/pack-overflow.c
+++ b/src/inventory/pack-overflow.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "inventory/pack-overflow.h"
 #include "player/player-move.h"
 #include "object/object-flavor.h"

diff --git a/src/inventory/recharge-processor.c b/src/inventory/recharge-processor.c
index 2171507..c5eef31 100644 (file)
--- a/src/inventory/recharge-processor.c
+++ b/src/inventory/recharge-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "object/object-flavor.h"
 #include "player/player-move.h"
 #include "core/hp-mp-regenerator.h"

diff --git a/src/inventory/simple-appraiser.c b/src/inventory/simple-appraiser.c
index 2c9b97b..d83b7d1 100644 (file)
--- a/src/inventory/simple-appraiser.c
+++ b/src/inventory/simple-appraiser.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "inventory/simple-appraiser.h"
 #include "object/object-flavor.h"
 #include "avatar.h"

diff --git a/src/io/dump-remover.c b/src/io/dump-remover.c
index 298382e..4e00271 100644 (file)
--- a/src/io/dump-remover.c
+++ b/src/io/dump-remover.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd/dump-util.h"
 #include "io/dump-remover.h"
 #include "io/read-pref-file.h"

diff --git a/src/io/gf-descriptions.h b/src/io/gf-descriptions.h
index 3c6364b..f3934cb 100644 (file)
--- a/src/io/gf-descriptions.h
+++ b/src/io/gf-descriptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 #define MAX_NAMED_NUM 99
 

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index d1bde2e..2011b33 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "io/input-key-processor.h"
 #include "world/world.h"
 #include "core/special-internal-keys.h"

diff --git a/src/io/interpret-pref-file.h b/src/io/interpret-pref-file.h
index 77c65c3..9f1e62f 100644 (file)
--- a/src/io/interpret-pref-file.h
+++ b/src/io/interpret-pref-file.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 errr interpret_pref_file(player_type *creature_ptr, char *buf);

diff --git a/src/io/mutations-dump.c b/src/io/mutations-dump.c
index c48c11d..534e261 100644 (file)
--- a/src/io/mutations-dump.c
+++ b/src/io/mutations-dump.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "io/mutations-dump.h"
 
  /*!

diff --git a/src/io/player-status-dump.c b/src/io/player-status-dump.c
index 8e3fc0a..12010ae 100644 (file)
--- a/src/io/player-status-dump.c
+++ b/src/io/player-status-dump.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "files.h"
 #include "io/player-status-dump.h"
 

diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c
index 278039e..851de6b 100644 (file)
--- a/src/io/read-pref-file.c
+++ b/src/io/read-pref-file.c
@@ -14,14 +14,14 @@
  *     Add a footer, and close the file.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "io/dump-remover.h"
 #include "io/read-pref-file.h"
 #include "io/interpret-pref-file.h"
 #include "autopick/autopick-pref-processor.h"
 #include "files.h" // 暫定。コールバック化して後で消す.
 #include "world/world.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "autopick/autopick-reader-writer.h"
 
 // todo コールバック関数に変更するので、いずれ消す.

diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c
index a6dd611..e4b38a0 100644 (file)
--- a/src/io/signal-handlers.c
+++ b/src/io/signal-handlers.c
@@ -6,7 +6,7 @@
  */
 
 #include "io/signal-handlers.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/game-closer.h"
 #include "save.h"
 #include "world/world.h"

diff --git a/src/io/signal-handlers.h b/src/io/signal-handlers.h
index 34f5a8b..47f712a 100644 (file)
--- a/src/io/signal-handlers.h
+++ b/src/io/signal-handlers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 extern s16b signal_count;
 
 extern void signals_ignore_tstp(void);

diff --git a/src/io/special-class-dump.c b/src/io/special-class-dump.c
index 2625a05..5b7a82c 100644 (file)
--- a/src/io/special-class-dump.c
+++ b/src/io/special-class-dump.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "special-class-dump.h"
 #include "cmd/cmd-magiceat.h"
 #include "object/object-kind.h"

diff --git a/src/io/tokenizer.h b/src/io/tokenizer.h
index 9c48124..bc9c5ab 100644 (file)
--- a/src/io/tokenizer.h
+++ b/src/io/tokenizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 #define TOKENIZE_CHECKQUOTE 0x01  /* Special handling of single quotes */
 

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index ea7bc01..37520b6 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -5,7 +5,7 @@
  */
 
 #include "io/write-diary.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "quest.h"
 #include "files.h"
 #include "dungeon/dungeon.h"

diff --git a/src/io/write-diary.h b/src/io/write-diary.h
index 8a3396c..cee0d87 100644 (file)
--- a/src/io/write-diary.h
+++ b/src/io/write-diary.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 #define DIARY_DIALY                            0
 #define DIARY_DESCRIPTION              1

diff --git a/src/japanese.c b/src/japanese.c
index f09c4fa..b89d9ae 100644 (file)
--- a/src/japanese.c
+++ b/src/japanese.c
@@ -4,7 +4,7 @@
  *  @date 2014/07/07
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "japanese.h"
 

diff --git a/src/knowledge/knowledge-autopick.c b/src/knowledge/knowledge-autopick.c
index b380b98..1dec1b5 100644 (file)
--- a/src/knowledge/knowledge-autopick.c
+++ b/src/knowledge/knowledge-autopick.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge/knowledge-autopick.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"

diff --git a/src/knowledge/knowledge-experiences.c b/src/knowledge/knowledge-experiences.c
index f907ce6..5c7f4c3 100644 (file)
--- a/src/knowledge/knowledge-experiences.c
+++ b/src/knowledge/knowledge-experiences.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge-experiences.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"

diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c
index 9e3c0b5..07d7c36 100644 (file)
--- a/src/knowledge/knowledge-features.c
+++ b/src/knowledge/knowledge-features.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge/knowledge-features.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"

diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c
index ed4cc5e..a41e5d8 100644 (file)
--- a/src/knowledge/knowledge-inventory.c
+++ b/src/knowledge/knowledge-inventory.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge/knowledge-inventory.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 5a90c86..1ab205d 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge-items.h"
 #include "cmd/dump-util.h"
 #include "artifact.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 4f19109..259bb51 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge/knowledge-monsters.h"
 #include "cmd/dump-util.h"
 #include "sort.h"

diff --git a/src/knowledge/knowledge-mutations.c b/src/knowledge/knowledge-mutations.c
index 23526eb..da5579b 100644 (file)
--- a/src/knowledge/knowledge-mutations.c
+++ b/src/knowledge/knowledge-mutations.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge/knowledge-mutations.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 8f0780c..4541e16 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -4,11 +4,11 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge-quests.h"
 #include "cmd/dump-util.h"
 #include "quest.h"
-#include "core/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
+#include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
 #include "artifact.h"
 #include "object/object-flavor.h"
 #include "dungeon/dungeon.h"

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
index 1a331ab..7514993 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge-self.h"
 #include "cmd/dump-util.h"
 #include "avatar.h"

diff --git a/src/knowledge/knowledge-uniques.c b/src/knowledge/knowledge-uniques.c
index 711547a..0e6bdd3 100644 (file)
--- a/src/knowledge/knowledge-uniques.c
+++ b/src/knowledge/knowledge-uniques.c
@@ -4,7 +4,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "knowledge-items.h"
 #include "cmd/dump-util.h"
 #include "sort.h"

diff --git a/src/load.c b/src/load.c
index 1b24e63..6c0a033 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -40,9 +40,9 @@
  *
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
-#include "core/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
+#include "system/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
 #include "core/angband-version.h"
 
 #include "load.h"

diff --git a/src/main-win.c b/src/main-win.c
index 6d78e0e..939cf05 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -89,7 +89,7 @@
 * </p>
 */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "io/signal-handlers.h"
 #include "main/sound-definitions-table.h"
 #include "main/music-definitions-table.h"
@@ -109,7 +109,7 @@
 #include "scores.h"
 #include "quest.h"
 #include "files.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/game-play.h"
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"

diff --git a/src/main/music-definitions-table.c b/src/main/music-definitions-table.c
index 6c8c358..0767cb9 100644 (file)
--- a/src/main/music-definitions-table.c
+++ b/src/main/music-definitions-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "main/music-definitions-table.h"
 
 const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =

diff --git a/src/main/sound-definitions-table.c b/src/main/sound-definitions-table.c
index 99ac852..9f3f976 100644 (file)
--- a/src/main/sound-definitions-table.c
+++ b/src/main/sound-definitions-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "main/sound-definitions-table.h"
 
 const concptr angband_sound_name[SOUND_MAX] =

diff --git a/src/market/arena-info-table.c b/src/market/arena-info-table.c
index e89edaf..60881a1 100644 (file)
--- a/src/market/arena-info-table.c
+++ b/src/market/arena-info-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "arena-info-table.h"
 
 /*!

diff --git a/src/market/articles-on-sale.c b/src/market/articles-on-sale.c
index 956bf7e..3636ecd 100644 (file)
--- a/src/market/articles-on-sale.c
+++ b/src/market/articles-on-sale.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "store-owners.h"
 #include "articles-on-sale.h"
 

diff --git a/src/market/black-market.c b/src/market/black-market.c
index 0ba0af4..c090ba3 100644 (file)
--- a/src/market/black-market.c
+++ b/src/market/black-market.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "floor/floor-town.h"
 #include "object/object-hook.h"
 #include "market/black-market.h"

diff --git a/src/market/building-util.c b/src/market/building-util.c
index eef057a..150d81c 100644 (file)
--- a/src/market/building-util.c
+++ b/src/market/building-util.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "market/building-util.h"
 
 /*!

diff --git a/src/market/building.c b/src/market/building.c
index 35aa0fc..2d2d748 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -12,12 +12,12 @@
  * Changed for ZAngband by Robert Ruehlmann
 */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
 #include "gameterm.h"
 
-#include "core/system-variables.h" // 暫定、init_flags のため。後で消すかも.
+#include "system/system-variables.h" // 暫定、init_flags のため。後で消すかも.
 #include "core/stuff-handler.h"
 #include "core/show-file.h"
 #include "core/special-internal-keys.h"

diff --git a/src/market/gold-magnification-table.c b/src/market/gold-magnification-table.c
index cc77e34..5140f2d 100644 (file)
--- a/src/market/gold-magnification-table.c
+++ b/src/market/gold-magnification-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "market/gold-magnification-table.h"
 
 /*

diff --git a/src/market/play-gamble.c b/src/market/play-gamble.c
index f3de8fc..ed57031 100644 (file)
--- a/src/market/play-gamble.c
+++ b/src/market/play-gamble.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "play-gamble.h"
 #include "gameterm.h"
 #include "avatar.h"

diff --git a/src/market/poker.c b/src/market/poker.c
index ad96a6c..d9ece22 100644 (file)
--- a/src/market/poker.c
+++ b/src/market/poker.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "poker.h"
 #include "gameterm.h"
 

diff --git a/src/market/say-comments.c b/src/market/say-comments.c
index 973a961..9795f46 100644 (file)
--- a/src/market/say-comments.c
+++ b/src/market/say-comments.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "say-comments.h"
 #include "main/sound-definitions-table.h"
 #include "market/store-owner-comments.h"

diff --git a/src/market/store-owner-comments.c b/src/market/store-owner-comments.c
index 17687de..ebda3d8 100644 (file)
--- a/src/market/store-owner-comments.c
+++ b/src/market/store-owner-comments.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "store-owner-comments.h"
 
 /*!

diff --git a/src/market/store-owners.c b/src/market/store-owners.c
index a9cb143..3cf620f 100644 (file)
--- a/src/market/store-owners.c
+++ b/src/market/store-owners.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "store-owners.h"
 
 /*!

diff --git a/src/market/store-util.c b/src/market/store-util.c
index a1ce936..e93912f 100644 (file)
--- a/src/market/store-util.c
+++ b/src/market/store-util.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "market/store-util.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/market/store.c b/src/market/store.c
index 4bc6ba1..8166acc 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "market/say-comments.h"
 #include "market/store-owners.h"
 #include "market/store-util.h"

diff --git a/src/market/store.h b/src/market/store.h
index 282f0f2..63ae83b 100644 (file)
--- a/src/market/store.h
+++ b/src/market/store.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "market/store-owners.h"
 
  /*

diff --git a/src/mind.c b/src/mind.c
index 3f29e11..c55c794 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -14,7 +14,7 @@
  * 特殊技能を揃えて実装している。
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/monster/monster-attack.h b/src/monster/monster-attack.h
index a462d46..fa019dd 100644 (file)
--- a/src/monster/monster-attack.h
+++ b/src/monster/monster-attack.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx);

diff --git a/src/monster/monster-direction.h b/src/monster/monster-direction.h
index 48637c5..748eba7 100644 (file)
--- a/src/monster/monster-direction.h
+++ b/src/monster/monster-direction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 bool get_enemy_dir(player_type *target_ptr, MONSTER_IDX m_idx, int *mm);
 bool decide_monster_movement_direction(player_type *target_ptr, DIRECTION *mm, MONSTER_IDX m_idx, bool aware);

diff --git a/src/monster/monster-dist-offsets.c b/src/monster/monster-dist-offsets.c
index 844246d..29aedbc 100644 (file)
--- a/src/monster/monster-dist-offsets.c
+++ b/src/monster/monster-dist-offsets.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-dist-offsets.h"
 
 /*

diff --git a/src/monster/monster-move.h b/src/monster/monster-move.h
index 862448b..78cdfc2 100644 (file)
--- a/src/monster/monster-move.h
+++ b/src/monster/monster-move.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, DIRECTION *mm, POSITION oy, POSITION ox, int *count);

diff --git a/src/monster/monster-object.h b/src/monster/monster-object.h
index 7b4a814..c94288a 100644 (file)
--- a/src/monster/monster-object.h
+++ b/src/monster/monster-object.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 void update_object_by_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx);

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 2a79e13..07eb8f4 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -13,7 +13,7 @@
  * to improve the general quality of the AI (version 0.1.1).
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "monster/monster-direction.h"
 #include "monster/monster-move.h"

diff --git a/src/monster/monster-runaway.h b/src/monster/monster-runaway.h
index 24eb8d4..d0adfe3 100644 (file)
--- a/src/monster/monster-runaway.h
+++ b/src/monster/monster-runaway.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx);

diff --git a/src/monster/monster-safety-hiding.h b/src/monster/monster-safety-hiding.h
index f1827ad..6b0af99 100644 (file)
--- a/src/monster/monster-safety-hiding.h
+++ b/src/monster/monster-safety-hiding.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 bool find_safety(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSITION *xp);

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 6d5623a..50fa898 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/monster/monster-sweep-grid.h b/src/monster/monster-sweep-grid.h
index d89a3e2..e8d059f 100644 (file)
--- a/src/monster/monster-sweep-grid.h
+++ b/src/monster/monster-sweep-grid.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm);
\ No newline at end of file

diff --git a/src/monster/monster-update.h b/src/monster/monster-update.h
index 2c83fc9..42d61c3 100644 (file)
--- a/src/monster/monster-update.h
+++ b/src/monster/monster-update.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monster-util.h"
 
 bool update_riding_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, POSITION ny, POSITION nx);

diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c
index 760d454..a081832 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-util.c
@@ -7,7 +7,7 @@
  * 引数に入っていたらここには移動させないこと
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "monster-util.h"
 
  /*!

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 5e0c0ae..4e50dcf 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
 #include "gameterm.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index d94856c..5b30087 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -10,10 +10,10 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/monster/monsterrace-hook.c b/src/monster/monsterrace-hook.c
index 313221d..25d8651 100644 (file)
--- a/src/monster/monsterrace-hook.c
+++ b/src/monster/monsterrace-hook.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "monster/monsterrace-hook.h"

diff --git a/src/monster/monsterrace.c b/src/monster/monsterrace.c
index d0502a3..ac2b9cb 100644 (file)
--- a/src/monster/monsterrace.c
+++ b/src/monster/monsterrace.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "monster/monsterrace.h"
 #include "util.h"
 

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index 46e70c0..f9c2284 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "quantum-effect.h"
 #include "monster-spell.h"
 #include "spell/spells3.h"

diff --git a/src/mspells1.c b/src/mspells1.c
index 3182966..b00c4ed 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -38,7 +38,7 @@
  * Both of them have the same effect on the "choose spell" routine.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "effect/effect-characteristics.h"

diff --git a/src/mspells2.c b/src/mspells2.c
index f663bb7..abed7a2 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -11,7 +11,7 @@
  * @details
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/mspells3.c b/src/mspells3.c
index 0787317..34e32c9 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/mspells4.c b/src/mspells4.c
index 070ee0e..b5941d5 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -5,7 +5,7 @@
  * @author Habu
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index 27cff7d..856ed3a 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "mutation/mutation-processor.h"
 #include "spell/spells-type.h"
 #include "spells-summon.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 780add4..dbbccba 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -11,7 +11,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "core/show-file.h"
 #include "util.h"

diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c
index 6b3972e..bfe7608 100644 (file)
--- a/src/object/lite-processor.c
+++ b/src/object/lite-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "object/lite-processor.h"
 #include "object/object-ego.h"
 #include "object/object-hook.h"

diff --git a/src/object/object-boost.c b/src/object/object-boost.c
index 17574aa..dae24f0 100644 (file)
--- a/src/object/object-boost.c
+++ b/src/object/object-boost.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "floor/floor.h"
 #include "object/object-boost.h"
 #include "object/object-boost.h"

diff --git a/src/object/object-broken.c b/src/object/object-broken.c
index fb89e32..29692c9 100644 (file)
--- a/src/object/object-broken.c
+++ b/src/object/object-broken.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "object/object-kind.h"
 #include "snipe.h"
 #include "spell/spells-type.h"

diff --git a/src/object/object-curse.c b/src/object/object-curse.c
index b3396e0..228845f 100644 (file)
--- a/src/object/object-curse.c
+++ b/src/object/object-curse.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "object/object-flavor.h"

diff --git a/src/object/object-ego.c b/src/object/object-ego.c
index 3b6df5b..f8a67fd 100644 (file)
--- a/src/object/object-ego.c
+++ b/src/object/object-ego.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "object/object-ego.h"
 
 /*

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 78098e8..a82385c 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -10,7 +10,7 @@
  * are included in all such copies.  Other copyrights may also apply.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-smith.h"

diff --git a/src/object/object-flavor.h b/src/object/object-flavor.h
index 399e884..c037a07 100644 (file)
--- a/src/object/object-flavor.h
+++ b/src/object/object-flavor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "h-type.h"
+#include "system/h-type.h"
 #include "object/object.h"
 
 /* flavor.c */

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index d14f5e4..898f570 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -1,5 +1,5 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "object/object-hook.h"

diff --git a/src/object/object-kind-hook.c b/src/object/object-kind-hook.c
index 9f41f15..9ce2067 100644 (file)
--- a/src/object/object-kind-hook.c
+++ b/src/object/object-kind-hook.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 

diff --git a/src/object/object-kind.c b/src/object/object-kind.c
index 6f0018f..f6f93b4 100644 (file)
--- a/src/object/object-kind.c
+++ b/src/object/object-kind.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "object-kind.h"
 

diff --git a/src/object/object1.c b/src/object/object1.c
index 4667a04..0bfedb4 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -11,8 +11,8 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
-#include "core/system-variables.h"
+#include "system/angband.h"
+#include "system/system-variables.h"
 #include "io/read-pref-file.h"
 #include "util.h"
 

diff --git a/src/object/object2.c b/src/object/object2.c
index faf1d35..60d20f9 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -11,7 +11,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "world/world.h"

diff --git a/src/patron.c b/src/patron.c
index 6bd1962..4b175f8 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -1,5 +1,5 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "io/write-diary.h"

diff --git a/src/player-inventory.c b/src/player-inventory.c
index d2691a0..df46029 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "player-inventory.h"

diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c
index 8d258b0..7fd1729 100644 (file)
--- a/src/player/digestion-processor.c
+++ b/src/player/digestion-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "player/digestion-processor.h"
 #include "world/world.h"
 #include "realm/realm-song.h"

diff --git a/src/player/mimic-info-table.c b/src/player/mimic-info-table.c
index f10898d..325a048 100644 (file)
--- a/src/player/mimic-info-table.c
+++ b/src/player/mimic-info-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "mimic-info-table.h"
 
 /*!

diff --git a/src/player/permanent-resistances.h b/src/player/permanent-resistances.h
index ace81f6..89f692a 100644 (file)
--- a/src/player/permanent-resistances.h
+++ b/src/player/permanent-resistances.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void player_flags(player_type *creature_ptr, BIT_FLAGS *flags);

diff --git a/src/player/player-class.c b/src/player/player-class.c
index c5d7f19..2e27504 100644 (file)
--- a/src/player/player-class.c
+++ b/src/player/player-class.c
@@ -1,5 +1,5 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "player/player-class.h"
 
 /*

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 3b1ec6f..b3116c2 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/music-definitions-table.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 2e01c7c..759031c 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -12,7 +12,7 @@
  * 2013 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "gameterm.h"
 #include "core/stuff-handler.h"
 #include "util.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 8103e15..f33edef 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -139,7 +139,7 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "core/special-internal-keys.h"
 #include "util.h"

diff --git a/src/player/player-personality.c b/src/player/player-personality.c
index 7274859..4a25e51 100644 (file)
--- a/src/player/player-personality.c
+++ b/src/player/player-personality.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "player/player-personality.h"
 
 

diff --git a/src/player/player-race.c b/src/player/player-race.c
index 80db024..bd760c6 100644 (file)
--- a/src/player/player-race.c
+++ b/src/player/player-race.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "player/player-race.h"
 
 const player_race *rp_ptr;

diff --git a/src/player/player-sex.c b/src/player/player-sex.c
index 6de9355..e7ceccf 100644 (file)
--- a/src/player/player-sex.c
+++ b/src/player/player-sex.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "player/player-sex.h"
 
 /*

diff --git a/src/player/player-skill.c b/src/player/player-skill.c
index d95d6bf..1e2e628 100644 (file)
--- a/src/player/player-skill.c
+++ b/src/player/player-skill.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "player/player-skill.h"
 
 /*

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 1664aa0..fa39255 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/player/process-death.h b/src/player/process-death.h
index d1d7d65..612fd1b 100644 (file)
--- a/src/player/process-death.h
+++ b/src/player/process-death.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "files.h"
 
 void print_tomb(player_type *dead_ptr);

diff --git a/src/player/process-name.h b/src/player/process-name.h
index d37d7d3..6e5d4bc 100644 (file)
--- a/src/player/process-name.h
+++ b/src/player/process-name.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void process_player_name(player_type *creature_ptr, bool sf);
 void get_name(player_type *creature_ptr);

diff --git a/src/player/race-info-table.c b/src/player/race-info-table.c
index a52593d..b5237c0 100644 (file)
--- a/src/player/race-info-table.c
+++ b/src/player/race-info-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "race-info-table.h"
 
 /*!

diff --git a/src/player/race-resistances.h b/src/player/race-resistances.h
index e43e564..971580b 100644 (file)
--- a/src/player/race-resistances.h
+++ b/src/player/race-resistances.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void player_immunity(player_type *creature_ptr, BIT_FLAGS *flags);
 void tim_player_immunity(player_type *creature_ptr, BIT_FLAGS *flags);

diff --git a/src/player/temporary-resistances.h b/src/player/temporary-resistances.h
index 073ddcd..5f5506e 100644 (file)
--- a/src/player/temporary-resistances.h
+++ b/src/player/temporary-resistances.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void tim_player_flags(player_type *creature_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);

diff --git a/src/quest.c b/src/quest.c
index 3cb266a..f510d9c 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -1,8 +1,8 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
 
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "floor/floor-save.h"

diff --git a/src/racial.c b/src/racial.c
index 1a0e342..40ec421 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen. \n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 1cdd7c4..0cabde6 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 9d103ae..93342f6 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index d4b7adc..8fac092 100644 (file)
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 39c899a..3b4967f 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "world/world.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index b6e4c88..652059d 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "player/player-class.h"

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index da2d763..e7a0e5e 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd-spell.h"
 #include "spell/spells-type.h"
 #include "spells-summon.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index e7cb402..4651bcb 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -15,7 +15,7 @@
  * 2: Turn count for revenge\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "effect/effect-characteristics.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index e7f9e42..90edb24 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index 8525bc4..e9dd73d 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "cmd-spell.h"
 #include "spells-status.h"
 #include "spells-floor.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 5bd461a..5a11c06 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 8aae046..a9382aa 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 159a9fa..2b1e116 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 506cd6e..3c6da86 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/realm/realm.c b/src/realm/realm.c
index 1e070ff..4d3d78f 100644 (file)
--- a/src/realm/realm.c
+++ b/src/realm/realm.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "realm/realm.h"
 
 #ifdef JP

diff --git a/src/report.c b/src/report.c
index 3d45493..7ecb44a 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -5,7 +5,7 @@
  * @author Hengband Team
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/turn-compensator.h"
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"

diff --git a/src/room/pit-nest-kinds-table.c b/src/room/pit-nest-kinds-table.c
index 0c3f182..500b28a 100644 (file)
--- a/src/room/pit-nest-kinds-table.c
+++ b/src/room/pit-nest-kinds-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "room/pit-nest-kinds-table.h"
 #include "monster/monsterrace-hook.h"
 

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

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

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

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index ee27a8e..3733821 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "grid.h"

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index 7eabb80..366fc97 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "grid.h"

diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c
index 59aa8ff..79e7c7b 100644 (file)
--- a/src/room/rooms-trap.c
+++ b/src/room/rooms-trap.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "grid.h"

diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 25f6651..9c721be 100644 (file)
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "room/rooms-vault.h"
 

diff --git a/src/room/rooms.c b/src/room/rooms.c
index 0639fd4..bb1a515 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -36,7 +36,7 @@
  * None of the pits/nests are allowed to include "unique" monsters.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "feature.h"

diff --git a/src/rumor.c b/src/rumor.c
index 5c58031..0b88c69 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "io/tokenizer.h"

diff --git a/src/save.c b/src/save.c
index 672f32d..796d63b 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -11,7 +11,7 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "save.h"
 #include "load.h"

diff --git a/src/scores.c b/src/scores.c
index 4f47494..2e5022e 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "io/signal-handlers.h"
 #include "gameterm.h"
 #include "util.h"

diff --git a/src/selfinfo.c b/src/selfinfo.c
index 37f8770..d64ca00 100644 (file)
--- a/src/selfinfo.c
+++ b/src/selfinfo.c
@@ -14,7 +14,7 @@
  * spell2s.cから分離
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "player/player-status.h"

diff --git a/src/snipe.c b/src/snipe.c
index c1ceda4..6a84a83 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -6,7 +6,7 @@
  * 2014 Deskull rearranged comment for Doxygen.\n
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/sort.c b/src/sort.c
index 86bca5e..de557c7 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "sort.h"
 #include "floor/floor.h"
 #include "quest.h"

diff --git a/src/spell/music-checker.c b/src/spell/music-checker.c
index 9453e8b..84d0b5e 100644 (file)
--- a/src/spell/music-checker.c
+++ b/src/spell/music-checker.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "spell/music-checker.h"
 #include "realm/realm-song.h"
 #include "spell/spells3.h"

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index 63f7055..b4d2f42 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "effect/spells-effect-util.h"
 #include "spell/process-effect.h"
 #include "cmd-pet.h" // 暫定、後で消すかも.

diff --git a/src/spell/spells-execution.c b/src/spell/spells-execution.c
index 11c987d..9541532 100644 (file)
--- a/src/spell/spells-execution.c
+++ b/src/spell/spells-execution.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "spell/spells-util.h"
 #include "spell/spells-execution.h"
 #include "realm/realm.h"

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index 04b3349..d9ff8ae 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -11,8 +11,8 @@
  * </pre>
  */
 
-#include "angband.h"
-#include "core/system-variables.h"
+#include "system/angband.h"
+#include "system/system-variables.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "cmd/cmd-pet.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index ba76872..fa62043 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -11,8 +11,8 @@
  * </pre>
  */
 
-#include "angband.h"
-#include "core/system-variables.h"
+#include "system/angband.h"
+#include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index dff65b2..0df5309 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -11,7 +11,7 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "market/building.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"

diff --git a/src/spell/technic-info-table.c b/src/spell/technic-info-table.c
index f098161..5ae24b0 100644 (file)
--- a/src/spell/technic-info-table.c
+++ b/src/spell/technic-info-table.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "spell/technic-info-table.h"
 
 /*!

diff --git a/src/spells-diceroll.c b/src/spells-diceroll.c
index c35a341..f563edf 100644 (file)
--- a/src/spells-diceroll.c
+++ b/src/spells-diceroll.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 
 #include "spells-diceroll.h"
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index a406c03..f21bd82 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "dungeon/dungeon.h"

diff --git a/src/spells-object.c b/src/spells-object.c
index 11ecc9e..f4af8f9 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -1,5 +1,5 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "cmd-basic.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index 1a7ed61..1ff0a0e 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 

diff --git a/src/spells-summon.c b/src/spells-summon.c
index 3cdff10..ec11267 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "spells-summon.h"

diff --git a/src/spells-world.c b/src/spells-world.c
index b4cb6f3..8f8792a 100644 (file)
--- a/src/spells-world.c
+++ b/src/spells-world.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "world/world.h"
 

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

diff --git a/src/h-basic.h b/src/system/h-basic.h
similarity index 88%
rename from src/h-basic.h
rename to src/system/h-basic.h
index 231b0e4..63b0ec7 100644 (file)
--- a/src/h-basic.h
+++ b/src/system/h-basic.h
@@ -15,16 +15,16 @@
 #endif /* HAVE_CONFIG_H */
 
 /* System Configuration */
-#include "h-config.h"
+#include "system/h-config.h"
 
 /* System includes/externs */
-#include "h-system.h"
+#include "system/h-system.h"
 
 /* Basic types */
-#include "h-type.h"
+#include "system/h-type.h"
 
 /* Basic constants and macros */
-#include "h-define.h"
+#include "system/h-define.h"
 
 /* ゲーム調整値はこちらに */
 #include "gamevalue.h"

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

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

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

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

diff --git a/src/core/system-variables.c b/src/system/system-variables.c
similarity index 92%
rename from src/core/system-variables.c
rename to src/system/system-variables.c
index 5869d1b..a9dd70b 100644 (file)
--- a/src/core/system-variables.c
+++ b/src/system/system-variables.c
@@ -4,8 +4,8 @@
  * @date 2013/12/31
  */
 
-#include "angband.h"
-#include "core/system-variables.h"
+#include "system/angband.h"
+#include "system/system-variables.h"
 
  /*!
   * todo どこからも呼ばれていない。main関数辺りに移設するか、そもそもコメントでいいと思われる

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

diff --git a/src/targeting.c b/src/targeting.c
index 164f434..06c8217 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -10,9 +10,9 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "targeting.h"

diff --git a/src/trap.c b/src/trap.c
index ce11569..34febfc 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/util.c b/src/util.c
index ca97f7d..8aeb6d3 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -10,10 +10,10 @@
 
  /* Purpose: Angband utilities -BEN- */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "main/music-definitions-table.h"
 #include "io/signal-handlers.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "util.h"

diff --git a/src/view/display-characteristic.h b/src/view/display-characteristic.h
index d662de2..1fee1e8 100644 (file)
--- a/src/view/display-characteristic.h
+++ b/src/view/display-characteristic.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 /* Mode flags for displaying player flags */
 #define DP_CURSE   0x01

diff --git a/src/view/display-fruit.c b/src/view/display-fruit.c
index 720a862..34ac161 100644 (file)
--- a/src/view/display-fruit.c
+++ b/src/view/display-fruit.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "display-fruit.h"
 #include "gameterm.h"
 

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index d4afba2..fb8416d 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-methods-table.h"
@@ -18,7 +18,7 @@
 #include "gameterm.h"
 
 #include "market/building.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 #include "core/stuff-handler.h"
 #include "files.h"
 #include "world/world.h"

diff --git a/src/view/display-player-middle.h b/src/view/display-player-middle.h
index 4de5108..0245779 100644 (file)
--- a/src/view/display-player-middle.h
+++ b/src/view/display-player-middle.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void display_player_middle(player_type *creature_ptr);

diff --git a/src/view/display-player-misc-info.c b/src/view/display-player-misc-info.c
index 1a3ffe6..d4ecffa 100644 (file)
--- a/src/view/display-player-misc-info.c
+++ b/src/view/display-player-misc-info.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "view/display-player-stat-info.h"
 #include "player/mimic-info-table.h"
 #include "player/player-personality.h"

diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c
index 8b229de..8167681 100644 (file)
--- a/src/view/display-player-stat-info.c
+++ b/src/view/display-player-stat-info.c
@@ -6,7 +6,7 @@
  * ここにこれ以上関数を引っ越してくるのは禁止。何ならここから更に分割していく
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "display-player-stat-info.h"
 #include "player/mimic-info-table.h"
 #include "gameterm.h"

diff --git a/src/view/display-player.c b/src/view/display-player.c
index 91e2998..fd5f69a 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -15,7 +15,7 @@
 #include "patron.h"
 #include "world/world.h"
 #include "quest.h"
-#include "core/system-variables.h" // 暫定。後で消す
+#include "system/system-variables.h" // 暫定。後で消す
 #include "knowledge/knowledge-mutations.h"
 #include "dungeon/dungeon-file.h"
 #include "object/object-kind.h"

diff --git a/src/view/display-player.h b/src/view/display-player.h
index be52909..eec23a0 100644 (file)
--- a/src/view/display-player.h
+++ b/src/view/display-player.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 #include "files.h"
 
 void display_player(player_type *creature_ptr, int mode, map_name_pf map_name);

diff --git a/src/view/display-util.h b/src/view/display-util.h
index 62223b2..9008587 100644 (file)
--- a/src/view/display-util.h
+++ b/src/view/display-util.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "angband.h"
+#include "system/angband.h"
 
 void display_player_one_line(int entry, concptr val, TERM_COLOR attr);

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index d137488..d9b1154 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -5,7 +5,7 @@
  * @author Hourier
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "gameterm.h"
 #include "status-first-page.h"
 #include "display-util.h"

diff --git a/src/warning.c b/src/warning.c
index 203a280..4fbb339 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -1,5 +1,5 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "artifact.h"

diff --git a/src/wild.c b/src/wild.c
index a29ebde..e26e5b0 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -10,9 +10,9 @@
  * 2013 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
-#include "core/system-variables.h"
+#include "system/system-variables.h"
 
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 79cae6c..cd2629a 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -10,7 +10,7 @@
  * 2014 Deskull rearranged comment for Doxygen.<br>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "wizard/wizard-special-process.h"
 #include "wizard/wizard-spoiler.h"
 #include "core/angband-version.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index ee444fc..36efd95 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -10,7 +10,7 @@
  * 2013 Deskull rearranged comment for Doxygen.
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "wizard/wizard-spoiler.h"
 #include "util.h"
 #include "gameterm.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 2fd73ca..48e2911 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "world/world-movement-processor.h"
 #include "main/sound-definitions-table.h"
 #include "io/write-diary.h"

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 69332b8..4865562 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "world/world-turn-processor.h"
 #include "world/world.h"
 #include "dungeon/dungeon.h"

diff --git a/src/world/world.c b/src/world/world.c
index 1ee5edb..d3b30af 100644 (file)
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -1,4 +1,4 @@
-#include "angband.h"
+#include "system/angband.h"
 #include "world/world.h"
 #include "player/player-race.h"
 

diff --git a/src/z-form.h b/src/z-form.h
index 5fc818c..7864bc8 100644 (file)
--- a/src/z-form.h
+++ b/src/z-form.h
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_Z_FORM_H
 #define INCLUDED_Z_FORM_H
 
-#include "h-basic.h"
+#include "system/h-basic.h"
 
 /*
  * This file provides functions very similar to "sprintf()", but which

diff --git a/src/z-rand.h b/src/z-rand.h
index d194a68..c679bde 100644 (file)
--- a/src/z-rand.h
+++ b/src/z-rand.h
@@ -12,7 +12,7 @@
 #ifndef INCLUDED_Z_RAND_H
 #define INCLUDED_Z_RAND_H
 
-#include "h-basic.h"
+#include "system/h-basic.h"
 
 
 

diff --git a/src/z-term.c b/src/z-term.c
index 149337e..884a336 100644 (file)
--- a/src/z-term.c
+++ b/src/z-term.c
@@ -9,7 +9,7 @@
  */
 
  /* Purpose: a generic, efficient, terminal window package -BEN- */
-#include "angband.h"
+#include "system/angband.h"
 
 #include "gameterm.h"
 #include "z-term.h"

diff --git a/src/z-term.h b/src/z-term.h
index db5f882..9acf107 100644 (file)
--- a/src/z-term.h
+++ b/src/z-term.h
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_Z_TERM_H
 #define INCLUDED_Z_TERM_H
 
-#include "h-basic.h"
+#include "system/h-basic.h"
 
 typedef struct term_win term_win;
  /*!

diff --git a/src/z-util.h b/src/z-util.h
index cba4163..07bdab5 100644 (file)
--- a/src/z-util.h
+++ b/src/z-util.h
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_Z_UTIL_H
 #define INCLUDED_Z_UTIL_H
 
-#include "h-basic.h"
+#include "system/h-basic.h"
 
 
 /*

diff --git a/src/z-virt.h b/src/z-virt.h
index 2064735..3fb9f28 100644 (file)
--- a/src/z-virt.h
+++ b/src/z-virt.h
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_Z_VIRT_H
 #define INCLUDED_Z_VIRT_H
 
-#include "h-basic.h"
+#include "system/h-basic.h"
 
 /*
  * Memory management routines.