From 2bf5a8402ca002d50a7b7c91bb180d109e358b2a Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 15 May 2020 22:33:19 +0900 Subject: [PATCH] [Refactor] #38862 gameterm.c/h and z-* to term/ --- Hengband/Hengband/Hengband.vcxproj | 24 +++++------ Hengband/Hengband/Hengband.vcxproj.filters | 67 +++++++++++++++++------------- src/Makefile.am | 11 +++-- src/autopick/autopick-command-menu.c | 2 +- src/autopick/autopick-drawer.c | 2 +- src/autopick/autopick-editor-command.c | 2 +- src/autopick/autopick-finder.c | 2 +- src/birth/birth.c | 2 +- src/chuukei.c | 2 +- src/cmd/cmd-basic.c | 2 +- src/cmd/cmd-draw.c | 2 +- src/cmd/cmd-dump.c | 2 +- src/cmd/cmd-gameoption.c | 2 +- src/cmd/cmd-item.c | 2 +- src/cmd/cmd-macro.c | 2 +- src/cmd/cmd-magiceat.c | 2 +- src/cmd/cmd-process-screen.c | 2 +- src/cmd/cmd-save.c | 2 +- src/cmd/cmd-smith.c | 2 +- src/cmd/cmd-visuals.c | 2 +- src/cmd/dump-util.c | 2 +- src/combat/shoot.c | 2 +- src/core/game-play.c | 2 +- src/core/show-file.c | 2 +- src/dungeon/dungeon-file.c | 2 +- src/grid/grid.c | 2 +- src/init.c | 2 +- src/inventory/player-inventory.c | 2 +- src/io/interpret-pref-file.c | 2 +- src/io/signal-handlers.c | 2 +- src/knowledge/knowledge-features.c | 2 +- src/knowledge/knowledge-items.c | 2 +- src/knowledge/knowledge-monsters.c | 2 +- src/main-win.c | 4 +- src/market/building.c | 2 +- src/market/play-gamble.c | 2 +- src/market/poker.c | 2 +- src/market/store.c | 2 +- src/monster/monster1.c | 2 +- src/object/object1.c | 2 +- src/object/object2.c | 2 +- src/player/player-damage.c | 2 +- src/player/player-effects.c | 2 +- src/player/process-death.c | 2 +- src/player/process-name.c | 2 +- src/report.c | 2 +- src/scores.c | 2 +- src/snipe.c | 2 +- src/spell/process-effect.c | 2 +- src/spell/spells1.c | 2 +- src/spell/spells3.c | 2 +- src/system/angband.h | 10 ++--- src/targeting.c | 2 +- src/{ => term}/gameterm.c | 2 +- src/{ => term}/gameterm.h | 0 src/{ => term}/z-form.c | 6 +-- src/{ => term}/z-form.h | 0 src/{ => term}/z-rand.c | 2 +- src/{ => term}/z-rand.h | 0 src/{ => term}/z-term.c | 6 +-- src/{ => term}/z-term.h | 0 src/{ => term}/z-util.c | 2 +- src/{ => term}/z-util.h | 0 src/{ => term}/z-virt.c | 4 +- src/{ => term}/z-virt.h | 0 src/util.c | 2 +- src/view/display-characteristic.c | 2 +- src/view/display-fruit.c | 2 +- src/view/display-main-window.c | 2 +- src/view/display-player-middle.c | 2 +- src/view/display-player-misc-info.c | 2 +- src/view/display-player-stat-info.c | 2 +- src/view/display-player.c | 2 +- src/view/display-util.c | 2 +- src/view/status-first-page.c | 2 +- src/wizard/wizard-special-process.c | 2 +- src/wizard/wizard-spoiler.c | 2 +- 77 files changed, 136 insertions(+), 122 deletions(-) rename src/{ => term}/gameterm.c (99%) rename src/{ => term}/gameterm.h (100%) rename src/{ => term}/z-form.c (99%) rename src/{ => term}/z-form.h (100%) rename src/{ => term}/z-rand.c (99%) rename src/{ => term}/z-rand.h (100%) rename src/{ => term}/z-term.c (99%) rename src/{ => term}/z-term.h (100%) rename src/{ => term}/z-util.c (99%) rename src/{ => term}/z-util.h (100%) rename src/{ => term}/z-virt.c (98%) rename src/{ => term}/z-virt.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index f619c57d8..86f8b00a3 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -507,7 +507,7 @@ - + @@ -518,11 +518,11 @@ - - - - - + + + + + @@ -716,18 +716,18 @@ - + - - - - - + + + + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 20315ce8e..e081174a1 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -3,8 +3,6 @@ - - player @@ -25,9 +23,6 @@ player - - io - market @@ -43,15 +38,6 @@ core - - core - - - core - - - core - io @@ -829,13 +815,29 @@ io + + term + + + term + + + term + + + term + + + term + + + term + - - player @@ -855,9 +857,6 @@ player - - io - market @@ -873,15 +872,6 @@ core - - core - - - core - - - core - cmd @@ -1701,6 +1691,24 @@ io + + term + + + term + + + term + + + term + + + term + + + term + @@ -1788,6 +1796,9 @@ {93b0c1d1-0841-44fe-8503-d6729d290350} + + {ad847f1c-b291-4640-93d2-21895fbee308} + diff --git a/src/Makefile.am b/src/Makefile.am index 468a10a89..dd6014f5f 100644 --- 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 40c426afb..1ef2ed395 100644 --- 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 1e6821878..ad556ee7b 100644 --- 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 2cd32ee22..fcbee1278 100644 --- 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 48082413e..1a0f7ccff 100644 --- 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 df6c68aa2..dbb1613bd 100644 --- 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 473c78ea8..e005c1c0b 100644 --- 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 43ef719d0..f3059aa1a 100644 --- 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 31036d189..bd48f3ed4 100644 --- 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 c8af60238..2b163afc4 100644 --- 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 f5d67ed8b..0922638c5 100644 --- 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 cde87df14..06ae1fb38 100644 --- 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 5f2c72c64..ccb25db2b 100644 --- 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 3188b9275..2b39bb8d2 100644 --- 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 88949181c..47e8c56af 100644 --- 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 0081e91cc..68c897389 100644 --- 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 feed85394..71d212a44 100644 --- 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 ddb9509c8..bbbb431d2 100644 --- 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 0ca1e7b98..2e945524f 100644 --- 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 ff5df1bf1..b06ab0d2d 100644 --- 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 4890df7f5..818c9ec64 100644 --- 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 8c6cc0b58..043bf177c 100644 --- 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 2c32ba423..19e6720ac 100644 --- 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 c1e9e030c..f4376d96e 100644 --- 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 569a48c7b..98976fd11 100644 --- 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 83d0694e3..693bb7ceb 100644 --- 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 a30e85e61..4b518d668 100644 --- 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 fb014e36b..4d6bbe1cb 100644 --- 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 07d7c3604..c1b361c59 100644 --- 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 6f14faea7..b9bd7cc86 100644 --- 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 0eeaaa376..6bc489a7d 100644 --- 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 7de77b549..526883295 100644 --- 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 #include #include -#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 fc416fcf1..5a2e49282 100644 --- 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 3f8315e84..97b860ec9 100644 --- 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 d9ece225e..33af678ef 100644 --- 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 6374991a8..80817877b 100644 --- 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 5e3645c02..1d408f39e 100644 --- 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 4effbf2f2..c65586d74 100644 --- 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 db15e006d..62357211d 100644 --- 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 ab2122032..af8d430e8 100644 --- 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 48a590f6c..475b6cb64 100644 --- 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 a07d90eb1..cfec16963 100644 --- 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 624463706..2f657a8e0 100644 --- 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 b3ce0760a..0e723d84e 100644 --- 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 0924a8efe..f305d9bf1 100644 --- 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 6a84a83b7..5c0f08228 100644 --- 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 b4d2f42c2..b825f2177 100644 --- 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 d9ff8ae80..a1f3bb864 100644 --- 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 5e438a3b7..03970de98 100644 --- 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 d8e8df224..f899d8d5e 100644 --- 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 5b37556e0..868138c22 100644 --- 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 a1b4378a1..aad892ff4 100644 --- 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 8a624cfb2..880363a93 100644 --- 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 fc75a6b3e..c27ebb3ca 100644 --- a/src/z-rand.c +++ b/src/term/z-rand.c @@ -15,7 +15,7 @@ #include #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 884a33627..73dd19ae9 100644 --- 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 fd76c7474..d1c424dae 100644 --- 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 4c7ca1863..8e9c6e97d 100644 --- 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 5a613d330..cac2ff8da 100644 --- 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 8b50144e4..070ad38ce 100644 --- 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 34ac161b5..ee1c8b731 100644 --- 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 3bf843768..d14a1db60 100644 --- 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 05186b57d..fdbb72eca 100644 --- 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 d4ecffa33..6e73647ec 100644 --- 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 8167681b4..3863749b5 100644 --- 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 fd5f69a8d..83d2da7e4 100644 --- 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 3fad986cd..b3aac1957 100644 --- 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 64dc5691e..a8a36a862 100644 --- 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 8d2604e1a..69debda5c 100644 --- 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 ae16c6104..531c91f9f 100644 --- 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" -- 2.11.0