[Refactor] #40467 Moved load_store() from load.c to store-loader.c/h

diff --git a/src/savedata/load.c b/src/savedata/load.c
index 350cb29..cc2f476 100644 (file)
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -391,20 +391,6 @@ static void load_spells(player_type *creature_ptr)
         rd_s16b(&creature_ptr->add_spells);
 }
 
-static errr load_store(player_type *creature_ptr)
-{
-    u16b tmp16u;
-    rd_u16b(&tmp16u);
-    int town_count = tmp16u;
-    rd_u16b(&tmp16u);
-    for (int i = 1; i < town_count; i++)
-        for (int j = 0; j < tmp16u; j++)
-            if (rd_store(creature_ptr, i, j))
-                return 22;
-
-    return 0;
-}
-
 static errr verify_checksum()
 {
     u32b n_v_check = v_check;

diff --git a/src/savedata/store-loader.c b/src/savedata/store-loader.c
index 9cae3df..57f4a37 100644 (file)
--- a/src/savedata/store-loader.c
+++ b/src/savedata/store-loader.c
@@ -62,7 +62,7 @@ static void home_carry_load(player_type *player_ptr, store_type *store_ptr, obje
  * @param store_number 店舗ID
  * @return エラーID
  */
-errr rd_store(player_type *player_ptr, int town_number, int store_number)
+static errr rd_store(player_type *player_ptr, int town_number, int store_number)
 {
     store_type *store_ptr;
     bool sort = FALSE;
@@ -116,3 +116,17 @@ errr rd_store(player_type *player_ptr, int town_number, int store_number)
 
     return 0;
 }
+
+errr load_store(player_type *creature_ptr)
+{
+    u16b tmp16u;
+    rd_u16b(&tmp16u);
+    int town_count = tmp16u;
+    rd_u16b(&tmp16u);
+    for (int i = 1; i < town_count; i++)
+        for (int j = 0; j < tmp16u; j++)
+            if (rd_store(creature_ptr, i, j))
+                return 22;
+
+    return 0;
+}

diff --git a/src/savedata/store-loader.h b/src/savedata/store-loader.h
index 81b304f..cfc6992 100644 (file)
--- a/src/savedata/store-loader.h
+++ b/src/savedata/store-loader.h
@@ -3,4 +3,4 @@
 #include "system/angband.h"
 #include "store/store-util.h"
 
-errr rd_store(player_type *player_ptr, int town_number, int store_number);
+errr load_store(player_type *creature_ptr);