[Refactor] #37353 player-item.c/h 削除。 xtra2.c を player-status.c に分離。 / Delete player...

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

diff --git a/src/cmd4.c b/src/cmd4.c
index 78af88a..4004316 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -41,6 +41,8 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "world.h"
+#include "player-status.h"
 
 
 /*
@@ -490,7 +492,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                }
                case NIKKI_RAND_QUEST_C:
                {
-                       char name[MAX_NLEN];
+                       GAME_TEXT name[MAX_NLEN];
                        strcpy(name, r_name+r_info[quest[num].r_idx].name);
                        fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)を達成した。\n",
                                                   " %2d:%02d %20s completed random quest '%s'\n"), hour, min, note_level, name);
@@ -498,7 +500,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                }
                case NIKKI_RAND_QUEST_F:
                {
-                       char name[MAX_NLEN];
+                       GAME_TEXT name[MAX_NLEN];
                        strcpy(name, r_name+r_info[quest[num].r_idx].name);
                        fprintf(fff, _(" %2d:%02d %20s ランダムクエスト(%s)から逃げ出した。\n",
                                                   " %2d:%02d %20s ran away from quest '%s'.\n"), hour, min, note_level, name);
@@ -2999,7 +3001,7 @@ void do_cmd_visuals(void)
        char tmp[160];
        char buf[1024];
        bool need_redraw = FALSE;
-       const char *empty_symbol = "<< ? >>";
+       cptr empty_symbol = "<< ? >>";
 
        if (use_bigtile) empty_symbol = "<< ?? >>";
 
@@ -6079,7 +6081,7 @@ static void display_group_list(int col, int row, int wid, int per_page, IDX grp_
                int grp = grp_idx[grp_top + i];
 
                /* Choose a color */
-               byte attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE;
+               TERM_COLOR attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE;
 
                /* Erase the entire line */
                Term_erase(col, row + i, wid);
@@ -6427,7 +6429,7 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
        /* Display lines until done */
        for (i = 0; i < per_page && (mon_idx[mon_top + i] >= 0); i++)
        {
-               byte attr;
+               TERM_COLOR attr;
 
                /* Get the race index */
                MONRACE_IDX r_idx = mon_idx[mon_top + i] ;
@@ -6758,7 +6760,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
                object_kind *k_ptr = &k_info[k_idx];
 
                /* Choose a color */
-               byte attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
+               TERM_COLOR attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
                byte cursor = ((k_ptr->aware || visual_only) ? TERM_L_BLUE : TERM_BLUE);
 
 
@@ -7153,7 +7155,7 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_
        /* Display lines until done */
        for (i = 0; i < per_page && (feat_idx[feat_top + i] >= 0); i++)
        {
-               byte attr;
+               TERM_COLOR attr;
 
                /* Get the index */
                FEAT_IDX f_idx = feat_idx[feat_top + i];
@@ -7747,7 +7749,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 {
        char tmp_str[120];
        char rand_tmp_str[120] = "\0";
-       char name[MAX_NLEN];
+       GAME_TEXT name[MAX_NLEN];
        monster_race *r_ptr;
        IDX i;
        int rand_level = 100;