[Refactor] #37353 monster_is_valid() 関数を定義し単純な !r_idx の条件から置換。 / Define monster_is_va...

[hengbandforosx/hengbandosx.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 9c32f60..c56857d 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -23,6 +23,9 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "shoot.h"
+#include "player-move.h"
+#include "patron.h"
+#include "monster-status.h"
 
 
 /*
@@ -1335,8 +1338,6 @@ errr check_time_init(void)
                if (prefix(buf, "FRI:")) strcpy(days[5], buf);
                if (prefix(buf, "SAT:")) strcpy(days[6], buf);
        }
-
-       /* Close it */
        my_fclose(fp);
 
 #endif
@@ -4189,7 +4190,7 @@ static void dump_aux_pet(FILE *fff)
        {
                monster_type *m_ptr = &current_floor_ptr->m_list[i];
 
-               if (!m_ptr->r_idx) continue;
+               if (!monster_is_valid(m_ptr)) continue;
                if (!is_pet(m_ptr)) continue;
                pet_settings = TRUE;
                if (!m_ptr->nickname && (p_ptr->riding != i)) continue;
@@ -5046,8 +5047,6 @@ errr file_character(concptr name)
        }
 
        (void)make_character_dump(fff);
-
-       /* Close it */
        my_fclose(fff);
 
 
@@ -5424,7 +5423,6 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
                /* Re-open the file if needed */
                if (next > line)
                {
-                       /* Close it */
                        my_fclose(fff);
 
                        /* Hack -- Re-Open the file */
@@ -5703,8 +5701,6 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
                        strcpy (xtmp, "");
 
                        if (!get_string(_("ファイル名: ", "File name: "), xtmp, 80)) continue;
-
-                       /* Close it */
                        my_fclose(fff);
 
                        /* Build the filename */
@@ -5728,8 +5724,6 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG
 
                        while (!my_fgets(fff, buff, sizeof(buff)))
                                my_fputs(ffp, buff, 80);
-
-                       /* Close it */
                        my_fclose(fff);
                        my_fclose(ffp);
 
@@ -6049,8 +6043,6 @@ void do_cmd_suicide(void)
 
        /* Kill the player */
        p_ptr->is_dead = TRUE;
-
-       /* Leaving */
        p_ptr->leaving = TRUE;
 
        if (!p_ptr->total_winner)
@@ -6140,8 +6132,6 @@ void do_cmd_save_game(int is_autosave)
 void do_cmd_save_and_exit(void)
 {
        p_ptr->playing = FALSE;
-
-       /* Leaving */
        p_ptr->leaving = TRUE;
        do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
 }
@@ -7331,8 +7321,6 @@ static void handle_signal_simple(int sig)
 
                /* Suicide */
                p_ptr->is_dead = TRUE;
-
-               /* Leaving */
                p_ptr->leaving = TRUE;
 
                /* Close stuff */