From 2a2aa25f18b0ceef5a21932d3a4f8b69614766fa Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 5 Jul 2020 21:38:02 +0900
Subject: [PATCH] [Refactor] #40467 Separated load_spells() from
 exe_reading_savefile()

---
 src/savedata/load.c | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/savedata/load.c b/src/savedata/load.c
index a09ec1d05..8e96ca375 100644
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -400,6 +400,26 @@ static errr load_hp(player_type *creature_ptr)
     return 0;
 }
 
+static void load_spells(player_type *creature_ptr)
+{
+    rd_u32b(&creature_ptr->spell_learned1);
+    rd_u32b(&creature_ptr->spell_learned2);
+    rd_u32b(&creature_ptr->spell_worked1);
+    rd_u32b(&creature_ptr->spell_worked2);
+    rd_u32b(&creature_ptr->spell_forgotten1);
+    rd_u32b(&creature_ptr->spell_forgotten2);
+
+    if (z_older_than(10, 0, 5))
+        set_zangband_spells(creature_ptr);
+    else
+        rd_s16b(&creature_ptr->learned_spells);
+
+    if (z_older_than(10, 0, 6))
+        creature_ptr->add_spells = 0;
+    else
+        rd_s16b(&creature_ptr->add_spells);
+}
+
 /*!
  * @brief セーブファイル読み込み処理の実体 / Actually read the savefile
  * @return エラーコード
@@ -442,23 +462,7 @@ static errr exe_reading_savefile(player_type *creature_ptr)
     set_zangband_class(creature_ptr);
     mp_ptr = &m_info[creature_ptr->pclass];
 
-    rd_u32b(&creature_ptr->spell_learned1);
-    rd_u32b(&creature_ptr->spell_learned2);
-    rd_u32b(&creature_ptr->spell_worked1);
-    rd_u32b(&creature_ptr->spell_worked2);
-    rd_u32b(&creature_ptr->spell_forgotten1);
-    rd_u32b(&creature_ptr->spell_forgotten2);
-
-    if (z_older_than(10, 0, 5))
-        set_zangband_spells(creature_ptr);
-    else
-        rd_s16b(&creature_ptr->learned_spells);
-
-    if (z_older_than(10, 0, 6))
-        creature_ptr->add_spells = 0;
-    else
-        rd_s16b(&creature_ptr->add_spells);
-
+    load_spells(creature_ptr);
     if (creature_ptr->pclass == CLASS_MINDCRAFTER)
         creature_ptr->add_spells = 0;
 
@@ -470,7 +474,7 @@ static errr exe_reading_savefile(player_type *creature_ptr)
 
     if (rd_inventory(creature_ptr)) {
         load_note(_("持ち物情報を読み込むことができません", "Unable to read inventory"));
-        return (21);
+        return 21;
     }
 
     u16b tmp16u;
-- 
2.11.0