[Fix] [Refactor] #1965 display_player() への関数ポインタをなくした (見切れ問題への対応準備)

diff --git a/src/cmd-visual/cmd-draw.cpp b/src/cmd-visual/cmd-draw.cpp
index f7ff5cc..7f065fe 100644 (file)
--- a/src/cmd-visual/cmd-draw.cpp
+++ b/src/cmd-visual/cmd-draw.cpp
@@ -17,7 +17,7 @@
 #include "util/int-char-converter.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
-#include "view/display-player.h" // 暫定。後で消す.
+#include "view/display-player.h"
 #include "world/world.h"
 
 /*!
@@ -99,7 +99,7 @@ void do_cmd_player_status(PlayerType *player_ptr)
             if (get_string(_("ファイル名: ", "File name: "), tmp, 80)) {
                 if (tmp[0] && (tmp[0] != ' ')) {
                     update_playtime();
-                    file_character(player_ptr, tmp, display_player);
+                    file_character(player_ptr, tmp);
                 }
             }
         } else if (c == 'h') {

diff --git a/src/core/game-closer.cpp b/src/core/game-closer.cpp
index 2cca64d..b6a1a9c 100644 (file)
--- a/src/core/game-closer.cpp
+++ b/src/core/game-closer.cpp
@@ -13,6 +13,7 @@
 #include "core/stuff-handler.h"
 #include "floor/floor-save.h"
 #include "game-option/cheat-options.h"
+#include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "io/signal-handlers.h"
 #include "io/uid-checker.h"
@@ -42,7 +43,7 @@ static void clear_floor(PlayerType *player_ptr)
 
 static void send_world_score_on_closing(PlayerType *player_ptr, bool do_send)
 {
-    if (send_world_score(player_ptr, do_send, display_player))
+    if (send_world_score(player_ptr, do_send))
         return;
 
     if (!get_check_strict(
@@ -171,7 +172,7 @@ void close_game(PlayerType *player_ptr)
 
     print_tomb(player_ptr);
     flush();
-    show_death_info(player_ptr, display_player);
+    show_death_info(player_ptr);
     term_clear();
     if (check_score(player_ptr)) {
         send_world_score_on_closing(player_ptr, do_send);

diff --git a/src/core/game-play.cpp b/src/core/game-play.cpp
index 98e582d..3315f4a 100644 (file)
--- a/src/core/game-play.cpp
+++ b/src/core/game-play.cpp
@@ -42,6 +42,7 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "info-reader/fixed-map-parser.h"
+#include "io/files-util.h"
 #include "io/inet.h"
 #include "io/input-key-acceptor.h"
 #include "io/input-key-processor.h"
@@ -127,7 +128,7 @@ static void send_waiting_record(PlayerType *player_ptr)
 
     /* 町名消失バグ対策(#38205)のためここで世界マップ情報を読み出す */
     parse_fixed_map(player_ptr, "w_info.txt", 0, 0, w_ptr->max_wild_y, w_ptr->max_wild_x);
-    bool success = send_world_score(player_ptr, true, display_player);
+    bool success = send_world_score(player_ptr, true);
     if (!success && !get_check_strict(player_ptr, _("スコア登録を諦めますか？", "Do you give up score registration? "), CHECK_NO_HISTORY)) {
         prt(_("引き続き待機します。", "standing by for future registration..."), 0, 0);
         (void)inkey();

diff --git a/src/core/scores.cpp b/src/core/scores.cpp
index e493649..34be7b8 100644 (file)
--- a/src/core/scores.cpp
+++ b/src/core/scores.cpp
@@ -18,6 +18,7 @@
 #include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
 #include "game-option/game-play-options.h"
+#include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "io/report.h"
 #include "io/signal-handlers.h"
@@ -133,7 +134,7 @@ static int highscore_add(high_score *score)
  * @param do_send 実際に転送ア処置を行うか否か
  * @return 転送が成功したらTRUEを返す
  */
-bool send_world_score(PlayerType *current_player_ptr, bool do_send, display_player_pf display_player)
+bool send_world_score(PlayerType *current_player_ptr, bool do_send)
 {
 #ifdef WORLD_SCORE
     if (!send_score || !do_send) {
@@ -150,7 +151,7 @@ bool send_world_score(PlayerType *current_player_ptr, bool do_send, display_play
     prt(_("送信中．．", "Sending..."), 0, 0);
     term_fresh();
     screen_save();
-    auto successful_send = report_score(current_player_ptr, display_player);
+    auto successful_send = report_score(current_player_ptr);
     screen_load();
     if (!successful_send) {
         return false;

diff --git a/src/core/scores.h b/src/core/scores.h
index bde11b4..ab93764 100644 (file)
--- a/src/core/scores.h
+++ b/src/core/scores.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "io/files-util.h"
 #include "system/angband.h"
 
 class PlayerType;
-bool send_world_score(PlayerType *current_player_ptr, bool do_send, display_player_pf display_player);
+bool send_world_score(PlayerType *current_player_ptr, bool do_send);
 errr top_twenty(PlayerType *current_player_ptr);
 errr predict_score(PlayerType *current_player_ptr);
 void race_legends(PlayerType *current_player_ptr);

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index a6007f4..af1a1f6 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -552,13 +552,13 @@ static concptr get_check_sum(void)
  * @param fff ファイルポインタ
  * @return エラーコード
  */
-void make_character_dump(PlayerType *player_ptr, FILE *fff, display_player_pf display_player)
+void make_character_dump(PlayerType *player_ptr, FILE *fff)
 {
     char title[127];
     put_version(title);
     fprintf(fff, _("  [%s キャラクタ情報]\n\n", "  [%s Character Dump]\n\n"), title);
 
-    dump_aux_player_status(player_ptr, fff, display_player);
+    dump_aux_player_status(player_ptr, fff);
     dump_aux_last_message(player_ptr, fff);
     dump_aux_options(fff);
     dump_aux_recall(fff);

diff --git a/src/io-dump/character-dump.h b/src/io-dump/character-dump.h
index 373eb35..efeea8f 100644 (file)
--- a/src/io-dump/character-dump.h
+++ b/src/io-dump/character-dump.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "io/files-util.h"
 
 class PlayerType;
-void make_character_dump(PlayerType *player_ptr, FILE *fff, display_player_pf display_player);
+void make_character_dump(PlayerType *player_ptr, FILE *fff);

diff --git a/src/io-dump/player-status-dump.cpp b/src/io-dump/player-status-dump.cpp
index fffbbe3..bcb6873 100644 (file)
--- a/src/io-dump/player-status-dump.cpp
+++ b/src/io-dump/player-status-dump.cpp
@@ -1,23 +1,22 @@
 #include "io-dump/player-status-dump.h"
+#include "view/display-player.h"
 
 /*!
  * @brief 画面番号を指定してダンプする
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param fff ファイルポインタ
  * @param display_player 画面表示へのコールバック
- * @param screen_num 画面番号
- * @param start_y
- * @param end_y
+ * @param mode 表示モード
+ * @param start_y ダンプの開始行数
+ * @param end_y ダンプの終了行数
  * @param change_color バッファへ詰める文字の変更有無
  */
-static void dump_player_status_with_screen_num(
-       PlayerType *player_ptr, FILE *fff, display_player_pf display_player,
-       int screen_num, TERM_LEN start_y, TERM_LEN end_y, bool change_color)
+static void dump_player_status_with_screen_num(PlayerType *player_ptr, FILE *fff, int mode, TERM_LEN start_y, TERM_LEN end_y, bool change_color)
 {
        TERM_COLOR a;
        char c;
        char buf[1024];
-       display_player(player_ptr, screen_num);
+       display_player(player_ptr, mode);
        for (TERM_LEN y = start_y; y < end_y; y++)
        {
                TERM_LEN x;
@@ -49,17 +48,16 @@ static void dump_player_status_with_screen_num(
  * @brief プレイヤーのステータス表示をファイルにダンプする
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param fff ファイルポインタ
- * @param display_player 画面表示へのコールバック
  */
-void dump_aux_player_status(PlayerType *player_ptr, FILE *fff, display_player_pf display_player)
+void dump_aux_player_status(PlayerType *player_ptr, FILE *fff)
 {
-       dump_player_status_with_screen_num(player_ptr, fff, display_player, 0, 1, 22, false);
-       dump_player_status_with_screen_num(player_ptr, fff, display_player, 1, 10, 19, false);
+       dump_player_status_with_screen_num(player_ptr, fff, 0, 1, 22, false);
+       dump_player_status_with_screen_num(player_ptr, fff, 1, 10, 19, false);
        fprintf(fff, "\n");
-       dump_player_status_with_screen_num(player_ptr, fff, display_player, 2, 2, 22, true);
+       dump_player_status_with_screen_num(player_ptr, fff, 2, 2, 22, true);
        fprintf(fff, "\n");
-       dump_player_status_with_screen_num(player_ptr, fff, display_player, 3, 1, 18, true);
+       dump_player_status_with_screen_num(player_ptr, fff, 3, 1, 18, true);
        fprintf(fff, "\n");
-    dump_player_status_with_screen_num(player_ptr, fff, display_player, 4, 1, 19, true);
+    dump_player_status_with_screen_num(player_ptr, fff, 4, 1, 19, true);
     fprintf(fff, "\n");
 }

diff --git a/src/io-dump/player-status-dump.h b/src/io-dump/player-status-dump.h
index 9cffe65..bfc1909 100644 (file)
--- a/src/io-dump/player-status-dump.h
+++ b/src/io-dump/player-status-dump.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "io/files-util.h"
 
 class PlayerType;
-void dump_aux_player_status(PlayerType *player_ptr, FILE *fff, display_player_pf display_player);
+void dump_aux_player_status(PlayerType *player_ptr, FILE *fff);

diff --git a/src/io/files-util.cpp b/src/io/files-util.cpp
index 025ca16..21dfbff 100644 (file)
--- a/src/io/files-util.cpp
+++ b/src/io/files-util.cpp
@@ -57,7 +57,7 @@ char debug_savefile[1024];
  * Allow the "full" flag to dump additional info,
  * and trigger its usage from various places in the code.
  */
-errr file_character(PlayerType *player_ptr, concptr name, display_player_pf display_player)
+errr file_character(PlayerType *player_ptr, concptr name)
 {
     char buf[1024];
     path_build(buf, sizeof(buf), ANGBAND_DIR_USER, name);
@@ -80,7 +80,7 @@ errr file_character(PlayerType *player_ptr, concptr name, display_player_pf disp
         return -1;
     }
 
-    make_character_dump(player_ptr, fff, display_player);
+    make_character_dump(player_ptr, fff);
     angband_fclose(fff);
     msg_print(_("キャラクタ情報のファイルへの書き出しに成功しました。", "Character dump successful."));
     msg_print(nullptr);

diff --git a/src/io/files-util.h b/src/io/files-util.h
index 0720888..862bfa6 100644 (file)
--- a/src/io/files-util.h
+++ b/src/io/files-util.h
@@ -22,10 +22,9 @@ extern concptr ANGBAND_DIR_USER;
 extern concptr ANGBAND_DIR_XTRA;
 
 class PlayerType;
-typedef void (*display_player_pf)(PlayerType *, int);
 typedef void(*update_playtime_pf)(void);
 
-extern errr file_character(PlayerType *player_ptr, concptr name, display_player_pf display_player);
+extern errr file_character(PlayerType *player_ptr, concptr name);
 extern errr get_rnd_line(concptr file_name, int entry, char *output);
 void read_dead_file(char* buf, size_t buf_size);
 

diff --git a/src/io/report.cpp b/src/io/report.cpp
index 6895ddb..9dab44e 100644 (file)
--- a/src/io/report.cpp
+++ b/src/io/report.cpp
@@ -235,7 +235,7 @@ static bool http_post(concptr url, BUF *buf)
  * @param dumpbuf 伝送内容バッファ
  * @return エラーコード
  */
-static errr make_dump(PlayerType *player_ptr, BUF *dumpbuf, display_player_pf display_player)
+static errr make_dump(PlayerType *player_ptr, BUF *dumpbuf)
 {
     char buf[1024];
     FILE *fff;
@@ -254,7 +254,7 @@ static errr make_dump(PlayerType *player_ptr, BUF *dumpbuf, display_player_pf di
     }
 
     /* 一旦一時ファイルを作る。通常のダンプ出力と共通化するため。 */
-    make_character_dump(player_ptr, fff, display_player);
+    make_character_dump(player_ptr, fff);
     angband_fclose(fff);
 
     /* Open for read */
@@ -403,7 +403,7 @@ concptr make_screen_dump(PlayerType *player_ptr)
  * @param player_ptr プレイヤーへの参照ポインタ
  * @return 正常にスコアを送信できたらtrue、失敗時に送信を中止したらfalse
  */
-bool report_score(PlayerType *player_ptr, display_player_pf display_player)
+bool report_score(PlayerType *player_ptr)
 {
     auto *score = buf_new();
     char personality_desc[128];
@@ -434,7 +434,7 @@ bool report_score(PlayerType *player_ptr, display_player_pf display_player)
     buf_sprintf(score, "killer: %s\n", player_ptr->died_from);
     buf_sprintf(score, "-----charcter dump-----\n");
 
-    make_dump(player_ptr, score, display_player);
+    make_dump(player_ptr, score);
     if (screen_dump) {
         buf_sprintf(score, "-----screen shot-----\n");
         buf_append(score, screen_dump, strlen(screen_dump));

diff --git a/src/io/report.h b/src/io/report.h
index 9563d88..46418b7 100644 (file)
--- a/src/io/report.h
+++ b/src/io/report.h
@@ -5,9 +5,8 @@
 extern concptr screen_dump;
 
 #ifdef WORLD_SCORE
-#include "io/files-util.h"
 
 class PlayerType;
-bool report_score(PlayerType *player_ptr, display_player_pf display_player);
+bool report_score(PlayerType *player_ptr);
 concptr make_screen_dump(PlayerType *player_ptr);
 #endif

diff --git a/src/player/process-death.cpp b/src/player/process-death.cpp
index 311c67c..2c4d941 100644 (file)
--- a/src/player/process-death.cpp
+++ b/src/player/process-death.cpp
@@ -6,7 +6,7 @@
  * core、files、view-mainwindowの参照禁止。コールバックで対応すること
  */
 
-#include "process-death.h"
+#include "player/process-death.h"
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
@@ -14,6 +14,7 @@
 #include "floor/floor-town.h"
 #include "game-option/game-play-options.h"
 #include "inventory/inventory-slot-types.h"
+#include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "object/item-tester-hooker.h"
 #include "object/item-use-flags.h"
@@ -31,6 +32,7 @@
 #include "util/string-processor.h"
 #include "view/display-inventory.h"
 #include "view/display-messages.h"
+#include "view/display-player.h"
 #include "world/world.h"
 
 #define GRAVE_LINE_WIDTH 31
@@ -345,7 +347,7 @@ static void show_dead_home_items(PlayerType *player_ptr)
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param file_character ステータスダンプへのコールバック
  */
-static void export_player_info(PlayerType *player_ptr, display_player_pf display_player)
+static void export_player_info(PlayerType *player_ptr)
 {
     prt(_("キャラクターの記録をファイルに書き出すことができます。", "You may now dump a character record to one or more files."), 21, 0);
     prt(_("リターンキーでキャラクターを見ます。ESCで中断します。", "Then, hit RETURN to see the character, or ESC to abort."), 22, 0);
@@ -359,7 +361,7 @@ static void export_player_info(PlayerType *player_ptr, display_player_pf display
             break;
 
         screen_save();
-        (void)file_character(player_ptr, out_val, display_player);
+        (void)file_character(player_ptr, out_val);
         screen_load();
     }
 }
@@ -367,7 +369,7 @@ static void export_player_info(PlayerType *player_ptr, display_player_pf display
 /*!
  * @brief 自動的にプレイヤーステータスをファイルダンプ出力する
  */
-static void file_character_auto(PlayerType *player_ptr, display_player_pf display_player)
+static void file_character_auto(PlayerType *player_ptr)
 {
     time_t now_t = time(nullptr);
     struct tm *now_tm = localtime(&now_t);
@@ -379,7 +381,7 @@ static void file_character_auto(PlayerType *player_ptr, display_player_pf displa
     strnfmt(filename, sizeof(filename), "%s_Autodump_%s.txt", p_ptr->name, datetime);
 
     screen_save();
-    (void)file_character(player_ptr, filename, display_player);
+    (void)file_character(player_ptr, filename);
     screen_load();
 }
 
@@ -388,7 +390,7 @@ static void file_character_auto(PlayerType *player_ptr, display_player_pf displa
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param display_player ステータス表示へのコールバック
  */
-void show_death_info(PlayerType *player_ptr, display_player_pf display_player)
+void show_death_info(PlayerType *player_ptr)
 {
     inventory_aware(player_ptr);
     home_aware(player_ptr);
@@ -399,10 +401,10 @@ void show_death_info(PlayerType *player_ptr, display_player_pf display_player)
     msg_erase();
 
     if (auto_dump)
-        file_character_auto(player_ptr, display_player);
+        file_character_auto(player_ptr);
 
-    export_player_info(player_ptr, display_player);
-    (*display_player)(player_ptr, 0);
+    export_player_info(player_ptr);
+    display_player(player_ptr, 0);
     prt(_("何かキーを押すとさらに情報が続きます (ESCで中断): ", "Hit any key to see more information (ESC to abort): "), 23, 0);
     if (inkey() == ESCAPE)
         return;

diff --git a/src/player/process-death.h b/src/player/process-death.h
index 8f96fbf..00bdddc 100644 (file)
--- a/src/player/process-death.h
+++ b/src/player/process-death.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "io/files-util.h"
-
 class PlayerType;
 void print_tomb(PlayerType *player_ptr);
-void show_death_info(PlayerType *player_ptr, display_player_pf display_player);
+void show_death_info(PlayerType *player_ptr);