OSDN Git Service

[Refactor] #3281 fd_open() の引数をstring_view からpath に差し替えた
[hengbandforosx/hengbandosx.git] / src / core / scores.cpp
index e493649..396fccb 100644 (file)
 #include "core/asking-player.h"
 #include "core/score-util.h"
 #include "core/turn-compensator.h"
-#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"
 #include "io/uid-checker.h"
 #include "locale/japanese.h"
+#include "player-base/player-race.h"
 #include "player-info/class-info.h"
 #include "player/player-personality.h"
 #include "player/player-status.h"
 #include "player/race-info-table.h"
 #include "system/angband-version.h"
+#include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
@@ -48,7 +50,7 @@
 static int highscore_write(high_score *score)
 {
     /* Write the record, note failure */
-    return (fd_write(highscore_fd, (char *)(score), sizeof(high_score)));
+    return fd_write(highscore_fd, (char *)(score), sizeof(high_score));
 }
 
 /*!
@@ -59,23 +61,27 @@ static int highscore_write(high_score *score)
 static int highscore_where(high_score *score)
 {
     /* Paranoia -- it may not have opened */
-    if (highscore_fd < 0)
+    if (highscore_fd < 0) {
         return -1;
+    }
 
     /* Go to the start of the highscore file */
-    if (highscore_seek(0))
+    if (highscore_seek(0)) {
         return -1;
+    }
 
     /* Read until we get to a higher score */
     high_score the_score;
     int my_score = atoi(score->pts);
     for (int i = 0; i < MAX_HISCORES; i++) {
         int old_score;
-        if (highscore_read(&the_score))
-            return (i);
+        if (highscore_read(&the_score)) {
+            return i;
+        }
         old_score = atoi(the_score.pts);
-        if (my_score > old_score)
-            return (i);
+        if (my_score > old_score) {
+            return i;
+        }
     }
 
     /* The "last" entry is always usable */
@@ -90,15 +96,17 @@ static int highscore_where(high_score *score)
 static int highscore_add(high_score *score)
 {
     /* Paranoia -- it may not have opened */
-    if (highscore_fd < 0)
+    if (highscore_fd < 0) {
         return -1;
+    }
 
     /* Determine where the score should go */
     int slot = highscore_where(score);
 
     /* Hack -- Not on the list */
-    if (slot < 0)
+    if (slot < 0) {
         return -1;
+    }
 
     /* Hack -- prepare to dump the new score */
     high_score the_score = (*score);
@@ -108,16 +116,20 @@ static int highscore_add(high_score *score)
     high_score tmpscore;
     for (int i = slot; !done && (i < MAX_HISCORES); i++) {
         /* Read the old guy, note errors */
-        if (highscore_seek(i))
+        if (highscore_seek(i)) {
             return -1;
-        if (highscore_read(&tmpscore))
+        }
+        if (highscore_read(&tmpscore)) {
             done = true;
+        }
 
         /* Back up and dump the score we were holding */
-        if (highscore_seek(i))
+        if (highscore_seek(i)) {
             return -1;
-        if (highscore_write(&the_score))
+        }
+        if (highscore_write(&the_score)) {
             return -1;
+        }
 
         /* Hack -- Save the old score, for the next pass */
         the_score = tmpscore;
@@ -129,11 +141,11 @@ static int highscore_add(high_score *score)
 
 /*!
  * @brief スコアサーバへの転送処理
- * @param current_player_ptr プレイヤーへの参照ポインタ
+ * @param player_ptr プレイヤーへの参照ポインタ
  * @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 *player_ptr, bool do_send)
 {
 #ifdef WORLD_SCORE
     if (!send_score || !do_send) {
@@ -141,7 +153,7 @@ bool send_world_score(PlayerType *current_player_ptr, bool do_send, display_play
     }
 
     auto is_registration = get_check_strict(
-        current_player_ptr, _("スコアをスコア・サーバに登録しますか? ", "Do you send score to the world score server? "), (CHECK_NO_ESCAPE | CHECK_NO_HISTORY));
+        player_ptr, _("スコアをスコア・サーバに登録しますか? ", "Do you send score to the world score server? "), (CHECK_NO_ESCAPE | CHECK_NO_HISTORY));
     if (!is_registration) {
         return true;
     }
@@ -150,7 +162,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(player_ptr);
     screen_load();
     if (!successful_send) {
         return false;
@@ -159,9 +171,8 @@ bool send_world_score(PlayerType *current_player_ptr, bool do_send, display_play
     prt(_("完了。何かキーを押してください。", "Completed.  Hit any key."), 0, 0);
     (void)inkey();
 #else
-    (void)current_player_ptr;
+    (void)player_ptr;
     (void)do_send;
-    (void)display_player;
 #endif
     return true;
 }
@@ -170,29 +181,29 @@ bool send_world_score(PlayerType *current_player_ptr, bool do_send, display_play
  * @brief スコアの過去二十位内ランキングを表示する
  * Enters a players name on a hi-score table, if "legal", and in any
  * case, displays some relevant portion of the high score list.
- * @param current_player_ptr プレイヤーへの参照ポインタ
+ * @param player_ptr プレイヤーへの参照ポインタ
  * @return エラーコード
  * @details
  * Assumes "signals_ignore_tstp()" has been called.
  */
-errr top_twenty(PlayerType *current_player_ptr)
+errr top_twenty(PlayerType *player_ptr)
 {
     high_score the_score = {};
     char buf[32];
 
     /* Save the version */
-    sprintf(the_score.what, "%u.%u.%u", FAKE_VER_MAJOR, FAKE_VER_MINOR, FAKE_VER_PATCH);
+    snprintf(the_score.what, sizeof(the_score.what), "%u.%u.%u", H_VER_MAJOR, H_VER_MINOR, H_VER_PATCH);
 
     /* Calculate and save the points */
-    sprintf(the_score.pts, "%9ld", (long)calc_score(current_player_ptr));
+    snprintf(the_score.pts, sizeof(the_score.pts), "%9ld", (long)calc_score(player_ptr));
     the_score.pts[9] = '\0';
 
     /* Save the current gold */
-    sprintf(the_score.gold, "%9lu", (long)current_player_ptr->au);
+    snprintf(the_score.gold, sizeof(the_score.gold), "%9lu", (long)player_ptr->au);
     the_score.gold[9] = '\0';
 
     /* Save the current turn */
-    sprintf(the_score.turns, "%9lu", (long)turn_real(current_player_ptr, w_ptr->game_turn));
+    snprintf(the_score.turns, sizeof(the_score.turns), "%9lu", (long)turn_real(player_ptr, w_ptr->game_turn));
     the_score.turns[9] = '\0';
 
     time_t ct = time((time_t *)0);
@@ -201,39 +212,39 @@ errr top_twenty(PlayerType *current_player_ptr)
     strftime(the_score.day, 10, "@%Y%m%d", localtime(&ct));
 
     /* Save the player name (15 chars) */
-    sprintf(the_score.who, "%-.15s", current_player_ptr->name);
+    snprintf(the_score.who, sizeof(the_score.who), "%-.15s", player_ptr->name);
 
     /* Save the player info */
-    sprintf(the_score.uid, "%7u", current_player_ptr->player_uid);
-    sprintf(the_score.sex, "%c", (current_player_ptr->psex ? 'm' : 'f'));
-    snprintf(buf, sizeof(buf), "%2d", std::min(enum2i(current_player_ptr->prace), MAX_RACES));
+    snprintf(the_score.uid, sizeof(the_score.uid), "%7u", player_ptr->player_uid);
+    snprintf(the_score.sex, sizeof(the_score.sex), "%c", (player_ptr->psex ? 'm' : 'f'));
+    snprintf(buf, sizeof(buf), "%2d", std::min(enum2i(player_ptr->prace), MAX_RACES));
     memcpy(the_score.p_r, buf, 3);
-    snprintf(buf, sizeof(buf), "%2d", enum2i(std::min(current_player_ptr->pclass, PlayerClassType::MAX)));
+    snprintf(buf, sizeof(buf), "%2d", enum2i(std::min(player_ptr->pclass, PlayerClassType::MAX)));
     memcpy(the_score.p_c, buf, 3);
-    snprintf(buf, sizeof(buf), "%2d", std::min(current_player_ptr->ppersonality, MAX_PERSONALITIES));
+    snprintf(buf, sizeof(buf), "%2d", std::min(player_ptr->ppersonality, MAX_PERSONALITIES));
     memcpy(the_score.p_a, buf, 3);
 
     /* Save the level and such */
-    sprintf(the_score.cur_lev, "%3d", std::min<ushort>(current_player_ptr->lev, 999));
-    sprintf(the_score.cur_dun, "%3d", (int)current_player_ptr->current_floor_ptr->dun_level);
-    sprintf(the_score.max_lev, "%3d", std::min<ushort>(current_player_ptr->max_plv, 999));
-    sprintf(the_score.max_dun, "%3d", (int)max_dlv[current_player_ptr->dungeon_idx]);
+    snprintf(the_score.cur_lev, sizeof(the_score.cur_lev), "%3d", std::min<ushort>(player_ptr->lev, 999));
+    snprintf(the_score.cur_dun, sizeof(the_score.cur_dun), "%3d", (int)player_ptr->current_floor_ptr->dun_level);
+    snprintf(the_score.max_lev, sizeof(the_score.max_lev), "%3d", std::min<ushort>(player_ptr->max_plv, 999));
+    snprintf(the_score.max_dun, sizeof(the_score.max_dun), "%3d", (int)max_dlv[player_ptr->dungeon_idx]);
 
     /* Save the cause of death (31 chars) */
-    if (strlen(current_player_ptr->died_from) >= sizeof(the_score.how)) {
+    if (player_ptr->died_from.size() >= sizeof(the_score.how)) {
 #ifdef JP
-        angband_strcpy(the_score.how, current_player_ptr->died_from, sizeof(the_score.how) - 2);
-        strcat(the_score.how, "…");
+        angband_strcpy(the_score.how, player_ptr->died_from.data(), sizeof(the_score.how) - 2);
+        angband_strcat(the_score.how, "…", sizeof(the_score.how));
 #else
-        angband_strcpy(the_score.how, current_player_ptr->died_from, sizeof(the_score.how) - 3);
-        strcat(the_score.how, "...");
+        angband_strcpy(the_score.how, player_ptr->died_from.data(), sizeof(the_score.how) - 3);
+        angband_strcat(the_score.how, "...", sizeof(the_score.how));
 #endif
     } else {
-        strcpy(the_score.how, current_player_ptr->died_from);
+        angband_strcpy(the_score.how, player_ptr->died_from.data(), sizeof(the_score.how));
     }
 
     /* Grab permissions */
-    safe_setuid_grab(current_player_ptr);
+    safe_setuid_grab(player_ptr);
 
     /* Lock (for writing) the highscore file, or fail */
     errr err = fd_lock(highscore_fd, F_WRLCK);
@@ -241,14 +252,15 @@ errr top_twenty(PlayerType *current_player_ptr)
     /* Drop permissions */
     safe_setuid_drop();
 
-    if (err)
+    if (err) {
         return 1;
+    }
 
     /* Add a new entry to the score list, see where it went */
     int j = highscore_add(&the_score);
 
     /* Grab permissions */
-    safe_setuid_grab(current_player_ptr);
+    safe_setuid_grab(player_ptr);
 
     /* Unlock the highscore file, or fail */
     err = fd_lock(highscore_fd, F_UNLCK);
@@ -256,8 +268,9 @@ errr top_twenty(PlayerType *current_player_ptr)
     /* Drop permissions */
     safe_setuid_drop();
 
-    if (err)
+    if (err) {
         return 1;
+    }
 
     /* Hack -- Display the top fifteen scores */
     if (j < 10) {
@@ -276,7 +289,7 @@ errr top_twenty(PlayerType *current_player_ptr)
  * Predict the players location, and display it.
  * @return エラーコード
  */
-errr predict_score(PlayerType *current_player_ptr)
+errr predict_score(PlayerType *player_ptr)
 {
     high_score the_score;
     char buf[32];
@@ -289,38 +302,38 @@ errr predict_score(PlayerType *current_player_ptr)
     }
 
     /* Save the version */
-    sprintf(the_score.what, "%u.%u.%u", FAKE_VER_MAJOR, FAKE_VER_MINOR, FAKE_VER_PATCH);
+    snprintf(the_score.what, sizeof(the_score.what), "%u.%u.%u", H_VER_MAJOR, H_VER_MINOR, H_VER_PATCH);
 
     /* Calculate and save the points */
-    sprintf(the_score.pts, "%9ld", (long)calc_score(current_player_ptr));
+    snprintf(the_score.pts, sizeof(the_score.pts), "%9ld", (long)calc_score(player_ptr));
 
     /* Save the current gold */
-    sprintf(the_score.gold, "%9lu", (long)current_player_ptr->au);
+    snprintf(the_score.gold, sizeof(the_score.gold), "%9lu", (long)player_ptr->au);
 
     /* Save the current turn */
-    sprintf(the_score.turns, "%9lu", (long)turn_real(current_player_ptr, w_ptr->game_turn));
+    snprintf(the_score.turns, sizeof(the_score.turns), "%9lu", (long)turn_real(player_ptr, w_ptr->game_turn));
 
     /* Hack -- no time needed */
-    strcpy(the_score.day, _("今日", "TODAY"));
+    angband_strcpy(the_score.day, _("今日", "TODAY"), sizeof(the_score.day));
 
     /* Save the player name (15 chars) */
-    sprintf(the_score.who, "%-.15s", current_player_ptr->name);
+    snprintf(the_score.who, sizeof(the_score.who), "%-.15s", player_ptr->name);
 
     /* Save the player info */
-    sprintf(the_score.uid, "%7u", current_player_ptr->player_uid);
-    sprintf(the_score.sex, "%c", (current_player_ptr->psex ? 'm' : 'f'));
-    snprintf(buf, sizeof(buf), "%2d", std::min(enum2i(current_player_ptr->prace), MAX_RACES));
+    snprintf(the_score.uid, sizeof(the_score.uid), "%7u", player_ptr->player_uid);
+    snprintf(the_score.sex, sizeof(the_score.sex), "%c", (player_ptr->psex ? 'm' : 'f'));
+    snprintf(buf, sizeof(buf), "%2d", std::min(enum2i(player_ptr->prace), MAX_RACES));
     memcpy(the_score.p_r, buf, 3);
-    snprintf(buf, sizeof(buf), "%2d", enum2i(std::min(current_player_ptr->pclass, PlayerClassType::MAX)));
+    snprintf(buf, sizeof(buf), "%2d", enum2i(std::min(player_ptr->pclass, PlayerClassType::MAX)));
     memcpy(the_score.p_c, buf, 3);
-    snprintf(buf, sizeof(buf), "%2d", std::min(current_player_ptr->ppersonality, MAX_PERSONALITIES));
+    snprintf(buf, sizeof(buf), "%2d", std::min(player_ptr->ppersonality, MAX_PERSONALITIES));
     memcpy(the_score.p_a, buf, 3);
 
     /* Save the level and such */
-    sprintf(the_score.cur_lev, "%3d", std::min<ushort>(current_player_ptr->lev, 999));
-    sprintf(the_score.cur_dun, "%3d", (int)current_player_ptr->current_floor_ptr->dun_level);
-    sprintf(the_score.max_lev, "%3d", std::min<ushort>(current_player_ptr->max_plv, 999));
-    sprintf(the_score.max_dun, "%3d", (int)max_dlv[current_player_ptr->dungeon_idx]);
+    snprintf(the_score.cur_lev, sizeof(the_score.cur_lev), "%3d", std::min<ushort>(player_ptr->lev, 999));
+    snprintf(the_score.cur_dun, sizeof(the_score.cur_dun), "%3d", (int)player_ptr->current_floor_ptr->dun_level);
+    snprintf(the_score.max_lev, sizeof(the_score.max_lev), "%3d", std::min<ushort>(player_ptr->max_plv, 999));
+    snprintf(the_score.max_dun, sizeof(the_score.max_dun), "%3d", (int)max_dlv[player_ptr->dungeon_idx]);
 
     /* まだ死んでいないときの識別文字 */
     strcpy(the_score.how, _("yet", "nobody (yet!)"));
@@ -343,44 +356,47 @@ errr predict_score(PlayerType *current_player_ptr)
  * @brief スコアランキングの簡易表示 /
  * show_highclass - selectively list highscores based on class -KMW-
  */
-void show_highclass(PlayerType *current_player_ptr)
+void show_highclass(PlayerType *player_ptr)
 {
     screen_save();
-    char buf[1024], out_val[256];
-    path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw");
-
-    highscore_fd = fd_open(buf, O_RDONLY);
-
+    const auto &path = path_build(ANGBAND_DIR_APEX, "scores.raw");
+    highscore_fd = fd_open(path, O_RDONLY);
     if (highscore_fd < 0) {
         msg_print(_("スコア・ファイルが使用できません。", "Score file unavailable."));
         msg_print(nullptr);
         return;
     }
 
-    if (highscore_seek(0))
+    if (highscore_seek(0)) {
         return;
+    }
 
     high_score the_score;
-    for (int i = 0; i < MAX_HISCORES; i++)
-        if (highscore_read(&the_score))
+    for (int i = 0; i < MAX_HISCORES; i++) {
+        if (highscore_read(&the_score)) {
             break;
+        }
+    }
 
     int m = 0;
     int j = 0;
     PLAYER_LEVEL clev = 0;
     int pr;
+    char out_val[256];
     while ((m < 9) && (j < MAX_HISCORES)) {
-        if (highscore_seek(j))
+        if (highscore_seek(j)) {
             break;
-        if (highscore_read(&the_score))
+        }
+        if (highscore_read(&the_score)) {
             break;
+        }
         pr = atoi(the_score.p_r);
         clev = (PLAYER_LEVEL)atoi(the_score.cur_lev);
 
 #ifdef JP
-        sprintf(out_val, "   %3d) %sの%s (レベル %2d)", (m + 1), race_info[pr].title, the_score.who, clev);
+        snprintf(out_val, sizeof(out_val), "   %3d) %sの%s (レベル %2d)", (m + 1), race_info[pr].title, the_score.who, clev);
 #else
-        sprintf(out_val, "%3d) %s the %s (Level %2d)", (m + 1), the_score.who, race_info[pr].title, clev);
+        snprintf(out_val, sizeof(out_val), "%3d) %s the %s (Level %2d)", (m + 1), the_score.who, race_info[pr].title, clev);
 #endif
 
         prt(out_val, (m + 7), 0);
@@ -389,9 +405,9 @@ void show_highclass(PlayerType *current_player_ptr)
     }
 
 #ifdef JP
-    sprintf(out_val, "あなた) %sの%s (レベル %2d)", race_info[enum2i(current_player_ptr->prace)].title, current_player_ptr->name, current_player_ptr->lev);
+    snprintf(out_val, sizeof(out_val), "あなた) %sの%s (レベル %2d)", race_info[enum2i(player_ptr->prace)].title, player_ptr->name, player_ptr->lev);
 #else
-    sprintf(out_val, "You) %s the %s (Level %2d)", current_player_ptr->name, race_info[enum2i(current_player_ptr->prace)].title, current_player_ptr->lev);
+    snprintf(out_val, sizeof(out_val), "You) %s the %s (Level %2d)", player_ptr->name, race_info[enum2i(player_ptr->prace)].title, player_ptr->lev);
 #endif
 
     prt(out_val, (m + 8), 0);
@@ -402,8 +418,9 @@ void show_highclass(PlayerType *current_player_ptr)
 
     (void)inkey();
 
-    for (j = 5; j < 18; j++)
+    for (j = 5; j < 18; j++) {
         prt("", j, 0);
+    }
     screen_load();
 }
 
@@ -412,53 +429,52 @@ void show_highclass(PlayerType *current_player_ptr)
  * Race Legends -KMW-
  * @param race_num 種族ID
  */
-void race_score(PlayerType *current_player_ptr, int race_num)
+void race_score(PlayerType *player_ptr, int race_num)
 {
     int i = 0, j, m = 0;
-    int pr, clev, lastlev;
+    int pr, clev;
     high_score the_score;
-    char buf[1024], out_val[256], tmp_str[80];
-
-    lastlev = 0;
+    auto lastlev = 0;
 
     /* rr9: TODO - pluralize the race */
-    sprintf(tmp_str, _("最高の%s", "The Greatest of all the %s"), race_info[race_num].title);
-
-    prt(tmp_str, 5, 15);
-    path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw");
-
-    highscore_fd = fd_open(buf, O_RDONLY);
-
+    prt(std::string(_("最高の", "The Greatest of all the ")).append(race_info[race_num].title), 5, 15);
+    const auto &path = path_build(ANGBAND_DIR_APEX, "scores.raw");
+    highscore_fd = fd_open(path, O_RDONLY);
     if (highscore_fd < 0) {
         msg_print(_("スコア・ファイルが使用できません。", "Score file unavailable."));
         msg_print(nullptr);
         return;
     }
 
-    if (highscore_seek(0))
+    if (highscore_seek(0)) {
         return;
+    }
 
     for (i = 0; i < MAX_HISCORES; i++) {
-        if (highscore_read(&the_score))
+        if (highscore_read(&the_score)) {
             break;
+        }
     }
 
     m = 0;
     j = 0;
 
     while ((m < 10) || (j < MAX_HISCORES)) {
-        if (highscore_seek(j))
+        if (highscore_seek(j)) {
             break;
-        if (highscore_read(&the_score))
+        }
+        if (highscore_read(&the_score)) {
             break;
+        }
         pr = atoi(the_score.p_r);
         clev = atoi(the_score.cur_lev);
 
         if (pr == race_num) {
+            char out_val[256];
 #ifdef JP
-            sprintf(out_val, "   %3d) %sの%s (レベル %2d)", (m + 1), race_info[pr].title, the_score.who, clev);
+            snprintf(out_val, sizeof(out_val), "   %3d) %sの%s (レベル %2d)", (m + 1), race_info[pr].title, the_score.who, clev);
 #else
-            sprintf(out_val, "%3d) %s the %s (Level %3d)", (m + 1), the_score.who, race_info[pr].title, clev);
+            snprintf(out_val, sizeof(out_val), "%3d) %s the %s (Level %3d)", (m + 1), the_score.who, race_info[pr].title, clev);
 #endif
 
             prt(out_val, (m + 7), 0);
@@ -469,11 +485,12 @@ void race_score(PlayerType *current_player_ptr, int race_num)
     }
 
     /* add player if qualified */
-    if ((enum2i(current_player_ptr->prace) == race_num) && (current_player_ptr->lev >= lastlev)) {
+    if ((enum2i(player_ptr->prace) == race_num) && (player_ptr->lev >= lastlev)) {
+        char out_val[256];
 #ifdef JP
-        sprintf(out_val, "あなた) %sの%s (レベル %2d)", race_info[enum2i(current_player_ptr->prace)].title, current_player_ptr->name, current_player_ptr->lev);
+        snprintf(out_val, sizeof(out_val), "あなた) %sの%s (レベル %2d)", race_info[enum2i(player_ptr->prace)].title, player_ptr->name, player_ptr->lev);
 #else
-        sprintf(out_val, "You) %s the %s (Level %3d)", current_player_ptr->name, race_info[enum2i(current_player_ptr->prace)].title, current_player_ptr->lev);
+        snprintf(out_val, sizeof(out_val), "You) %s the %s (Level %3d)", player_ptr->name, race_info[enum2i(player_ptr->prace)].title, player_ptr->lev);
 #endif
 
         prt(out_val, (m + 8), 0);
@@ -487,14 +504,15 @@ void race_score(PlayerType *current_player_ptr, int race_num)
  * @brief スコアランキングの簡易表示(種族毎)メインルーチン /
  * Race Legends -KMW-
  */
-void race_legends(PlayerType *current_player_ptr)
+void race_legends(PlayerType *player_ptr)
 {
     for (int i = 0; i < MAX_RACES; i++) {
-        race_score(current_player_ptr, i);
+        race_score(player_ptr, i);
         msg_print(_("何かキーを押すとゲームに戻ります", "Hit any key to continue"));
         msg_print(nullptr);
-        for (int j = 5; j < 19; j++)
+        for (int j = 5; j < 19; j++) {
             prt("", j, 0);
+        }
     }
 }
 
@@ -502,7 +520,7 @@ void race_legends(PlayerType *current_player_ptr)
  * @brief スコアファイル出力
  * Display some character info
  */
-bool check_score(PlayerType *current_player_ptr)
+bool check_score(PlayerType *player_ptr)
 {
     term_clear();
 
@@ -528,14 +546,14 @@ bool check_score(PlayerType *current_player_ptr)
     }
 
     /* Interupted */
-    if (!w_ptr->total_winner && streq(current_player_ptr->died_from, _("強制終了", "Interrupting"))) {
+    if (!w_ptr->total_winner && streq(player_ptr->died_from, _("強制終了", "Interrupting"))) {
         msg_print(_("強制終了のためスコアが記録されません。", "Score not registered due to interruption."));
         msg_print(nullptr);
         return false;
     }
 
     /* Quitter */
-    if (!w_ptr->total_winner && streq(current_player_ptr->died_from, _("途中終了", "Quitting"))) {
+    if (!w_ptr->total_winner && streq(player_ptr->died_from, _("途中終了", "Quitting"))) {
         msg_print(_("途中終了のためスコアが記録されません。", "Score not registered due to quitting."));
         msg_print(nullptr);
         return false;