From 4198f94a7972f5656e81948d896183e670e318ae Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 5 Jul 2020 21:57:41 +0900
Subject: [PATCH] [Refactor] #40467 Separated restore_dungeon() from
 exe_reading_savefile()

---
 src/savedata/load.c | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/savedata/load.c b/src/savedata/load.c
index ae3cb85e6..95c9398f3 100644
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -449,6 +449,28 @@ static errr load_store(player_type *creature_ptr)
     return 0;
 }
 
+static errr restore_dungeon(player_type *creature_ptr)
+{
+    if (creature_ptr->is_dead) {
+        for (int i = MIN_RANDOM_QUEST; i < MAX_RANDOM_QUEST + 1; i++)
+            r_info[quest[i].r_idx].flags1 &= ~(RF1_QUESTOR);
+
+        return 0;
+    }
+    
+    load_note(_("ダンジョン復元中...", "Restoring Dungeon..."));
+    if (rd_dungeon(creature_ptr)) {
+        load_note(_("ダンジョンデータ読み込み失敗", "Error reading dungeon data"));
+        return 34;
+    }
+
+    rd_ghost();
+    s32b tmp32s;
+    rd_s32b(&tmp32s);
+    strip_bytes(tmp32s);
+    return 0;
+}
+
 /*!
  * @brief セーブファイル読み込み処理の実体 / Actually read the savefile
  * @return エラーコード
@@ -516,27 +538,9 @@ static errr exe_reading_savefile(player_type *creature_ptr)
             screen_dump = string_make(buf);
     }
 
-    if (creature_ptr->is_dead) {
-        for (int i = MIN_RANDOM_QUEST; i < MAX_RANDOM_QUEST + 1; i++) {
-            r_info[quest[i].r_idx].flags1 &= ~(RF1_QUESTOR);
-        }
-    }
-
-    if (!creature_ptr->is_dead) {
-        load_note(_("ダンジョン復元中...", "Restoring Dungeon..."));
-        if (rd_dungeon(creature_ptr)) {
-            load_note(_("ダンジョンデータ読み込み失敗", "Error reading dungeon data"));
-            return (34);
-        }
-
-        rd_ghost();
-        {
-            s32b tmp32s;
-
-            rd_s32b(&tmp32s);
-            strip_bytes(tmp32s);
-        }
-    }
+    errr restore_dungeon_result = restore_dungeon(creature_ptr);
+    if (restore_dungeon_result != 0)
+        return restore_dungeon_result;
 
     /* Quest 18 was removed */
     if (h_older_than(1, 7, 0, 6)) {
-- 
2.11.0