[refactor] term.[ch]をgameterm.[ch]に改名

term.hという名称は、NCURSESのヘッダファイルである/usr/include/term.hと同名である。
システムのヘッダファイルと同名なのは好ましくないので、名称をgametermに変更する。

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 7b4a4cb..d5301b5 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -333,7 +333,7 @@
     <ClCompile Include="..\..\src\store.c" />\r
     <ClCompile Include="..\..\src\floor-streams.c" />\r
     <ClCompile Include="..\..\src\targeting.c" />\r
-    <ClCompile Include="..\..\src\term.c" />\r
+    <ClCompile Include="..\..\src\gameterm.c" />\r
     <ClCompile Include="..\..\src\trap.c" />\r
     <ClCompile Include="..\..\src\util.c" />\r
     <ClCompile Include="..\..\src\view-mainwindow.c" />\r
@@ -517,7 +517,7 @@
     <ClInclude Include="..\..\src\spells.h" />\r
     <ClInclude Include="..\..\src\store.h" />\r
     <ClInclude Include="..\..\src\targeting.h" />\r
-    <ClInclude Include="..\..\src\term.h" />\r
+    <ClInclude Include="..\..\src\gameterm.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
     <ClInclude Include="..\..\src\util.h" />\r
     <ClInclude Include="..\..\src\view-mainwindow.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index f2c60fc..2cd475b 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -268,7 +268,7 @@
     <ClCompile Include="..\..\src\view-mainwindow.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\term.c">
+    <ClCompile Include="..\..\src\gameterm.c">
       <Filter>io</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\wild.c">
@@ -812,7 +812,7 @@
     <ClInclude Include="..\..\src\view-mainwindow.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\term.h">
+    <ClInclude Include="..\..\src\gameterm.h">
       <Filter>io</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\wild.h">

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ac6412..f194895 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,7 +129,7 @@ hengband_SOURCES = \
        spells-summon.c spells-summon.h \
        spells-world.c spells-world.h \
        \
-       sort.c sort.h term.c term.h trap.c trap.h util.c util.h \
+       sort.c sort.h gameterm.c gameterm.h trap.c trap.h util.c util.h \
        wild.h wild.c wizard1.c wizard2.c \
        warning.c warning.h world.c world.h \
        \

diff --git a/src/autopick.c b/src/autopick.c
index 3cd2370..fd0b46a 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -13,7 +13,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 #include "autopick.h"
 #include "core.h"
 #include "core/show-file.h"

diff --git a/src/birth.c b/src/birth.c
index cb73ffb..e0201c6 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -17,7 +17,7 @@
 #include "core.h"
 #include "core/show-file.h"
 #include "io/read-pref-file.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "object-ego.h"
 #include "artifact.h"

diff --git a/src/bldg.c b/src/bldg.c
index 26a600f..6fa3432 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -14,7 +14,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "core.h"
 #include "core/show-file.h"

diff --git a/src/chuukei.c b/src/chuukei.c
index 87ebbfe..5ce9891 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -11,12 +11,11 @@
 #include "signal-handlers.h"
 #include "files.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-draw.h"
 #include "inet.h"
 #include "japanese.h"
-#include "term.h"
 #include "chuukei.h"
 
 #include <stdio.h>

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8573cad..9ee1495 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "core.h"
-#include "term.h"
+#include "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 92904e1..2e4d9cf 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -2,7 +2,7 @@
 #include "core.h" // 暫定。後で消す.
 #include "cmd/cmd-draw.h"
 #include "files.h"
-#include "term.h"
+#include "gameterm.h"
 #include "view-mainwindow.h" // 暫定。後で消す.
 #include "player-effects.h"
 #include "view/display-player.h" // 暫定。後で消す.

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 5af1727..f5567b8 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -35,7 +35,7 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/lighting-level-table.h"
 #include "cmd/cmd-visuals.h"
-#include "term.h"
+#include "gameterm.h"
 #include "core.h" // 暫定。後で消す.
 #include "core/show-file.h"
 #include "io/read-pref-file.h"

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index 4955b8c..6a3faa9 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -3,7 +3,7 @@
 #include "autopick.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-gameoption.h"
-#include "term.h"
+#include "gameterm.h"
 #include "view-mainwindow.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 301f0e8..74217fc 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -15,7 +15,7 @@
 #include "core.h"
 #include "util.h"
 #include "autopick.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "selfinfo.h"
 #include "cmd-activate.h"

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

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index 1e09ae4..3dbb56b 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -54,7 +54,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "cmd-basic.h"
 #include "cmd-usestaff.h"

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

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

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index 8929e3c..73d1851 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -5,7 +5,7 @@
 #include "files.h"
 #include "objectkind.h"
 #include "object-flavor.h"
-#include "term.h"
+#include "gameterm.h"
 #include "cmd/lighting-level-table.h"
 #include "io/read-pref-file.h"
 #include "view-mainwindow.h" // 暫定。後で消す.

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 9e63238..7913fe0 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "core.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "monster.h"
 #include "monster-status.h"

diff --git a/src/core.c b/src/core.c
index 4f03e89..cdfb294 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "core.h"
 #include "inet.h"
-#include "term.h"
+#include "gameterm.h"
 #include "chuukei.h"
 
 #include "creature.h"

diff --git a/src/core/show-file.c b/src/core/show-file.c
index f76f185..0c23f19 100644 (file)
--- a/src/core/show-file.c
+++ b/src/core/show-file.c
@@ -1,7 +1,7 @@
 #include "core/show-file.h"
 #include "files.h"
 #include "core.h" // 暫定。後で消す.
-#include "term.h"
+#include "gameterm.h"
 
 /*!
  * @param 表示とそれ以外を分割する

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index bede376..d18a502 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -60,7 +60,7 @@
 #include "trap.h"
 #include "artifact.h"
 #include "cmd-activate.h"
-#include "term.h"
+#include "gameterm.h"
 #include "wild.h"
 #include "view-mainwindow.h"
 #include "player-class.h"

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

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

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

diff --git a/src/init.c b/src/init.c
index 0e27a8d..f506b57 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -36,7 +36,7 @@
 #include "files.h"
 #include "core.h"
 #include "io/read-pref-file.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "artifact.h"
 #include "bldg.h"

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

diff --git a/src/main-gcu.c b/src/main-gcu.c
index 8d2b036..788d98b 100644 (file)
--- a/src/main-gcu.c
+++ b/src/main-gcu.c
@@ -159,7 +159,7 @@
 #include "angband.h"
 #include "io/exit-panic.h"
 #include "files.h"
-#include "term.h"
+#include "gameterm.h"
 
 #ifdef USE_GCU
 

diff --git a/src/main-win.c b/src/main-win.c
index 442b97f..28fcfbc 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -108,7 +108,7 @@
 #include "files.h"
 #include "core.h"
 #include "world.h"
-#include "term.h"
+#include "gameterm.h"
 
 #ifdef WINDOWS
 #include <windows.h>

diff --git a/src/main-x11.c b/src/main-x11.c
index 66526b7..4b2f386 100644 (file)
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -96,7 +96,7 @@
 #include "angband.h"
 #include "core.h"
 #include "files.h"
-#include "term.h"
+#include "gameterm.h"
 
 
 /*

diff --git a/src/main.c b/src/main.c
index 6997578..dbf86be 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -16,7 +16,7 @@
 #include "inet.h"
 #include "init.h"
 #include "scores.h"
-#include "term.h"
+#include "gameterm.h"
 #include "chuukei.h"
 
 /*

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

diff --git a/src/monster1.c b/src/monster1.c
index 23dee9a..4f2c0c2 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/object1.c b/src/object1.c
index c82f2e9..6e6469c 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -28,7 +28,7 @@
 #include "player-inventory.h"
 #include "monster.h"
 #include "files.h"
-#include "term.h"
+#include "gameterm.h"
 #include "cmd-smith.h"
 #include "snipe.h"
 #include "view-mainwindow.h"

diff --git a/src/object2.c b/src/object2.c
index b69f4a4..b8e9690 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @file object2.c
  * @brief オブジェクトの実装 / Object code, part 2
  * @date 2014/01/11
@@ -14,7 +14,7 @@
 #include "angband.h"
 #include "util.h"
 #include "world.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "object.h"
 

diff --git a/src/player-damage.c b/src/player-damage.c
index 7ab7794..42b4859 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "core.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "avatar.h"
 #include "bldg.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 97acc4a..fdd8346 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -13,7 +13,7 @@
  */
 
 #include "angband.h"
-#include "term.h"
+#include "gameterm.h"
 #include "core.h"
 #include "util.h"
 

diff --git a/src/player-inventory.c b/src/player-inventory.c
index 20e32a5..a832c93 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -3,7 +3,7 @@
 #include "util.h"
 #include "player-inventory.h"
 
-#include "term.h"
+#include "gameterm.h"
 #include "object.h"
 #include "objectkind.h"
 #include "object-flavor.h"

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

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

diff --git a/src/report.c b/src/report.c
index 3c6d70d..758e0ea 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -13,7 +13,7 @@
 #include "player-personality.h"
 #include "character-dump.h"
 #include "world.h"
-#include "term.h"
+#include "gameterm.h"
 
 #ifdef WORLD_SCORE
 

diff --git a/src/scores.c b/src/scores.c
index 667e8b2..4f0c7c7 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "signal-handlers.h"
-#include "term.h"
+#include "gameterm.h"
 #include "util.h"
 #include "core.h"
 

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

diff --git a/src/snipe.c b/src/snipe.c
index 148419e..ca168ff 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -9,7 +9,7 @@
 #include "angband.h"
 #include "core.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "player-status.h"
 #include "cmd-basic.h"

diff --git a/src/spells1.c b/src/spells1.c
index 04c30de..6b7f3ee 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -48,7 +48,7 @@
 #include "object-broken.h"
 #include "object-flavor.h"
 #include "quest.h"
-#include "term.h"
+#include "gameterm.h"
 #include "grid.h"
 #include "feature.h"
 #include "view-mainwindow.h"

diff --git a/src/spells3.c b/src/spells3.c
index 9c42fa0..51618b3 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -14,7 +14,7 @@
 #include "angband.h"
 #include "bldg.h"
 #include "core.h"
-#include "term.h"
+#include "gameterm.h"
 #include "util.h"
 #include "object-ego.h"
 

diff --git a/src/store.c b/src/store.c
index 952b002..8779f82 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -19,7 +19,7 @@
 #include "market/black-market.h"
 #include "core.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "floor.h"
 #include "io/write-diary.h"

diff --git a/src/targeting.c b/src/targeting.c
index c46d530..4f99834 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -13,7 +13,7 @@
 #include "angband.h"
 #include "util.h"
 #include "core.h"
-#include "term.h"
+#include "gameterm.h"
 #include "targeting.h"
 
 #include "bldg.h"

diff --git a/src/util.c b/src/util.c
index b9d7833..8111697 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -13,7 +13,7 @@
 #include "angband.h"
 #include "signal-handlers.h"
 #include "core.h"
-#include "term.h"
+#include "gameterm.h"
 #include "util.h"
 #include "files.h"
 #include "monsterrace-hook.h"

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 4073112..8e37103 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -13,7 +13,7 @@
 #include "angband.h"
 #include "util.h"
 #include "autopick.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "bldg.h"
 #include "core.h"

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

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

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

diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c
index 03fec6a..55b4b96 100644 (file)
--- a/src/view/display-player-stat-info.c
+++ b/src/view/display-player-stat-info.c
@@ -7,7 +7,7 @@
  */
 
 #include "display-player-stat-info.h"
-#include "term.h"
+#include "gameterm.h"
 #include "player-personality.h"
 #include "player/permanent-resistances.h"
 

diff --git a/src/view/display-player.c b/src/view/display-player.c
index 1fbce4e..73b0a48 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -8,7 +8,7 @@
 
 #include "display-player.h"
 #include "player-personality.h"
-#include "term.h"
+#include "gameterm.h"
 #include "status-first-page.h"
 #include "player-sex.h"
 #include "patron.h"

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

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index 8f73771..370096e 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -6,7 +6,7 @@
  */
 
 #include "angband.h"
-#include "term.h"
+#include "gameterm.h"
 #include "status-first-page.h"
 #include "display-util.h"
 #include "artifact.h"

diff --git a/src/wizard1.c b/src/wizard1.c
index c09acdf..8c3bff4 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "core.h"
 #include "artifact.h"

diff --git a/src/wizard2.c b/src/wizard2.c
index 85a814c..938844e 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "core.h"
-#include "term.h"
+#include "gameterm.h"
 
 #include "dungeon.h"
 #include "io/write-diary.h"

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