[Refactor] #38824 グローバル変数 item_tester_no_ryoute を処理 (まだ未完成) / Refactor item_tester_no...

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

diff --git a/src/files.c b/src/files.c
index 2fdc9e6..955b0bb 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1179,8 +1179,6 @@ static errr process_pref_file_aux(cptr name, int preftype)
                msg_format(_("('%s'を解析中)", "Parsing '%s'"), old);
                msg_print(NULL);
        }
-
-       /* Close the file */
        my_fclose(fp);
        return (err);
 }
@@ -1463,8 +1461,6 @@ errr check_load_init(void)
 
                break;
        }
-
-       /* Close the file */
        my_fclose(fp);
 
 #endif
@@ -3806,13 +3802,11 @@ c_put_str(TERM_YELLOW, "現在", row, stat_col+35);
  * Mode 4 = mutations
  * </pre>
  */
-void display_player(BIT_FLAGS mode)
+void display_player(int mode)
 {
        int i;
-
-       char    buf[80];
-       char    tmp[64];
-
+       char buf[80];
+       char tmp[64];
 
        if ((p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) && display_mutations)
                mode = (mode % 5);
@@ -4063,7 +4057,6 @@ static void dump_aux_display_player(FILE *fff)
        char c;
        char buf[1024];
 
-       /* Display player */
        display_player(0);
 
        /* Dump part of the screen */
@@ -4252,7 +4245,7 @@ static void dump_aux_class_special(FILE *fff)
                int l2 = 0;
                int num = 0;
                int spellnum[MAX_MONSPELLS];
-               s32b f4 = 0, f5 = 0, f6 = 0;
+               BIT_FLAGS f4 = 0, f5 = 0, f6 = 0;
                char p[60][80];
                int col = 0;
                bool pcol = FALSE;
@@ -4351,7 +4344,7 @@ static void dump_aux_class_special(FILE *fff)
        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
        {
                char s[EATER_EXT][MAX_NLEN];
-               OBJECT_TYPE_VALUE tval;
+               OBJECT_TYPE_VALUE tval = 0;
                int ext;
                KIND_OBJECT_IDX k_idx;
                OBJECT_SUBTYPE_VALUE i;
@@ -5030,8 +5023,6 @@ errr file_character(cptr name)
        if (fd >= 0)
        {
                char out_val[160];
-
-               /* Close the file */
                (void)fd_close(fd);
 
                /* Build query */
@@ -5422,8 +5413,6 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode
 
        /* start from bottom when reverse mode */
        if (line == -1) line = ((size-1)/rows)*rows;
-
-       /* Clear screen */
        Term_clear();
 
        /* Display the file */
@@ -5758,8 +5747,6 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode
                /* Exit on the q key */
                if (skey == 'q') break;
        }
-
-       /* Close the file */
        my_fclose(fff);
 
        /* Escape */
@@ -5778,13 +5765,10 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode
  */
 void do_cmd_help(void)
 {
-       /* Save screen */
        screen_save();
 
        /* Peruse the main help file */
        (void)show_file(TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0);
-
-       /* Load screen */
        screen_load();
 }
 
@@ -6103,8 +6087,6 @@ void do_cmd_save_game(int is_autosave)
 
        /* Clear messages */
        msg_print(NULL);
-
-       /* Handle stuff */
        handle_stuff();
 
        prt(_("ゲームをセーブしています...", "Saving game..."), 0, 0);
@@ -6142,7 +6124,7 @@ void do_cmd_save_game(int is_autosave)
        /* HACK -- don't get sanity blast on updating view */
        is_loading_now = FALSE;
 
-       update_stuff();
+       handle_stuff();
 
        /* Initialize monster process */
        mproc_init();
@@ -6360,8 +6342,6 @@ static void print_tomb(void)
 #ifdef JP
                int    extra_line = 0;
 #endif
-
-               /* Clear screen */
                Term_clear();
 
                /* Build the filename */
@@ -6587,15 +6567,12 @@ static void show_info(void)
 
        /* Hack -- Recalculate bonuses */
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
 
        /* Flush all input keys */
        flush();
 
-       /* Flush messages */
-       msg_print(NULL);
+       msg_erase();
 
 
        /* Describe options */
@@ -6618,20 +6595,14 @@ static void show_info(void)
 
                /* Return means "show on screen" */
                if (!out_val[0]) break;
-
-               /* Save screen */
                screen_save();
 
                /* Dump a character file */
                (void)file_character(out_val);
-
-               /* Load screen */
                screen_load();
        }
 
        update_playtime();
-
-       /* Display player */
        display_player(0);
 
        /* Prompt for inventory */
@@ -6647,8 +6618,7 @@ static void show_info(void)
        if (equip_cnt)
        {
                Term_clear();
-               item_tester_full = TRUE;
-               (void)show_equip(0);
+               (void)show_equip(0, USE_FULL);
                prt(_("装備していたアイテム: -続く-", "You are using: -more-"), 0, 0);
 
                if (inkey() == ESCAPE) return;
@@ -6658,8 +6628,7 @@ static void show_info(void)
        if (inven_cnt)
        {
                Term_clear();
-               item_tester_full = TRUE;
-               (void)show_inven(0);
+               (void)show_inven(0, USE_FULL);
                prt(_("持っていたアイテム: -続く-", "You are carrying: -more-"), 0, 0);
 
                if (inkey() == ESCAPE) return;
@@ -6676,7 +6645,6 @@ static void show_info(void)
                        /* Display contents of the home */
                        for (k = 0, i = 0; i < st_ptr->stock_num; k++)
                        {
-                               /* Clear screen */
                                Term_clear();
 
                                /* Show 12 items */
@@ -6714,7 +6682,6 @@ static void show_info(void)
  */
 static bool check_score(void)
 {
-       /* Clear screen */
        Term_clear();
 
        /* No score file */
@@ -6788,8 +6755,6 @@ void close_game(void)
        bool do_send = TRUE;
 
 /*     cptr p = "[i:キャラクタの情報, f:ファイル書き出し, t:スコア, x:*鑑定*, ESC:ゲーム終了]"; */
-
-       /* Handle stuff */
        handle_stuff();
 
        /* Flush the messages */
@@ -6839,8 +6804,6 @@ void close_game(void)
 
                /* Show more info */
                show_info();
-
-               /* Clear screen */
                Term_clear();
 
                if (check_score())
@@ -7047,8 +7010,6 @@ errr get_rnd_line(cptr file_name, int entry, char *output)
                /* Copy the line */
                if (one_in_(counter + 1)) strcpy(output, buf);
        }
-
-       /* Close the file */
        my_fclose(fp);
 
        /* Success */