[Refactor] #38995 world_type 構造体に turn を game_turn に改名して取り込む。 / Rename turn to game_t...

[hengband/hengband.git] / src / scores.c

diff --git a/src/scores.c b/src/scores.c
index 715b137..873b451 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -145,15 +145,15 @@ static int highscore_add(high_score *score)
  */
 void display_scores_aux(int from, int to, int note, high_score *score)
 {
-       int             i, j, k, n, place;
-       byte attr;
+       int i, j, k, n, place;
+       TERM_COLOR attr;
 
-       high_score      the_score;
+       high_score the_score;
 
-       char    out_val[256];
-       char    tmp_val[160];
+       GAME_TEXT out_val[256];
+       GAME_TEXT tmp_val[160];
 
-       int wid, hgt, per_screen;
+       TERM_LEN wid, hgt, per_screen;
 
        Term_get_size(&wid, &hgt);
        per_screen = (hgt - 4) / 4;
@@ -187,7 +187,6 @@ void display_scores_aux(int from, int to, int note, high_score *score)
        /* Show per_screen per page, until "done" */
        for (k = from, place = k+1; k < i; k += per_screen)
        {
-               /* Clear screen */
                Term_clear();
 
                /* Title */
@@ -205,7 +204,7 @@ void display_scores_aux(int from, int to, int note, high_score *score)
                {
                        int pr, pc, pa, clev, mlev, cdun, mdun;
 
-                       cptr user, gold, when, aged;
+                       concptr user, gold, when, aged;
 
 
                        /* Hack -- indicate death in yellow */
@@ -395,8 +394,6 @@ void display_scores(int from, int to)
 
        /* Paranoia -- No score file */
        if (highscore_fd < 0) quit(_("スコア・ファイルが使用できません。", "Score file unavailable."));
-
-       /* Clear screen */
        Term_clear();
 
        /* Display the scores */
@@ -484,8 +481,8 @@ errr top_twenty(void)
        sprintf(the_score.gold, "%9lu", (long)p_ptr->au);
        the_score.gold[9] = '\0';
 
-       /* Save the current turn */
-       sprintf(the_score.turns, "%9lu", (long)turn_real(turn));
+       /* Save the current current_world_ptr->game_turn */
+       sprintf(the_score.turns, "%9lu", (long)turn_real(current_world_ptr->game_turn));
        the_score.turns[9] = '\0';
 
 #ifdef HIGHSCORE_DATE_HACK
@@ -501,7 +498,7 @@ errr top_twenty(void)
        /* Save the player name (15 chars) */
        sprintf(the_score.who, "%-.15s", p_ptr->name);
 
-       /* Save the player info XXX XXX XXX */
+       /* Save the player info */
        sprintf(the_score.uid, "%7u", player_uid);
        sprintf(the_score.sex, "%c", (p_ptr->psex ? 'm' : 'f'));
        sprintf(the_score.p_r, "%2d", MIN(p_ptr->prace, MAX_RACES));
@@ -510,9 +507,9 @@ errr top_twenty(void)
 
        /* Save the level and such */
        sprintf(the_score.cur_lev, "%3d", MIN((u16b)p_ptr->lev, 999));
-       sprintf(the_score.cur_dun, "%3d", (int)dun_level);
+       sprintf(the_score.cur_dun, "%3d", (int)current_floor_ptr->dun_level);
        sprintf(the_score.max_lev, "%3d", MIN((u16b)p_ptr->max_plv, 999));
-       sprintf(the_score.max_dun, "%3d", (int)max_dlv[dungeon_type]);
+       sprintf(the_score.max_dun, "%3d", (int)max_dlv[p_ptr->dungeon_idx]);
 
        /* Save the cause of death (31 chars) */
        if (strlen(p_ptr->died_from) >= sizeof(the_score.how))
@@ -605,8 +602,8 @@ errr predict_score(void)
        /* Save the current gold */
        sprintf(the_score.gold, "%9lu", (long)p_ptr->au);
 
-       /* Save the current turn */
-       sprintf(the_score.turns, "%9lu", (long)turn_real(turn));
+       /* Save the current current_world_ptr->game_turn */
+       sprintf(the_score.turns, "%9lu", (long)turn_real(current_world_ptr->game_turn));
 
        /* Hack -- no time needed */
        strcpy(the_score.day, _("今日", "TODAY"));
@@ -614,7 +611,7 @@ errr predict_score(void)
        /* Save the player name (15 chars) */
        sprintf(the_score.who, "%-.15s", p_ptr->name);
 
-       /* Save the player info XXX XXX XXX */
+       /* Save the player info */
        sprintf(the_score.uid, "%7u", player_uid);
        sprintf(the_score.sex, "%c", (p_ptr->psex ? 'm' : 'f'));
        sprintf(the_score.p_r, "%2d", MIN(p_ptr->prace, MAX_RACES));
@@ -623,9 +620,9 @@ errr predict_score(void)
 
        /* Save the level and such */
        sprintf(the_score.cur_lev, "%3d", MIN((u16b)p_ptr->lev, 999));
-       sprintf(the_score.cur_dun, "%3d", (int)dun_level);
+       sprintf(the_score.cur_dun, "%3d", (int)current_floor_ptr->dun_level);
        sprintf(the_score.max_lev, "%3d", MIN((u16b)p_ptr->max_plv, 999));
-       sprintf(the_score.max_dun, "%3d", (int)max_dlv[dungeon_type]);
+       sprintf(the_score.max_dun, "%3d", (int)max_dlv[p_ptr->dungeon_idx]);
 
        /* Hack -- no cause of death */
        /* まだ死んでいないときの識別文字 */
@@ -844,12 +841,12 @@ void race_legends(void)
  */
 void kingly(void)
 {
-       int wid, hgt;
-       int cx, cy;
+       TERM_LEN wid, hgt;
+       TERM_LEN cx, cy;
        bool seppuku = streq(p_ptr->died_from, "Seppuku");
 
        /* Hack -- retire in town */
-       dun_level = 0;
+       current_floor_ptr->dun_level = 0;
 
        /* Fake death */
        if (!seppuku)
@@ -868,8 +865,6 @@ void kingly(void)
 
        /* Hack -- Instant Gold */
        p_ptr->au += 10000000L;
-
-       /* Clear screen */
        Term_clear();
 
        /* Display a crown */