[Refactor] #37353 メッセージ整理。 / Refactor messages.

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

diff --git a/src/load.c b/src/load.c
index 11bb61e..3ce463e 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1402,8 +1402,6 @@ static errr rd_store(int town_number, int store_number)
 
                /* Get local object */
                q_ptr = &forge;
-
-               /* Wipe the object */
                object_wipe(q_ptr);
 
                /* Read the item */
@@ -1473,21 +1471,15 @@ static void rd_randomizer(void)
 static void rd_options(void)
 {
        int i, n;
-
        byte b;
-
        u16b c;
 
        BIT_FLAGS flag[8];
        BIT_FLAGS mask[8];
 
-
-       /*** Oops ***/
-
        /* Ignore old options */
        strip_bytes(16);
 
-
        /*** Special info */
 
        /* Read "delay_factor" */
@@ -1509,7 +1501,6 @@ static void rd_options(void)
                mana_warn = b;
        }
 
-
        /*** Cheating options ***/
 
        rd_u16b(&c);
@@ -1750,6 +1741,7 @@ static void rd_extra(void)
        p_ptr->realm1 = (REALM_IDX)tmp8u;
        rd_byte(&tmp8u);
        p_ptr->realm2 = (REALM_IDX)tmp8u;
+       rd_byte(&tmp8u);
 
        if (z_older_than(10, 4, 4))
        {
@@ -1774,7 +1766,7 @@ static void rd_extra(void)
        for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_max_max[i]);
        for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_cur[i]);
 
-
+       strip_bytes(24);
        rd_s32b(&p_ptr->au);
 
        rd_s32b(&p_ptr->max_exp);
@@ -2207,6 +2199,7 @@ static void rd_extra(void)
        p_ptr->autopick_autoregister = tmp8u ? TRUE : FALSE;
 
        rd_byte(&tmp8u);
+       rd_byte(&tmp8u);
        p_ptr->action = (ACTION_IDX)tmp8u;
        if (!z_older_than(10, 4, 3))
        {
@@ -2407,8 +2400,6 @@ static errr rd_inventory(void)
 
                /* Get local object */
                q_ptr = &forge;
-
-               /* Wipe the object */
                object_wipe(q_ptr);
 
                /* Read the item */
@@ -4031,8 +4022,6 @@ errr rd_savefile_new(void)
 
        /* Close the file */
        my_fclose(fff);
-
-       /* Result */
        return (err);
 }
 
@@ -4208,7 +4197,5 @@ bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode)
 
        /* Restore old knowledge */
        kanji_code = old_kanji_code;
-
-       /* Result */
        return ok;
 }