[Refactor] #38862 gameterm.c/h and z-* to term/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index f619c57..86f8b00 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -507,7 +507,7 @@
     <ClCompile Include="..\..\src\market\store.c" />\r
     <ClCompile Include="..\..\src\floor\floor-streams.c" />\r
     <ClCompile Include="..\..\src\targeting.c" />\r
-    <ClCompile Include="..\..\src\gameterm.c" />\r
+    <ClCompile Include="..\..\src\term\gameterm.c" />\r
     <ClCompile Include="..\..\src\grid\trap.c" />\r
     <ClCompile Include="..\..\src\util.c" />\r
     <ClCompile Include="..\..\src\view\display-main-window.c" />\r
@@ -518,11 +518,11 @@
     <ClCompile Include="..\..\src\world\world.c" />\r
     <ClCompile Include="..\..\src\world\world-movement-processor.c" />\r
     <ClCompile Include="..\..\src\world\world-turn-processor.c" />\r
-    <ClCompile Include="..\..\src\z-form.c" />\r
-    <ClCompile Include="..\..\src\z-rand.c" />\r
-    <ClCompile Include="..\..\src\z-term.c" />\r
-    <ClCompile Include="..\..\src\z-util.c" />\r
-    <ClCompile Include="..\..\src\z-virt.c" />\r
+    <ClCompile Include="..\..\src\term\z-form.c" />\r
+    <ClCompile Include="..\..\src\term\z-rand.c" />\r
+    <ClCompile Include="..\..\src\term\z-term.c" />\r
+    <ClCompile Include="..\..\src\term\z-util.c" />\r
+    <ClCompile Include="..\..\src\term\z-virt.c" />\r
     <ClInclude Include="..\..\src\cmd\cmd-activate.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-basic.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-diary.h" />\r
@@ -716,18 +716,18 @@
     <ClInclude Include="..\..\src\spell\spells1.h" />\r
     <ClInclude Include="..\..\src\market\store.h" />\r
     <ClInclude Include="..\..\src\targeting.h" />\r
-    <ClInclude Include="..\..\src\gameterm.h" />\r
+    <ClInclude Include="..\..\src\term\gameterm.h" />\r
     <ClInclude Include="..\..\src\grid\trap.h" />\r
     <ClInclude Include="..\..\src\util.h" />\r
     <ClInclude Include="..\..\src\view\display-main-window.h" />\r
     <ClInclude Include="..\..\src\warning.h" />\r
     <ClInclude Include="..\..\src\wild.h" />\r
     <ClInclude Include="..\..\src\world\world.h" />\r
-    <ClInclude Include="..\..\src\z-form.h" />\r
-    <ClInclude Include="..\..\src\z-rand.h" />\r
-    <ClInclude Include="..\..\src\z-term.h" />\r
-    <ClInclude Include="..\..\src\z-util.h" />\r
-    <ClInclude Include="..\..\src\z-virt.h" />\r
+    <ClInclude Include="..\..\src\term\z-form.h" />\r
+    <ClInclude Include="..\..\src\term\z-rand.h" />\r
+    <ClInclude Include="..\..\src\term\z-term.h" />\r
+    <ClInclude Include="..\..\src\term\z-util.h" />\r
+    <ClInclude Include="..\..\src\term\z-virt.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\src\angband.rc" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 20315ce..e081174 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3,8 +3,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\src\main-win.c" />
     <ClCompile Include="..\..\src\readdib.c" />
-    <ClCompile Include="..\..\src\z-form.c" />
-    <ClCompile Include="..\..\src\z-term.c" />
     <ClCompile Include="..\..\src\warning.c" />
     <ClCompile Include="..\..\src\patron.c">
       <Filter>player</Filter>
@@ -25,9 +23,6 @@
     <ClCompile Include="..\..\src\history.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\gameterm.c">
-      <Filter>io</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\quest.c">
       <Filter>market</Filter>
     </ClCompile>
@@ -43,15 +38,6 @@
     <ClCompile Include="..\..\src\scores.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\z-util.c">
-      <Filter>core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\z-virt.c">
-      <Filter>core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\z-rand.c">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\report.c">
       <Filter>io</Filter>
     </ClCompile>
@@ -829,13 +815,29 @@
     <ClCompile Include="..\..\src\io\files.c">
       <Filter>io</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\term\gameterm.c">
+      <Filter>term</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\term\z-form.c">
+      <Filter>term</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\term\z-rand.c">
+      <Filter>term</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\term\z-term.c">
+      <Filter>term</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\term\z-util.c">
+      <Filter>term</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\term\z-virt.c">
+      <Filter>term</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
     <ClInclude Include="..\..\src\init.h" />
     <ClInclude Include="..\..\src\readdib.h" />
-    <ClInclude Include="..\..\src\z-form.h" />
-    <ClInclude Include="..\..\src\z-term.h" />
     <ClInclude Include="..\..\src\warning.h" />
     <ClInclude Include="..\..\src\patron.h">
       <Filter>player</Filter>
@@ -855,9 +857,6 @@
     <ClInclude Include="..\..\src\history.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\gameterm.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\quest.h">
       <Filter>market</Filter>
     </ClInclude>
@@ -873,15 +872,6 @@
     <ClInclude Include="..\..\src\scores.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\z-util.h">
-      <Filter>core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\z-virt.h">
-      <Filter>core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\z-rand.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\racial.h">
       <Filter>cmd</Filter>
     </ClInclude>
@@ -1701,6 +1691,24 @@
     <ClInclude Include="..\..\src\io\files.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\term\gameterm.h">
+      <Filter>term</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\term\z-form.h">
+      <Filter>term</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\term\z-rand.h">
+      <Filter>term</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\term\z-term.h">
+      <Filter>term</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\term\z-util.h">
+      <Filter>term</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\term\z-virt.h">
+      <Filter>term</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -1788,6 +1796,9 @@
     <Filter Include="grid">
       <UniqueIdentifier>{93b0c1d1-0841-44fe-8503-d6729d290350}</UniqueIdentifier>
     </Filter>
+    <Filter Include="term">
+      <UniqueIdentifier>{ad847f1c-b291-4640-93d2-21895fbee308}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 468a10a..dd6014f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -241,14 +241,11 @@ hengband_SOURCES = \
        spells-summon.c spells-summon.h \
        spells-world.c spells-world.h \
        \
-       sort.c sort.h gameterm.c gameterm.h util.c util.h \
+       sort.c sort.h util.c util.h \
        wild.h wild.c warning.c warning.h \
        \
        view-mainwindow.c view-mainwindow.h targeting.c targeting.h \
        \
-       z-form.c z-form.h z-rand.c z-rand.h z-term.c z-term.h z-util.c z-util.h \
-       z-virt.c z-virt.h \
-       \
        knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \
        knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \
        knowledge/knowledge-features.c knowledge/knowledge-features.h \
@@ -283,6 +280,12 @@ hengband_SOURCES = \
        \
        combat/melee.h combat/melee.c combat/shoot.c combat/shoot.h \
        \
+       term/gameterm.c term/gameterm.h \
+       term/z-form.c term/z-form.h term/z-rand.c term/z-rand.h \
+       term/z-term.c term/z-term.h term/z-util.c term/z-util.h \
+       term/z-virt.c term/z-virt.h \
+       \
+       \
        wizard/wizard-spoiler.c wizard/wizard-spoiler.h\
        wizard/wizard-special-process.c wizard/wizard-special-process.h \
        \

diff --git a/src/autopick/autopick-command-menu.c b/src/autopick/autopick-command-menu.c
index 40c426a..1ef2ed3 100644 (file)
--- a/src/autopick/autopick-command-menu.c
+++ b/src/autopick/autopick-command-menu.c
@@ -9,7 +9,7 @@
 #include "autopick/autopick-command-menu.h"
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-menu-data-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief 自動拾いエディタの画面を再描画する

diff --git a/src/autopick/autopick-drawer.c b/src/autopick/autopick-drawer.c
index 1e68218..ad556ee 100644 (file)
--- a/src/autopick/autopick-drawer.c
+++ b/src/autopick/autopick-drawer.c
@@ -9,7 +9,7 @@
 #include "autopick/autopick-dirty-flags.h"
 #include "autopick/autopick-describer.h"
 #include "autopick/autopick-entry.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "io/files.h"
 
 #define DESCRIPT_HGT 3

diff --git a/src/autopick/autopick-editor-command.c b/src/autopick/autopick-editor-command.c
index 2cd32ee..fcbee12 100644 (file)
--- a/src/autopick/autopick-editor-command.c
+++ b/src/autopick/autopick-editor-command.c
@@ -18,7 +18,7 @@
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-drawer.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "core/show-file.h"
 
 /*

diff --git a/src/autopick/autopick-finder.c b/src/autopick/autopick-finder.c
index 4808241..1a0f7cc 100644 (file)
--- a/src/autopick/autopick-finder.c
+++ b/src/autopick/autopick-finder.c
@@ -11,7 +11,7 @@
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-matcher.h"
 #include "object/object-flavor.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "inventory/player-inventory.h"
 
  /*

diff --git a/src/birth/birth.c b/src/birth/birth.c
index df6c68a..dbb1613 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -14,7 +14,7 @@
 #include "system/angband.h"
 #include "system/system-variables.h"
 #include "core/show-file.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "io/read-pref-file.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/chuukei.c b/src/chuukei.c
index 473c78e..e005c1c 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -11,7 +11,7 @@
 #include "io/signal-handlers.h"
 #include "io/files.h"
 #include "util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-draw.h"
 #include "inet.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 43ef719..f3059aa 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -15,7 +15,7 @@
 #include "main/sound-definitions-table.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index 31036d1..bd48f3e 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -2,7 +2,7 @@
 #include "core/stuff-handler.h"
 #include "cmd/cmd-draw.h"
 #include "io/files.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "view/display-main-window.h" // 暫定。後で消す.
 #include "player/player-effects.h"
 #include "view/display-player.h" // 暫定。後で消す.

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index c8af602..2b163af 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -33,7 +33,7 @@
 #include "system/angband.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/dump-util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "core/angband-version.h"
 #include "io/dump-remover.h"
 #include "io/read-pref-file.h"

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index f5d67ed..0922638 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -4,7 +4,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-gameoption.h"
 #include "cmd/cmd-autopick.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "view/display-main-window.h"
 #include "cmd/cmd-dump.h"
 #include "core/show-file.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index cde87df..06ae1fb 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -14,7 +14,7 @@
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "selfinfo.h"
 #include "cmd-activate.h"

diff --git a/src/cmd/cmd-macro.c b/src/cmd/cmd-macro.c
index 5f2c72c..ccb25db 100644 (file)
--- a/src/cmd/cmd-macro.c
+++ b/src/cmd/cmd-macro.c
@@ -3,7 +3,7 @@
 #include "cmd-gameoption.h"
 #include "io/files.h"
 #include "io/read-pref-file.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief マクロ情報をprefファイルに保存する /

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index 3188b92..2b39bb8 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -55,7 +55,7 @@
 #include "system/angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "cmd-basic.h"
 #include "cmd-usestaff.h"

diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c
index 8894918..47e8c56 100644 (file)
--- a/src/cmd/cmd-process-screen.c
+++ b/src/cmd/cmd-process-screen.c
@@ -9,7 +9,7 @@
 #include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-draw.h"
 #include "io/files.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "core/stuff-handler.h"
 
 // Encode the screen colors

diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c
index 0081e91..68c8973 100644 (file)
--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -7,7 +7,7 @@
 #include "io/save.h"
 #include "world/world.h"
 #include "monster/monster-status.h" // 違和感。要調査.
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief セーブするコマンドのメインルーチン

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index feed853..71d212a 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index ddb9509..bbbb431 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -7,7 +7,7 @@
 #include "io/files.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "cmd/lighting-level-table.h"
 #include "io/read-pref-file.h"
 #include "view/display-main-window.h" // 暫定。後で消す.

diff --git a/src/cmd/dump-util.c b/src/cmd/dump-util.c
index 0ca1e7b..2e94552 100644 (file)
--- a/src/cmd/dump-util.c
+++ b/src/cmd/dump-util.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "grid/feature.h"
 #include "dump-util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 TERM_COLOR attr_idx = 0;
 SYMBOL_CODE char_idx = 0;

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index ff5df1b..b06ab0d 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -2,7 +2,7 @@
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "monster/monster.h"
 #include "monster/monster-status.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 4890df7..818c9ec 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -17,7 +17,7 @@
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"
 #include "inet.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "chuukei.h"
 #include "birth/birth.h"
 #include "creature.h"

diff --git a/src/core/show-file.c b/src/core/show-file.c
index 8c6cc0b..043bf17 100644 (file)
--- a/src/core/show-file.c
+++ b/src/core/show-file.c
@@ -1,7 +1,7 @@
 #include "core/show-file.h"
 #include "io/files.h"
 #include "core/angband-version.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * todo 表示とそれ以外を分割する

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 2c32ba4..19e6720 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -60,7 +60,7 @@
 #include "grid/trap.h"
 #include "object/artifact.h"
 #include "cmd-activate.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "wild.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index c1e9e03..f4376d9 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -17,7 +17,7 @@
 
 #include "system/angband.h"
 #include "util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "world/world.h"
 #include "object/object-flavor.h"

diff --git a/src/init.c b/src/init.c
index 569a48c..98976fd 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -37,7 +37,7 @@
 #include "system/system-variables.h"
 #include "core/angband-version.h"
 #include "io/read-pref-file.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "object/artifact.h"
 #include "market/building.h"

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 83d0694..693bb7c 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -3,7 +3,7 @@
 #include "util.h"
 #include "inventory/player-inventory.h"
 
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "object/object.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"

diff --git a/src/io/interpret-pref-file.c b/src/io/interpret-pref-file.c
index a30e85e..4b518d6 100644 (file)
--- a/src/io/interpret-pref-file.c
+++ b/src/io/interpret-pref-file.c
@@ -10,7 +10,7 @@
 #include "object/object-kind.h"
 #include "birth/birth.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "view/display-main-window.h" // 暫定。apply_default_feat_lighting()。後で消す.
 
 #define MAX_MACRO_CHARS 65536 // 1つのマクロキー押下で実行可能なコマンド最大数 (エスケープシーケンス含む).

diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c
index fb014e3..4d6bbe1 100644 (file)
--- a/src/io/signal-handlers.c
+++ b/src/io/signal-handlers.c
@@ -10,7 +10,7 @@
 #include "core/game-closer.h"
 #include "io/save.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "floor/floor-events.h"

diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c
index 07d7c36..c1b361c 100644 (file)
--- a/src/knowledge/knowledge-features.c
+++ b/src/knowledge/knowledge-features.c
@@ -8,7 +8,7 @@
 #include "knowledge/knowledge-features.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "world/world.h"
 #include "cmd/lighting-level-table.h"
 #include "dungeon/dungeon.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 6f14fae..b9bd7cc 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -15,7 +15,7 @@
 #include "core/show-file.h"
 #include "cmd/object-group-table.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "core/stuff-handler.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
 

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 0eeaaa3..6bc489a 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -13,7 +13,7 @@
 #include "monster/monster-status.h"
 #include "world/world.h"
 #include "core/show-file.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "locale/english.h"
 
 #include "core/stuff-handler.h"

diff --git a/src/main-win.c b/src/main-win.c
index 7de77b5..5268832 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -116,13 +116,13 @@
 #include "core/special-internal-keys.h"
 #include "core/player-processor.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #ifdef WINDOWS
 #include <windows.h>
 #include <direct.h>
 #include <locale.h>
-#include "z-term.h"
+#include "term/z-term.h"
 #include "io/save.h"
 #include "dungeon/dungeon.h"
 

diff --git a/src/market/building.c b/src/market/building.c
index fc416fc..5a2e492 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -15,7 +15,7 @@
 #include "system/angband.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "system/system-variables.h" // 暫定、init_flags のため。後で消すかも.
 #include "core/stuff-handler.h"

diff --git a/src/market/play-gamble.c b/src/market/play-gamble.c
index 3f8315e..97b860e 100644 (file)
--- a/src/market/play-gamble.c
+++ b/src/market/play-gamble.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "play-gamble.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "player/avatar.h"
 #include "core/show-file.h"
 #include "market/building-util.h"

diff --git a/src/market/poker.c b/src/market/poker.c
index d9ece22..33af678 100644 (file)
--- a/src/market/poker.c
+++ b/src/market/poker.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "poker.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * ポーカーの現在の手札ID

diff --git a/src/market/store.c b/src/market/store.c
index 6374991..8081787 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -21,7 +21,7 @@
 #include "util.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "floor/floor.h"
 #include "io/write-diary.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 5e3645c..1d408f3 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 4effbf2..c65586d 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -28,7 +28,7 @@
 #include "inventory/player-inventory.h"
 #include "monster/monster.h"
 #include "io/files.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "cmd-smith.h"
 #include "snipe.h"
 #include "view/display-main-window.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index db15e00..6235721 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "object/object.h"
 

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index ab21220..af8d430 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -3,7 +3,7 @@
 #include "util.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "player/avatar.h"
 #include "market/building.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 48a590f..475b6cb 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -13,7 +13,7 @@
  */
 
 #include "system/angband.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 

diff --git a/src/player/process-death.c b/src/player/process-death.c
index a07d90e..cfec169 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -13,7 +13,7 @@
 #include "object/object-flavor.h"
 #include "market/store-util.h"
 #include "market/store.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "core/stuff-handler.h"
 
 #define GRAVE_LINE_WIDTH 31

diff --git a/src/player/process-name.c b/src/player/process-name.c
index 6244637..2f657a8 100644 (file)
--- a/src/player/process-name.c
+++ b/src/player/process-name.c
@@ -3,7 +3,7 @@
 #include "player/player-personality.h"
 #include "io/files.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief プレイヤーの名前をチェックして修正する

diff --git a/src/report.c b/src/report.c
index b3ce076..0e723d8 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -15,7 +15,7 @@
 #include "player/player-personality.h"
 #include "io/character-dump.h"
 #include "world/world.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #ifdef WORLD_SCORE
 

diff --git a/src/scores.c b/src/scores.c
index 0924a8e..f305d9b 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -12,7 +12,7 @@
 
 #include "system/angband.h"
 #include "io/signal-handlers.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "util.h"
 #include "core/turn-compensator.h"
 #include "core/angband-version.h"

diff --git a/src/snipe.c b/src/snipe.c
index 6a84a83..5c0f082 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -10,7 +10,7 @@
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "player/player-status.h"
 #include "cmd-basic.h"

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index b4d2f42..b825f21 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -7,7 +7,7 @@
 #include "effect/effect-item.h"
 #include "effect/effect-monster.h"
 #include "effect/effect-player.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "main/sound-definitions-table.h"
 #include "spell/spells-type.h"
 #include "view/display-main-window.h" // 暫定、後で消すかも.

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index d9ff8ae..a1f3bb8 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -20,7 +20,7 @@
 #include "player/player-class.h"
 #include "monster/monster.h"
 #include "spell/spells1.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "view/display-main-window.h"
 #include "effect/spells-effect-util.h"
 #include "effect/effect-feature.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 5e438a3..03970de 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -14,7 +14,7 @@
 #include "system/angband.h"
 #include "market/building.h"
 #include "core/stuff-handler.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "object/object-ego.h"

diff --git a/src/system/angband.h b/src/system/angband.h
index d8e8df2..f899d8d 100644 (file)
--- a/src/system/angband.h
+++ b/src/system/angband.h
@@ -26,11 +26,11 @@
 /*
  * Then, include the header files for the low-level code
  */
-#include "z-util.h"
-#include "z-virt.h"
-#include "z-form.h"
-#include "z-rand.h"
-#include "z-term.h"
+#include "term/z-util.h"
+#include "term/z-virt.h"
+#include "term/z-form.h"
+#include "term/z-rand.h"
+#include "term/z-term.h"
 
 
 /*

diff --git a/src/targeting.c b/src/targeting.c
index 5b37556..868138c 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -14,7 +14,7 @@
 #include "util.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "targeting.h"
 
 #include "market/building.h"

diff --git a/src/gameterm.c b/src/term/gameterm.c
similarity index 99%
rename from src/gameterm.c
rename to src/term/gameterm.c
index a1b4378..aad892f 100644 (file)
--- a/src/gameterm.c
+++ b/src/term/gameterm.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util.h"
 
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "system/system-variables.h"
 
 

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

diff --git a/src/z-form.c b/src/term/z-form.c
similarity index 99%
rename from src/z-form.c
rename to src/term/z-form.c
index 8a624cf..880363a 100644 (file)
--- a/src/z-form.c
+++ b/src/term/z-form.c
@@ -10,9 +10,9 @@
 
 /* Purpose: Low level text formatting -BEN- */
 
-#include "z-form.h"
-#include "z-util.h"
-#include "z-virt.h"
+#include "term/z-form.h"
+#include "term/z-util.h"
+#include "term/z-virt.h"
 
 
 /*

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

diff --git a/src/z-rand.c b/src/term/z-rand.c
similarity index 99%
rename from src/z-rand.c
rename to src/term/z-rand.c
index fc75a6b..c27ebb3 100644 (file)
--- a/src/z-rand.c
+++ b/src/term/z-rand.c
@@ -15,7 +15,7 @@
 #include <Windows.h>
 #endif
 
-#include "z-rand.h"
+#include "term/z-rand.h"
 
 
 

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

diff --git a/src/z-term.c b/src/term/z-term.c
similarity index 99%
rename from src/z-term.c
rename to src/term/z-term.c
index 884a336..73dd19a 100644 (file)
--- a/src/z-term.c
+++ b/src/term/z-term.c
@@ -11,10 +11,10 @@
  /* Purpose: a generic, efficient, terminal window package -BEN- */
 #include "system/angband.h"
 
-#include "gameterm.h"
-#include "z-term.h"
+#include "term/gameterm.h"
+#include "term/z-term.h"
 
-#include "z-virt.h"
+#include "term/z-virt.h"
 
 /* Special flags in the attr data */
 #define AF_BIGTILE2 0xf0

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

diff --git a/src/z-util.c b/src/term/z-util.c
similarity index 99%
rename from src/z-util.c
rename to src/term/z-util.c
index fd76c74..d1c424d 100644 (file)
--- a/src/z-util.c
+++ b/src/term/z-util.c
@@ -10,7 +10,7 @@
 
 /* Purpose: Low level utilities -BEN- */
 
-#include "z-util.h"
+#include "term/z-util.h"
 
 
 /*

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

diff --git a/src/z-virt.c b/src/term/z-virt.c
similarity index 98%
rename from src/z-virt.c
rename to src/term/z-virt.c
index 4c7ca18..8e9c6e9 100644 (file)
--- a/src/z-virt.c
+++ b/src/term/z-virt.c
@@ -10,8 +10,8 @@
 
 /* Purpose: Memory management routines -BEN- */
 
-#include "z-virt.h"
-#include "z-util.h"
+#include "term/z-virt.h"
+#include "term/z-util.h"
 
 /*
  * Optional auxiliary "rnfree" function

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

diff --git a/src/util.c b/src/util.c
index 5a613d3..cac2ff8 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -15,7 +15,7 @@
 #include "io/signal-handlers.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "util.h"
 #include "io/files.h"
 #include "monster/monsterrace-hook.h"

diff --git a/src/view/display-characteristic.c b/src/view/display-characteristic.c
index 8b50144..070ad38 100644 (file)
--- a/src/view/display-characteristic.c
+++ b/src/view/display-characteristic.c
@@ -5,7 +5,7 @@
  */
 
 #include "display-characteristic.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "player/permanent-resistances.h"
 #include "player/temporary-resistances.h"
 #include "player/race-resistances.h"

diff --git a/src/view/display-fruit.c b/src/view/display-fruit.c
index 34ac161..ee1c8b7 100644 (file)
--- a/src/view/display-fruit.c
+++ b/src/view/display-fruit.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "display-fruit.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief カジノのスロットシンボルを表示する / display fruit for dice slots

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 3bf8437..d14a1db 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -15,7 +15,7 @@
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "market/building.h"
 #include "system/system-variables.h"

diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c
index 05186b5..fdbb72e 100644 (file)
--- a/src/view/display-player-middle.c
+++ b/src/view/display-player-middle.c
@@ -8,7 +8,7 @@
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "shoot.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief プレイヤーの打撃能力修正を表示する

diff --git a/src/view/display-player-misc-info.c b/src/view/display-player-misc-info.c
index d4ecffa..6e73647 100644 (file)
--- a/src/view/display-player-misc-info.c
+++ b/src/view/display-player-misc-info.c
@@ -3,7 +3,7 @@
 #include "player/mimic-info-table.h"
 #include "player/player-personality.h"
 #include "player/player-sex.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 /*!
  * @brief プレイヤーの特性フラグ一覧表示2a /

diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c
index 8167681..3863749 100644 (file)
--- a/src/view/display-player-stat-info.c
+++ b/src/view/display-player-stat-info.c
@@ -9,7 +9,7 @@
 #include "system/angband.h"
 #include "display-player-stat-info.h"
 #include "player/mimic-info-table.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "player/player-personality.h"
 #include "player/permanent-resistances.h"
 

diff --git a/src/view/display-player.c b/src/view/display-player.c
index fd5f69a..83d2da7 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -9,7 +9,7 @@
 #include "display-player.h"
 #include "player/mimic-info-table.h"
 #include "player/player-personality.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "status-first-page.h"
 #include "player/player-sex.h"
 #include "patron.h"

diff --git a/src/view/display-util.c b/src/view/display-util.c
index 3fad986..b3aac19 100644 (file)
--- a/src/view/display-util.c
+++ b/src/view/display-util.c
@@ -1,5 +1,5 @@
 #include "display-util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 static struct
 {

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index 64dc569..a8a36a8 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -6,7 +6,7 @@
  */
 
 #include "system/angband.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 #include "status-first-page.h"
 #include "display-util.h"
 #include "object/artifact.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 8d2604e..69debda 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -15,7 +15,7 @@
 #include "wizard/wizard-spoiler.h"
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "dungeon/dungeon.h"
 #include "io/write-diary.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index ae16c61..531c91f 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -13,7 +13,7 @@
 #include "system/angband.h"
 #include "wizard/wizard-spoiler.h"
 #include "util.h"
-#include "gameterm.h"
+#include "term/gameterm.h"
 
 #include "core/angband-version.h"
 #include "object/artifact.h"