OSDN Git Service

[Refactor] #37353 player-item.c/h 削除。 xtra2.c を player-status.c に分離。 / Delete player...
[hengband/hengband.git] / src / cmd4.c
index dcac9dd..4004316 100644 (file)
@@ -41,6 +41,8 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "world.h"
+#include "player-status.h"
 
 
 /*
@@ -364,7 +366,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 {
        int day, hour, min;
        FILE *fff = NULL;
-       char file_name[80];
+       GAME_TEXT file_name[MAX_NLEN];
        char buf[1024];
        cptr note_level = "";
        bool do_level = TRUE;
@@ -490,7 +492,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                }
                case NIKKI_RAND_QUEST_C:
                {
-                       char name[80];
+                       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[80];
+                       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);
@@ -721,7 +723,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 static void do_cmd_disp_nikki(void)
 {
        char nikki_title[256];
-       char file_name[80];
+       GAME_TEXT file_name[MAX_NLEN];
        char buf[1024];
        char tmp[80];
 #ifdef JP
@@ -858,7 +860,7 @@ static void do_cmd_last_get(void)
  */
 static void do_cmd_erase_nikki(void)
 {
-       char file_name[80];
+       GAME_TEXT file_name[MAX_NLEN];
        char buf[256];
        FILE *fff = NULL;
 
@@ -891,14 +893,11 @@ void do_cmd_nikki(void)
 
        /* File type is "TEXT" */
        FILE_TYPE(FILE_TYPE_TEXT);
-
-       /* Save the screen */
        screen_save();
 
        /* Interact until done */
        while (1)
        {
-               /* Clear screen */
                Term_clear();
 
                /* Ask for a choice */
@@ -942,11 +941,8 @@ void do_cmd_nikki(void)
                        bell();
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -980,28 +976,19 @@ void do_cmd_redraw(void)
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
 
-       /* Update torch */
        p_ptr->update |= (PU_TORCH);
-
        p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
-       /* Forget lite/view */
        p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
-
-       /* Update lite/view */
        p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
        p_ptr->update |= (PU_MONSTERS);
 
-       /* Redraw everything */
        p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
-
        p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
 
        update_playtime();
 
-       /* Hack -- update */
        handle_stuff();
 
        if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
@@ -1016,11 +1003,7 @@ void do_cmd_redraw(void)
                /* Activate */
                Term_activate(angband_term[j]);
                Term_redraw();
-
-               /* Refresh */
                Term_fresh();
-
-               /* Restore */
                Term_activate(old);
        }
 }
@@ -1039,8 +1022,6 @@ void do_cmd_change_name(void)
 
        char    tmp[160];
 
-
-       /* Save the screen */
        screen_save();
 
        /* Forever */
@@ -1100,20 +1081,14 @@ void do_cmd_change_name(void)
                {
                        mode++;
                }
-
                else
                {
                        bell();
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
-
-       /* Redraw everything */
        p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
 
        handle_stuff();
@@ -1180,11 +1155,7 @@ void do_cmd_messages(int num_now)
 
        /* Start on first message */
        i = 0;
-
-       /* Save the screen */
        screen_save();
-
-       /* Clear screen */
        Term_clear();
 
        /* Process requests until done */
@@ -1235,7 +1206,6 @@ void do_cmd_messages(int num_now)
                prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]",
                          "[Press 'p' for older, 'n' for newer, ..., or ESCAPE]"), hgt - 1, 0);
 
-               /* Get a command */
                skey = inkey_special(TRUE);
 
                /* Exit on Escape */
@@ -1365,8 +1335,6 @@ void do_cmd_messages(int num_now)
                /* Hack -- Error of some kind */
                if (i == j) bell();
        }
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -1382,8 +1350,6 @@ static void do_cmd_options_cheat(cptr info)
        char    ch;
        int             i, k = 0, n = CHEAT_MAX;
        char    buf[80];
-
-       /* Clear screen */
        Term_clear();
 
        /* Interact with the player */
@@ -1533,8 +1499,6 @@ static void do_cmd_options_autosave(cptr info)
        int i, k = 0, n = 2;
        char buf[80];
 
-
-       /* Clear screen */
        Term_clear();
 
        /* Interact with the player */
@@ -1663,8 +1627,6 @@ void do_cmd_options_aux(int page, cptr info)
                /* Notice options on this "page" */
                if (option_info[i].o_page == page) opt[n++] = i;
        }
-
-       /* Clear screen */
        Term_clear();
 
        /* Interact with the player */
@@ -1809,8 +1771,6 @@ static void do_cmd_options_win(void)
                old_flag[j] = window_flag[j];
        }
 
-
-       /* Clear screen */
        Term_clear();
 
        /* Interact */
@@ -1951,14 +1911,8 @@ static void do_cmd_options_win(void)
 
                /* Activate */
                Term_activate(angband_term[j]);
-
-               /* Erase */
                Term_clear();
-
-               /* Refresh */
                Term_fresh();
-
-               /* Restore */
                Term_activate(old);
        }
 }
@@ -2030,8 +1984,6 @@ void do_cmd_options(void)
        char k;
        int d, skey;
        TERM_LEN i, y = 0;
-
-       /* Save the screen */
        screen_save();
 
        /* Interact */
@@ -2041,8 +1993,6 @@ void do_cmd_options(void)
 
                /* Does not list cheat option when cheat option is off */
                if (!p_ptr->noscore && !allow_debug_opts) n--;
-
-               /* Clear screen */
                Term_clear();
 
                /* Why are we here */
@@ -2301,12 +2251,9 @@ void do_cmd_options(void)
                        }
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
 
-
-       /* Restore the screen */
        screen_load();
 
        /* Hack - Redraw equippy chars */
@@ -2605,7 +2552,6 @@ void do_cmd_macros(void)
        /* Process requests until done */
        while (1)
        {
-               /* Clear screen */
                Term_clear();
                prt(_("[ マクロの設定 ]", "Interact with Macros"), 2, 0);
 
@@ -2636,7 +2582,6 @@ void do_cmd_macros(void)
                /* Prompt */
                prt(_("コマンド: ", "Command: "), 16, 0);
 
-               /* Get a command */
                i = inkey();
 
                /* Leave */
@@ -2960,8 +2905,7 @@ void do_cmd_macros(void)
                        bell();
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
        screen_load();
 }
@@ -3057,20 +3001,17 @@ 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 = "<< ?? >>";
 
        /* File type is "TEXT" */
        FILE_TYPE(FILE_TYPE_TEXT);
-
-       /* Save the screen */
        screen_save();
 
        /* Interact until done */
        while (1)
        {
-               /* Clear screen */
                Term_clear();
 
                /* Ask for a choice */
@@ -3185,7 +3126,7 @@ void do_cmd_visuals(void)
                        /* Dump objects */
                        for (k_idx = 0; k_idx < max_k_idx; k_idx++)
                        {
-                               char o_name[80];
+                               GAME_TEXT o_name[MAX_NLEN];
                                object_kind *k_ptr = &k_info[k_idx];
 
                                /* Skip non-entries */
@@ -3320,7 +3261,6 @@ void do_cmd_visuals(void)
                                Term_putstr(0, 22, -1, TERM_WHITE, 
                                        _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): "));
 
-                               /* Get a command */
                                i = inkey();
 
                                /* All done */
@@ -3360,8 +3300,6 @@ void do_cmd_visuals(void)
                                        break;
                                case 'v':
                                        do_cmd_knowledge_monsters(&need_redraw, TRUE, r);
-
-                                       /* Clear screen */
                                        Term_clear();
                                        print_visuals_menu(choice_msg);
                                        break;
@@ -3413,7 +3351,6 @@ void do_cmd_visuals(void)
                                Term_putstr(0, 22, -1, TERM_WHITE,
                                            _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): "));
 
-                               /* Get a command */
                                i = inkey();
 
                                /* All done */
@@ -3453,8 +3390,6 @@ void do_cmd_visuals(void)
                                        break;
                                case 'v':
                                        do_cmd_knowledge_objects(&need_redraw, TRUE, k);
-
-                                       /* Clear screen */
                                        Term_clear();
                                        print_visuals_menu(choice_msg);
                                        break;
@@ -3518,7 +3453,6 @@ void do_cmd_visuals(void)
                                            "Command (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ");
 #endif
 
-                               /* Get a command */
                                i = inkey();
 
                                /* All done */
@@ -3565,8 +3499,6 @@ void do_cmd_visuals(void)
                                        break;
                                case 'v':
                                        do_cmd_knowledge_features(&need_redraw, TRUE, f, &lighting_level);
-
-                                       /* Clear screen */
                                        Term_clear();
                                        print_visuals_menu(choice_msg);
                                        break;
@@ -3612,11 +3544,8 @@ void do_cmd_visuals(void)
                        break;
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 
        if (need_redraw) do_cmd_redraw();
@@ -3638,15 +3567,12 @@ void do_cmd_colors(void)
        /* File type is "TEXT" */
        FILE_TYPE(FILE_TYPE_TEXT);
 
-
-       /* Save the screen */
        screen_save();
 
 
        /* Interact until done */
        while (1)
        {
-               /* Clear screen */
                Term_clear();
 
                /* Ask for a choice */
@@ -3796,8 +3722,6 @@ void do_cmd_colors(void)
                                Term_putstr(0, 14, -1, TERM_WHITE,
                                        _("コマンド (n/N/k/K/r/R/g/G/b/B): ", "Command (n/N/k/K/r/R/g/G/b/B): "));
 
-
-                               /* Get a command */
                                i = inkey();
 
                                /* All done */
@@ -3831,12 +3755,9 @@ void do_cmd_colors(void)
                        bell();
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
 
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -4653,14 +4574,9 @@ void do_cmd_load_screen(void)
                return;
        }
 
-
-       /* Save the screen */
        screen_save();
-
-       /* Clear the screen */
        Term_clear();
 
-
        /* Load the screen */
        for (y = 0; okay; y++)
        {
@@ -4727,8 +4643,6 @@ void do_cmd_load_screen(void)
        flush();
        inkey();
 
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -4758,7 +4672,7 @@ cptr inven_res_label = _("                               酸電火冷毒光闇
 /* XTRA HACK RESLIST */
 static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, OBJECT_TYPE_VALUE tval, char *where)
 {
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        if (!o_ptr->k_idx) return;
@@ -4856,7 +4770,7 @@ static void do_cmd_knowledge_inven(void)
 {
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        store_type  *st_ptr;
 
@@ -4902,8 +4816,6 @@ static void do_cmd_knowledge_inven(void)
                        do_cmd_knowledge_inven_aux(fff, &st_ptr->stock[i], &j, tval, where);
                }
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -4961,10 +4873,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
                
                return;
        }
-
-       /* Save the screen */
-       if (message)
-               screen_save();
+       if (message) screen_save();
 
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "htmldump.prf");
@@ -5062,8 +4971,6 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
                msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
                msg_print(NULL);
        }
-
-       /* Restore the screen */
        if (message)
                screen_load();
 }
@@ -5127,11 +5034,7 @@ void do_cmd_save_screen(void)
        {
                use_graphics = FALSE;
                reset_visuals();
-
-               /* Redraw everything */
                p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
-               /* Hack -- update */
                handle_stuff();
        }
 
@@ -5174,8 +5077,6 @@ void do_cmd_save_screen(void)
                        return;
                }
 
-
-               /* Save the screen */
                screen_save();
 
 
@@ -5226,14 +5127,11 @@ void do_cmd_save_screen(void)
                /* Skip a line */
                fprintf(fff, "\n");
 
-
                /* Close it */
                my_fclose(fff);
 
                msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
                msg_print(NULL);
-
-               /* Restore the screen */
                screen_load();
        }
 
@@ -5241,11 +5139,7 @@ void do_cmd_save_screen(void)
        {
                use_graphics = TRUE;
                reset_visuals();
-
-               /* Redraw everything */
                p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
-               /* Hack -- update */
                handle_stuff();
        }
 }
@@ -5349,9 +5243,9 @@ static void do_cmd_knowledge_artifacts(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
-       char base_name[MAX_NLEN];
+       GAME_TEXT base_name[MAX_NLEN];
 
        bool *okay;
 
@@ -5488,8 +5382,6 @@ static void do_cmd_knowledge_artifacts(void)
 
        /* Free the "okay" array */
        C_KILL(okay, max_a_idx, bool);
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -5513,7 +5405,7 @@ static void do_cmd_knowledge_uniques(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        int n_alive[10];
        int n_alive_surface = 0;
@@ -5615,8 +5507,6 @@ static void do_cmd_knowledge_uniques(void)
 
        /* Free the "who" array */
        C_KILL(who, max_r_idx, s16b);
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -5637,7 +5527,7 @@ static void do_cmd_knowledge_weapon_exp(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        char tmp[30];
 
        /* Open a new file */
@@ -5673,8 +5563,6 @@ static void do_cmd_knowledge_weapon_exp(void)
                        }
                }
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -5698,7 +5586,7 @@ static void do_cmd_knowledge_spell_exp(void)
        FILE *fff;
        const magic_type *s_ptr;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
@@ -5763,8 +5651,6 @@ static void do_cmd_knowledge_spell_exp(void)
                        fprintf(fff, "\n");
                }
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -5786,8 +5672,8 @@ static void do_cmd_knowledge_skill_exp(void)
 
        FILE *fff;
 
-       char file_name[1024];
-       char skill_name[3][20]={_("マーシャルアーツ", "Martial Arts    "),
+       GAME_TEXT file_name[1024];
+       GAME_TEXT skill_name[3][20]={_("マーシャルアーツ", "Martial Arts    "),
                                                        _("二刀流          ", "Dual Wielding   "), 
                                                        _("乗馬            ", "Riding          ")};
 
@@ -5809,8 +5695,6 @@ static void do_cmd_knowledge_skill_exp(void)
                if (cheat_xtra) fprintf(fff, " %d", skill_exp);
                fprintf(fff, "\n");
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -5956,10 +5840,10 @@ static void do_cmd_knowledge_pets(void)
        int             i;
        FILE            *fff;
        monster_type    *m_ptr;
-       char            pet_name[80];
+       GAME_TEXT pet_name[MAX_NLEN];
        int             t_friends = 0;
        int             show_upkeep = 0;
-       char            file_name[1024];
+       GAME_TEXT file_name[1024];
 
 
        /* Open a new file */
@@ -6001,8 +5885,6 @@ static void do_cmd_knowledge_pets(void)
 #endif
 
 
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -6028,7 +5910,7 @@ static void do_cmd_knowledge_kill_count(void)
 
        FILE *fff;
 
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        s32b Total = 0;
 
@@ -6165,8 +6047,6 @@ static void do_cmd_knowledge_kill_count(void)
 
        /* Free the "who" array */
        C_KILL(who, max_r_idx, s16b);
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -6201,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);
@@ -6549,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] ;
@@ -6868,7 +6748,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
        /* Display lines until done */
        for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++)
        {
-               char o_name[80];
+               GAME_TEXT o_name[MAX_NLEN];
                TERM_COLOR a;
                byte c;
                object_kind *flavor_k_ptr;
@@ -6880,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);
 
 
@@ -7275,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];
@@ -7685,7 +7565,7 @@ static void do_cmd_knowledge_kubi(void)
        int i;
        FILE *fff;
        
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        
        
        /* Open a new file */
@@ -7726,9 +7606,7 @@ static void do_cmd_knowledge_kubi(void)
                        fprintf(fff,"\n%s\n", _("賞金首はもう残っていません。", "There is no more wanted monster."));
                }
        }
-       
-       /* Close the file */
-       my_fclose(fff);
+               my_fclose(fff);
        
        /* Display the file contents */
        show_file(TRUE, file_name, _("賞金首の一覧", "Wanted monsters"), 0, 0);
@@ -7742,11 +7620,9 @@ static void do_cmd_knowledge_kubi(void)
  */
 static void do_cmd_knowledge_virtues(void)
 {
-       FILE *fff;
-       
-       char file_name[1024];
-       
-       
+       FILE *fff;      
+       GAME_TEXT file_name[1024];
+               
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
        if (!fff) {
@@ -7760,9 +7636,7 @@ static void do_cmd_knowledge_virtues(void)
                fprintf(fff, _("現在の属性 : %s\n\n", "Your alighnment : %s\n\n"), your_alignment());
                dump_virtues(fff);
        }
-       
-       /* Close the file */
-       my_fclose(fff);
+               my_fclose(fff);
        
        /* Display the file contents */
        show_file(TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
@@ -7779,10 +7653,9 @@ static void do_cmd_knowledge_dungeon(void)
 {
        FILE *fff;
        
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        int i;
-       
-       
+               
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
        if (!fff) {
@@ -7808,9 +7681,7 @@ static void do_cmd_knowledge_dungeon(void)
                        fprintf(fff, _("%c%-12s :  %3d 階\n", "%c%-16s :  level %3d\n"), seiha ? '!' : ' ', d_name + d_info[i].name, (int)max_dlv[i]);
                }
        }
-       
-       /* Close the file */
-       my_fclose(fff);
+               my_fclose(fff);
        
        /* Display the file contents */
        show_file(TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0);
@@ -7827,7 +7698,7 @@ static void do_cmd_knowledge_stat(void)
 {
        FILE *fff;
        
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        int percent, v_nr;
        
        /* Open a new file */
@@ -7861,8 +7732,6 @@ static void do_cmd_knowledge_stat(void)
        }
 
        dump_yourself(fff);
-
-       /* Close the file */
        my_fclose(fff);
        
        /* Display the file contents */
@@ -7880,7 +7749,7 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 {
        char tmp_str[120];
        char rand_tmp_str[120] = "\0";
-       char name[80];
+       GAME_TEXT name[MAX_NLEN];
        monster_race *r_ptr;
        IDX i;
        int rand_level = 100;
@@ -8218,7 +8087,7 @@ void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)
 static void do_cmd_knowledge_quests(void)
 {
        FILE *fff;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        IDX *quest_num;
        int dummy;
        IDX i;
@@ -8252,8 +8121,6 @@ static void do_cmd_knowledge_quests(void)
                fputc('\n', fff);
                do_cmd_knowledge_quests_wiz_random(fff);
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -8275,9 +8142,9 @@ static void do_cmd_knowledge_home(void)
        FILE *fff;
 
        int i;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
        store_type  *st_ptr;
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
        cptr            paren = ")";
 
        process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
@@ -8336,8 +8203,6 @@ static void do_cmd_knowledge_home(void)
                        fprintf(fff, "\n\n");
                }
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Display the file contents */
@@ -8355,7 +8220,7 @@ static void do_cmd_knowledge_autopick(void)
 {
        int k;
        FILE *fff;
-       char file_name[1024];
+       GAME_TEXT file_name[1024];
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
@@ -8408,7 +8273,6 @@ static void do_cmd_knowledge_autopick(void)
                string_free(tmp);
                fprintf(fff, "\n");
        }
-       /* Close the file */
        my_fclose(fff);
        /* Display the file contents */
        show_file(TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
@@ -8428,24 +8292,16 @@ void do_cmd_knowledge(void)
 
        /* File type is "TEXT" */
        FILE_TYPE(FILE_TYPE_TEXT);
-
-       /* Save the screen */
        screen_save();
 
        /* Interact until done */
        while (1)
        {
-               /* Clear screen */
                Term_clear();
 
                /* Ask for a choice */
-#ifdef JP
-               prt(format("%d/2 ページ", (p+1)), 2, 65);
-               prt("現在の知識を確認する", 3, 0);
-#else
-               prt(format("page %d/2", (p+1)), 2, 65);
-               prt("Display current knowledge", 3, 0);
-#endif
+               prt(format(_("%d/2 ページ", "page %d/2"), (p+1)), 2, 65);
+               prt(_("現在の知識を確認する", "Display current knowledge"), 3, 0);
 
                /* Give some choices */
 #ifdef JP
@@ -8502,21 +8358,11 @@ void do_cmd_knowledge(void)
                }
 #endif
                /* Prompt */
-#ifdef JP
-               prt("-続く-", 17, 8);
-               prt("ESC) 抜ける", 21, 1);
-               prt("SPACE) 次ページ", 21, 30);
+               prt(_("-続く-", "-more-"), 17, 8);
+               prt(_("ESC) 抜ける", "ESC) Exit menu"), 21, 1);
+               prt(_("SPACE) 次ページ", "SPACE) Next page"), 21, 30);
                /*prt("-) 前ページ", 21, 60);*/
-               prt("コマンド:", 20, 0);
-#else
-               prt("-more-", 17, 8);
-               prt("ESC) Exit menu", 21, 1);
-               prt("SPACE) Next page", 21, 30);
-               /*prt("-) Previous page", 21, 60);*/
-               prt("Command: ", 20, 0);
-#endif
-
-               /* Prompt */
+               prt(_("コマンド:", "Command: "), 20, 0);
                i = inkey();
 
                if (i == ESCAPE) break;
@@ -8591,11 +8437,8 @@ void do_cmd_knowledge(void)
                        bell();
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 
        if (need_redraw) do_cmd_redraw();
@@ -8609,14 +8452,10 @@ void do_cmd_checkquest(void)
 {
        /* File type is "TEXT" */
        FILE_TYPE(FILE_TYPE_TEXT);
-
-       /* Save the screen */
        screen_save();
 
        /* Quest info */
        do_cmd_knowledge_quests();
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -8723,7 +8562,5 @@ void do_cmd_time(void)
        }
 
        msg_print(desc);
-
-       /* Close the file */
        my_fclose(fff);
 }