From a6103d8a5b6a02001c28e01d60629302bef83306 Mon Sep 17 00:00:00 2001 From: Hourier Date: Thu, 27 Feb 2020 22:12:05 +0900 Subject: [PATCH 1/1] =?utf8?q?[Refactor]=20#39962=20display=5Fplayer=5Fsta?= =?utf8?q?t=5Finfo()=20=E3=81=8B=E3=82=89display=5Fmutation=5Fcompensation?= =?utf8?q?()=20=E3=82=92=E5=88=86=E9=9B=A2=20/=20Separated=20display=5Fmut?= =?utf8?q?ation=5Fcompensation()=20from=20display=5Fplayer=5Fstat=5Finfo()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/view/display-player.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/view/display-player.c b/src/view/display-player.c index c6789f4ad..0ace74c27 100644 --- a/src/view/display-player.c +++ b/src/view/display-player.c @@ -381,6 +381,33 @@ static void change_display_by_mutation(player_type *creature_ptr, int stat, char /*! + * @brief 能力値を走査し、突然変異 (と、つよしスペシャル)で補正をかける必要があればかける + * @param creature_ptr プレーヤーへの参照ポインタ + * @param stat 能力値番号 + * @param col 列数 + * @param row 行数 + * @return なし + */ +static void display_mutation_compensation(player_type *creature_ptr, BIT_FLAGS *flags, int row, int col) +{ + for (int stat = 0; stat < A_MAX; stat++) + { + byte a = TERM_SLATE; + char c = '.'; + change_display_by_mutation(creature_ptr, stat, &c, &a); + + if (have_flag(flags, stat + TR_SUST_STR)) + { + a = TERM_GREEN; + c = 's'; + } + + Term_putch(col, row + stat + 1, a, c); + } +} + + +/*! * @brief プレイヤーの特性フラグ一覧表示2b / * Special display, part 2b * @param creature_ptr プレーヤーへの参照ポインタ @@ -414,20 +441,7 @@ static void display_player_stat_info(player_type *creature_ptr) BIT_FLAGS flags[TR_FLAG_SIZE]; display_equipments_compensation(creature_ptr,flags, row, &col); player_flags(creature_ptr, flags); - for (int stat = 0; stat < A_MAX; stat++) - { - byte a = TERM_SLATE; - char c = '.'; - compensate_stat(creature_ptr, stat, &c, &a); - - if (have_flag(flags, stat + TR_SUST_STR)) - { - a = TERM_GREEN; - c = 's'; - } - - Term_putch(col, row + stat + 1, a, c); - } + display_mutation_compensation(creature_ptr, flags, row, col); } -- 2.11.0