From ffad83121b1f3b9e3554d0852ea0dc6cc91e7e09 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 27 Jun 2020 15:54:02 +0900 Subject: [PATCH] [Refactor] #40483 Renamed display-main-window.c/h to screen-util.c/h --- Hengband/Hengband/Hengband.vcxproj | 4 ++-- Hengband/Hengband/Hengband.vcxproj.filters | 12 ++++++------ src/Makefile.am | 2 +- src/cmd-item/cmd-item.c | 4 ++-- src/cmd/cmd-basic.c | 2 +- src/combat/shoot.c | 2 +- src/core/game-play.c | 2 +- src/grid/grid.c | 2 +- src/io/cursor.c | 9 +++------ src/{view/display-main-window.c => io/screen-util.c} | 4 ++-- src/{view/display-main-window.h => io/screen-util.h} | 0 src/io/targeting.c | 2 +- src/mind/mind-mirror-master.c | 2 +- src/spell/process-effect.c | 2 +- 14 files changed, 23 insertions(+), 26 deletions(-) rename src/{view/display-main-window.c => io/screen-util.c} (96%) rename src/{view/display-main-window.h => io/screen-util.h} (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 0001719aa..0ba7610e1 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -965,7 +965,7 @@ - + @@ -1198,7 +1198,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index e12b54708..58ef5dae2 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -164,9 +164,6 @@ io - - view - autopick @@ -1436,6 +1433,9 @@ io + + io + @@ -1624,9 +1624,6 @@ io - - view - autopick @@ -3160,6 +3157,9 @@ io + + io + diff --git a/src/Makefile.am b/src/Makefile.am index 3be1bddd6..0a2bdd8fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -226,6 +226,7 @@ hengband_SOURCES = \ io/read-pref-file.c io/read-pref-file.h \ io/report.c io/report.h \ io/save.c io/save.h \ + io/screen-util.c io/screen-util.h \ io/signal-handlers.c io/signal-handlers.h \ io/targeting.c io/targeting.h \ io/tokenizer.c io/tokenizer.h \ @@ -587,7 +588,6 @@ hengband_SOURCES = \ view/display-lore-magics.c view/display-lore-magics.h \ view/display-lore-status.c view/display-lore-status.h \ view/display-lore.c view/display-lore.h \ - view/display-main-window.c view/display-main-window.h \ view/display-map.c view/display-map.h \ view/display-messages.c view/display-messages.h \ view/display-monster-status.c view/display-monster-status.h \ diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c index 118758dd4..6a96e58f1 100644 --- a/src/cmd-item/cmd-item.c +++ b/src/cmd-item/cmd-item.c @@ -34,6 +34,7 @@ #include "io/cursor.h" #include "io/input-key-acceptor.h" #include "io/input-key-requester.h" +#include "io/screen-util.h" #include "io/targeting.h" #include "main/sound-definitions-table.h" #include "main/sound-of-music.h" @@ -46,10 +47,10 @@ #include "object/object-flavor.h" #include "object/object-generator.h" #include "object/object-hook.h" +#include "object/object-info.h" #include "object/object-mark-types.h" #include "object/object-stack.h" #include "object/object-value.h" -#include "object/object-info.h" #include "perception/identification.h" #include "perception/object-perception.h" #include "player/avatar.h" @@ -68,7 +69,6 @@ #include "util/int-char-converter.h" #include "util/quarks.h" #include "view/display-messages.h" -#include "view/display-main-window.h" #include "view/main-window-util.h" /*! diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index 7d1ca073b..b689d8b5a 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -41,6 +41,7 @@ #include "io/cursor.h" #include "io/input-key-acceptor.h" #include "io/input-key-requester.h" +#include "io/screen-util.h" #include "io/targeting.h" #include "io/write-diary.h" #include "main/music-definitions-table.h" @@ -79,7 +80,6 @@ #include "system/system-variables.h" #include "term/screen-processor.h" #include "util/bit-flags-calculator.h" -#include "view/display-main-window.h" #include "view/display-messages.h" #include "view/object-describer.h" #include "world/world.h" diff --git a/src/combat/shoot.c b/src/combat/shoot.c index 38661edd5..66d9ad561 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -11,6 +11,7 @@ #include "grid/grid.h" #include "inventory/inventory-object.h" #include "io/cursor.h" +#include "io/screen-util.h" #include "io/targeting.h" #include "main/sound-definitions-table.h" #include "main/sound-of-music.h" @@ -47,7 +48,6 @@ #include "spell/spell-types.h" #include "sv-definition/sv-bow-types.h" #include "util/bit-flags-calculator.h" -#include "view/display-main-window.h" #include "view/display-messages.h" #include "world/world-object.h" diff --git a/src/core/game-play.c b/src/core/game-play.c index db3bd5532..b3e232c38 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -43,6 +43,7 @@ #include "io/input-key-processor.h" #include "io/read-pref-file.h" #include "io/save.h" +#include "io/screen-util.h" #include "io/signal-handlers.h" #include "io/targeting.h" #include "io/write-diary.h" @@ -73,7 +74,6 @@ #include "term/gameterm.h" #include "term/screen-processor.h" #include "util/angband-files.h" -#include "view/display-main-window.h" #include "view/display-messages.h" #include "view/display-player.h" #include "view/main-window-util.h" diff --git a/src/grid/grid.c b/src/grid/grid.c index 7be262e96..e3306f242 100644 --- a/src/grid/grid.c +++ b/src/grid/grid.c @@ -25,6 +25,7 @@ #include "game-option/special-options.h" #include "grid/feature.h" #include "grid/trap.h" +#include "io/screen-util.h" #include "monster-floor/monster-remover.h" #include "monster-race/monster-race.h" #include "monster/monster-info.h" @@ -41,7 +42,6 @@ #include "spell/spell-types.h" #include "term/term-color-types.h" #include "util/bit-flags-calculator.h" -#include "view/display-main-window.h" #include "view/display-map.h" #include "view/display-messages.h" #include "view/main-window-util.h" diff --git a/src/io/cursor.c b/src/io/cursor.c index 20ef02604..50840f13b 100644 --- a/src/io/cursor.c +++ b/src/io/cursor.c @@ -7,10 +7,10 @@ #include "game-option/special-options.h" #include "grid/feature.h" #include "grid/grid.h" +#include "io/screen-util.h" #include "io/targeting.h" #include "term/term-color-types.h" #include "util/bit-flags-calculator.h" -#include "view/display-main-window.h" // todo 暫定. #include "view/display-map.h" #include "view/main-window-util.h" #include "world/world.h" @@ -33,17 +33,14 @@ void move_cursor_relative(int row, int col) */ void print_path(player_type *player_ptr, POSITION y, POSITION x) { - int path_n; u16b path_g[512]; byte default_color = TERM_SLATE; - if (!display_path) - return; - if (project_length == -1) + if (!display_path || (project_length == -1)) return; floor_type *floor_ptr = player_ptr->current_floor_ptr; - path_n = project_path(player_ptr, path_g, (project_length ? project_length : MAX_RANGE), player_ptr->y, player_ptr->x, y, x, PROJECT_PATH | PROJECT_THRU); + int path_n = project_path(player_ptr, path_g, (project_length ? project_length : MAX_RANGE), player_ptr->y, player_ptr->x, y, x, PROJECT_PATH | PROJECT_THRU); player_ptr->redraw |= (PR_MAP); handle_stuff(player_ptr); for (int i = 0; i < path_n; i++) { diff --git a/src/view/display-main-window.c b/src/io/screen-util.c similarity index 96% rename from src/view/display-main-window.c rename to src/io/screen-util.c index 918a506e9..9b87ce857 100644 --- a/src/view/display-main-window.c +++ b/src/io/screen-util.c @@ -1,5 +1,5 @@ /*! - * @brief プレイヤーのステータス処理 / status + * @brief 画面描画のユーティリティ * @date 2018/09/25 * @author * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke\n @@ -9,7 +9,7 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "view/display-main-window.h" +#include "io/screen-util.h" #include "core/player-processor.h" #include "core/stuff-handler.h" #include "dungeon/dungeon.h" diff --git a/src/view/display-main-window.h b/src/io/screen-util.h similarity index 100% rename from src/view/display-main-window.h rename to src/io/screen-util.h diff --git a/src/io/targeting.c b/src/io/targeting.c index 1f3707676..40c870114 100644 --- a/src/io/targeting.c +++ b/src/io/targeting.c @@ -36,6 +36,7 @@ #include "io/cursor.h" #include "io/input-key-acceptor.h" #include "io/input-key-requester.h" +#include "io/screen-util.h" #include "locale/vowel-checker.h" #include "main/sound-of-music.h" #include "monster-race/monster-race.h" @@ -62,7 +63,6 @@ #include "term/term-color-types.h" #include "util/bit-flags-calculator.h" #include "util/int-char-converter.h" -#include "view/display-main-window.h" #include "view/display-messages.h" #include "view/display-lore.h" #include "view/display-monster-status.h" diff --git a/src/mind/mind-mirror-master.c b/src/mind/mind-mirror-master.c index ce228b83a..900a20dd8 100644 --- a/src/mind/mind-mirror-master.c +++ b/src/mind/mind-mirror-master.c @@ -9,6 +9,7 @@ #include "game-option/special-options.h" #include "grid/feature.h" #include "io/cursor.h" +#include "io/screen-util.h" #include "io/targeting.h" #include "spell-kind/spells-sight.h" #include "spell-kind/spells-teleport.h" @@ -16,7 +17,6 @@ #include "spell/spell-types.h" #include "term/gameterm.h" #include "util/bit-flags-calculator.h" -#include "view/display-main-window.h" #include "view/display-messages.h" #include "world/world.h" diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c index bd925f18f..3ae125fac 100644 --- a/src/spell/process-effect.c +++ b/src/spell/process-effect.c @@ -10,6 +10,7 @@ #include "game-option/special-options.h" #include "grid/feature.h" #include "io/cursor.h" +#include "io/screen-util.h" #include "main/sound-definitions-table.h" #include "main/sound-of-music.h" #include "monster-race/monster-race.h" @@ -23,7 +24,6 @@ #include "spell/range-calc.h" #include "term/gameterm.h" #include "util/bit-flags-calculator.h" -#include "view/display-main-window.h" // 暫定、後で消すかも. #include "view/display-messages.h" /*! -- 2.11.0