From 342a9b07373d53671e3626b88cfa6315a5183694 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 5 Jul 2020 15:40:39 +0900 Subject: [PATCH] [Refactor] #40467 Separated rd_dungeons() from rd_extra() --- src/savedata/extra-loader.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/savedata/extra-loader.c b/src/savedata/extra-loader.c index 51be3c352..bdd458cbf 100644 --- a/src/savedata/extra-loader.c +++ b/src/savedata/extra-loader.c @@ -286,6 +286,17 @@ static void rd_mana(player_type *creature_ptr) rd_u32b(&creature_ptr->csp_frac); } +static void rd_dungeons(player_type *creature_ptr) +{ + if (z_older_than(10, 3, 8)) + rd_zangband_dungeon(); + else + rd_dungeons(); + + if (creature_ptr->max_plv < creature_ptr->lev) + creature_ptr->max_plv = creature_ptr->lev; +} + /*! * @brief その他の情報を読み込む / Read the "extra" information * @param creature_ptr プレーヤーへの参照ポインタ @@ -306,14 +317,7 @@ void rd_extra(player_type *creature_ptr) rd_hp(creature_ptr); rd_mana(creature_ptr); rd_s16b(&creature_ptr->max_plv); - if (z_older_than(10, 3, 8)) - rd_zangband_dungeon(); - else - rd_dungeons(); - - if (creature_ptr->max_plv < creature_ptr->lev) - creature_ptr->max_plv = creature_ptr->lev; - + rd_dungeons(creature_ptr); strip_bytes(8); rd_s16b(&creature_ptr->sc); rd_s16b(&creature_ptr->concent); -- 2.11.0