[Refactor] #40467 Separated player-info-loader.c/h from load.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index d14a270..484f685 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -248,6 +248,7 @@
     <ClCompile Include="..\..\src\savedata\lore-loader.c" />\r
     <ClCompile Include="..\..\src\savedata\monster-loader.c" />\r
     <ClCompile Include="..\..\src\savedata\option-loader.c" />\r
+    <ClCompile Include="..\..\src\savedata\player-info-loader.c" />\r
     <ClCompile Include="..\..\src\savedata\store-loader.c" />\r
     <ClCompile Include="..\..\src\specific-object\death-crimson.c" />\r
     <ClCompile Include="..\..\src\spell-kind\blood-curse.c" />\r
@@ -720,6 +721,7 @@
     <ClInclude Include="..\..\src\savedata\monster-loader.h" />\r
     <ClInclude Include="..\..\src\savedata\old-feature-types.h" />\r
     <ClInclude Include="..\..\src\savedata\option-loader.h" />\r
+    <ClInclude Include="..\..\src\savedata\player-info-loader.h" />\r
     <ClInclude Include="..\..\src\savedata\savedata-flag-types.h" />\r
     <ClInclude Include="..\..\src\savedata\store-loader.h" />\r
     <ClInclude Include="..\..\src\specific-object\death-crimson.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 45a7668..297c737 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1640,6 +1640,9 @@
     <ClCompile Include="..\..\src\savedata\load-v1-7-0.c">
       <Filter>savedata</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\savedata\player-info-loader.c">
+      <Filter>savedata</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3583,6 +3586,9 @@
     <ClInclude Include="..\..\src\savedata\load-v1-7-0.h">
       <Filter>savedata</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\savedata\player-info-loader.h">
+      <Filter>savedata</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5591583..aaf7670 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -532,6 +532,7 @@ hengband_SOURCES = \
        savedata/load.c savedata/load.h \
        savedata/lore-loader.c savedata/lore-loader.h \
        savedata/option-loader.c savedata/option-loader.h \
+       savedata/player-info-loader.c savedata/player-info-loader.h \
        savedata/savedata-flag-types.h \
        savedata/save.c savedata/save.h \
        savedata/store-loader.c savedata/store-loader.h \

diff --git a/src/savedata/extra-loader.c b/src/savedata/extra-loader.c
index 3538231..8081d83 100644 (file)
--- a/src/savedata/extra-loader.c
+++ b/src/savedata/extra-loader.c
@@ -205,52 +205,6 @@ static void rd_dummy_monsters(player_type *creature_ptr)
     }
 }
 
-static void rd_base_info(player_type *creature_ptr)
-{
-    rd_string(creature_ptr->name, sizeof(creature_ptr->name));
-    rd_string(creature_ptr->died_from, sizeof(creature_ptr->died_from));
-    if (!h_older_than(1, 7, 0, 1)) {
-        char buf[1024];
-        rd_string(buf, sizeof buf);
-        if (buf[0])
-            creature_ptr->last_message = string_make(buf);
-    }
-
-    load_quick_start();
-    const int max_history_lines = 4;
-    for (int i = 0; i < max_history_lines; i++)
-        rd_string(creature_ptr->history[i], sizeof(creature_ptr->history[i]));
-
-    byte tmp8u;
-    rd_byte(&tmp8u);
-    creature_ptr->prace = (player_race_type)tmp8u;
-
-    rd_byte(&tmp8u);
-    creature_ptr->pclass = (player_class_type)tmp8u;
-
-    rd_byte(&tmp8u);
-    creature_ptr->pseikaku = (player_personality_type)tmp8u;
-
-    rd_byte(&creature_ptr->psex);
-    rd_byte(&tmp8u);
-    creature_ptr->realm1 = (REALM_IDX)tmp8u;
-
-    rd_byte(&tmp8u);
-    creature_ptr->realm2 = (REALM_IDX)tmp8u;
-
-    rd_byte(&tmp8u);
-    if (z_older_than(10, 4, 4))
-        set_zangband_realm(creature_ptr);
-
-    rd_byte(&tmp8u);
-    creature_ptr->hitdie = (DICE_SID)tmp8u;
-    rd_u16b(&creature_ptr->expfact);
-
-    rd_s16b(&creature_ptr->age);
-    rd_s16b(&creature_ptr->ht);
-    rd_s16b(&creature_ptr->wt);
-}
-
 /*!
  * @brief その他の情報を読み込む / Read the "extra" information
  * @param creature_ptr プレーヤーへの参照ポインタ
@@ -258,7 +212,6 @@ static void rd_base_info(player_type *creature_ptr)
  */
 void rd_extra(player_type *creature_ptr)
 {
-    rd_base_info(creature_ptr);
     rd_base_status(creature_ptr);
     strip_bytes(24);
     rd_s32b(&creature_ptr->au);

diff --git a/src/savedata/load.c b/src/savedata/load.c
index 9e92f59..b6a40d9 100644 (file)
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -84,6 +84,7 @@
 #include "savedata/monster-loader.h"
 #include "savedata/old-feature-types.h"
 #include "savedata/option-loader.h"
+#include "savedata/player-info-loader.h"
 #include "savedata/save.h"
 #include "savedata/savedata-flag-types.h"
 #include "savedata/store-loader.h"
@@ -1051,6 +1052,7 @@ static errr rd_savefile_new_aux(player_type *creature_ptr)
     if (arg_fiddle)
         load_note(_("伝説のアイテムをロードしました", "Loaded Artifacts"));
 
+    rd_base_info(creature_ptr);
     rd_extra(creature_ptr);
     if (creature_ptr->energy_need < -999)
         creature_ptr->timewalk = TRUE;

diff --git a/src/savedata/player-info-loader.c b/src/savedata/player-info-loader.c
new file mode 100644 (file)
index 0000000..6542b70
--- /dev/null
+++ b/src/savedata/player-info-loader.c
@@ -0,0 +1,51 @@
+#include "savedata/player-info-loader.h"
+#include "savedata/angband-version-comparer.h"
+#include "savedata/birth-loader.h"
+#include "savedata/load-util.h"
+#include "savedata/load-zangband.h"
+
+void rd_base_info(player_type *creature_ptr)
+{
+    rd_string(creature_ptr->name, sizeof(creature_ptr->name));
+    rd_string(creature_ptr->died_from, sizeof(creature_ptr->died_from));
+    if (!h_older_than(1, 7, 0, 1)) {
+        char buf[1024];
+        rd_string(buf, sizeof buf);
+        if (buf[0])
+            creature_ptr->last_message = string_make(buf);
+    }
+
+    load_quick_start();
+    const int max_history_lines = 4;
+    for (int i = 0; i < max_history_lines; i++)
+        rd_string(creature_ptr->history[i], sizeof(creature_ptr->history[i]));
+
+    byte tmp8u;
+    rd_byte(&tmp8u);
+    creature_ptr->prace = (player_race_type)tmp8u;
+
+    rd_byte(&tmp8u);
+    creature_ptr->pclass = (player_class_type)tmp8u;
+
+    rd_byte(&tmp8u);
+    creature_ptr->pseikaku = (player_personality_type)tmp8u;
+
+    rd_byte(&creature_ptr->psex);
+    rd_byte(&tmp8u);
+    creature_ptr->realm1 = (REALM_IDX)tmp8u;
+
+    rd_byte(&tmp8u);
+    creature_ptr->realm2 = (REALM_IDX)tmp8u;
+
+    rd_byte(&tmp8u);
+    if (z_older_than(10, 4, 4))
+        set_zangband_realm(creature_ptr);
+
+    rd_byte(&tmp8u);
+    creature_ptr->hitdie = (DICE_SID)tmp8u;
+    rd_u16b(&creature_ptr->expfact);
+
+    rd_s16b(&creature_ptr->age);
+    rd_s16b(&creature_ptr->ht);
+    rd_s16b(&creature_ptr->wt);
+}

diff --git a/src/savedata/player-info-loader.h b/src/savedata/player-info-loader.h
new file mode 100644 (file)
index 0000000..9aca681
--- /dev/null
+++ b/src/savedata/player-info-loader.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "system/angband.h"
+
+void rd_base_info(player_type *creature_ptr);