[Refator] #40532 Separated info-writer.c/h from save.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 232168a..ec522fe 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -287,6 +287,7 @@
     <ClCompile Include="..\..\src\load\player-info-loader.c" />\r
     <ClCompile Include="..\..\src\load\store-loader.c" />\r
     <ClCompile Include="..\..\src\load\world-loader.c" />\r
+    <ClCompile Include="..\..\src\save\info-writer.c" />\r
     <ClCompile Include="..\..\src\save\item-writer.c" />\r
     <ClCompile Include="..\..\src\save\monster-writer.c" />\r
     <ClCompile Include="..\..\src\save\save-util.c" />\r
@@ -819,6 +820,7 @@
     <ClInclude Include="..\..\src\load\savedata-flag-types.h" />\r
     <ClInclude Include="..\..\src\load\store-loader.h" />\r
     <ClInclude Include="..\..\src\load\world-loader.h" />\r
+    <ClInclude Include="..\..\src\save\info-writer.h" />\r
     <ClInclude Include="..\..\src\save\item-writer.h" />\r
     <ClInclude Include="..\..\src\save\monster-writer.h" />\r
     <ClInclude Include="..\..\src\save\save-util.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 9c284ee..6ae4a8e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1793,6 +1793,9 @@
     <ClCompile Include="..\..\src\save\monster-writer.c">
       <Filter>save</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\save\info-writer.c">
+      <Filter>save</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -3916,6 +3919,9 @@
     <ClInclude Include="..\..\src\save\monster-writer.h">
       <Filter>save</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\save\info-writer.h">
+      <Filter>save</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ebeb9fd..38eb98b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -586,6 +586,7 @@ hengband_SOURCES = \
        room/rooms-pit-nest.c room/rooms-pit-nest.h \
        room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
        \
+       save/info-writer.c save/info-writer.h \
        save/item-writer.c save/item-writer.h \
        save/monster-writer.c save/monster-writer.h \
        save/save.c save/save.h \

diff --git a/src/save/info-writer.c b/src/save/info-writer.c
new file mode 100644 (file)
index 0000000..2848a5a
--- /dev/null
+++ b/src/save/info-writer.c
@@ -0,0 +1,176 @@
+#include "save/info-writer.h"
+#include "birth/quick-start.h"
+#include "game-option/cheat-options.h"
+#include "game-option/option-flags.h"
+#include "game-option/option-types-table.h"
+#include "game-option/special-options.h"
+#include "save/item-writer.h"
+#include "save/save-util.h"
+#include "store/store-util.h"
+#include "system/angband.h"
+#include "system/object-type-definition.h"
+#include "world/world.h"
+
+/*!
+ * @brief セーブデータに店舗情報を書き込む / Write a "store" record
+ * @param store_ptr 店舗情報の参照ポインタ
+ * @return なし
+ */
+void wr_store(store_type *store_ptr)
+{
+    wr_u32b(store_ptr->store_open);
+    wr_s16b(store_ptr->insult_cur);
+    wr_byte(store_ptr->owner);
+    wr_s16b(store_ptr->stock_num);
+    wr_s16b(store_ptr->good_buy);
+    wr_s16b(store_ptr->bad_buy);
+    wr_s32b(store_ptr->last_visit);
+    for (int j = 0; j < store_ptr->stock_num; j++)
+        wr_item(&store_ptr->stock[j]);
+}
+
+/*!
+ * @brief セーブデータに乱数情報を書き込む / Write RNG state
+ * @param なし
+ * @return なし
+ */
+void wr_randomizer(void)
+{
+    wr_u16b(0);
+    wr_u16b(Rand_place);
+    for (int i = 0; i < RAND_DEG; i++)
+        wr_u32b(Rand_state[i]);
+}
+
+/*!
+ * @brief ゲームオプション情報を書き込む / Write the "options"
+ * @return なし
+ */
+void wr_options(void)
+{
+    for (int i = 0; i < 4; i++)
+        wr_u32b(0L);
+
+    wr_byte(delay_factor);
+    wr_byte(hitpoint_warn);
+    wr_byte(mana_warn);
+
+    /*** Cheating options ***/
+    u16b c = 0;
+    if (current_world_ptr->wizard)
+        c |= 0x0002;
+
+    if (cheat_sight)
+        c |= 0x0040;
+
+    if (cheat_turn)
+        c |= 0x0080;
+
+    if (cheat_peek)
+        c |= 0x0100;
+
+    if (cheat_hear)
+        c |= 0x0200;
+
+    if (cheat_room)
+        c |= 0x0400;
+
+    if (cheat_xtra)
+        c |= 0x0800;
+
+    if (cheat_know)
+        c |= 0x1000;
+
+    if (cheat_live)
+        c |= 0x2000;
+
+    if (cheat_save)
+        c |= 0x4000;
+
+    if (cheat_diary_output)
+        c |= 0x8000;
+
+    wr_u16b(c);
+
+    wr_byte(autosave_l);
+    wr_byte(autosave_t);
+    wr_s16b(autosave_freq);
+
+    for (int i = 0; option_info[i].o_desc; i++) {
+        int os = option_info[i].o_set;
+        int ob = option_info[i].o_bit;
+        if (!option_info[i].o_var)
+            continue;
+
+        if (*option_info[i].o_var)
+            option_flag[os] |= (1L << ob);
+        else
+            option_flag[os] &= ~(1L << ob);
+    }
+
+    for (int i = 0; i < 8; i++)
+        wr_u32b(option_flag[i]);
+
+    for (int i = 0; i < 8; i++)
+        wr_u32b(option_mask[i]);
+
+    for (int i = 0; i < 8; i++)
+        wr_u32b(window_flag[i]);
+
+    for (int i = 0; i < 8; i++)
+        wr_u32b(window_mask[i]);
+}
+
+/*!
+ * @brief ダミー情報スキップを書き込む / Hack -- Write the "ghost" info
+ * @return なし
+ */
+void wr_ghost(void)
+{
+    wr_string(_("不正なゴースト", "Broken Ghost"));
+    for (int i = 0; i < 60; i++)
+        wr_byte(0);
+}
+
+/*!
+ * @brief クイック・スタート情報を書き込む / Save quick start data
+ * @return なし
+ */
+void save_quick_start(void)
+{
+    wr_byte(previous_char.psex);
+    wr_byte((byte)previous_char.prace);
+    wr_byte((byte)previous_char.pclass);
+    wr_byte((byte)previous_char.pseikaku);
+    wr_byte((byte)previous_char.realm1);
+    wr_byte((byte)previous_char.realm2);
+
+    wr_s16b(previous_char.age);
+    wr_s16b(previous_char.ht);
+    wr_s16b(previous_char.wt);
+    wr_s16b(previous_char.sc);
+    wr_s32b(previous_char.au);
+
+    for (int i = 0; i < A_MAX; i++)
+        wr_s16b(previous_char.stat_max[i]);
+
+    for (int i = 0; i < A_MAX; i++)
+        wr_s16b(previous_char.stat_max_max[i]);
+
+    for (int i = 0; i < PY_MAX_LEVEL; i++)
+        wr_s16b((s16b)previous_char.player_hp[i]);
+
+    wr_s16b(previous_char.chaos_patron);
+    for (int i = 0; i < 8; i++)
+        wr_s16b(previous_char.vir_types[i]);
+
+    for (int i = 0; i < 4; i++)
+        wr_string(previous_char.history[i]);
+
+    /* UNUSED : Was number of random quests */
+    wr_byte(0);
+    if (current_world_ptr->noscore)
+        previous_char.quick_ok = FALSE;
+
+    wr_byte((byte)previous_char.quick_ok);
+}

diff --git a/src/save/info-writer.h b/src/save/info-writer.h
new file mode 100644 (file)
index 0000000..5689053
--- /dev/null
+++ b/src/save/info-writer.h
@@ -0,0 +1,8 @@
+#pragma once
+
+typedef struct store_type store_type;
+void wr_store(store_type *store_ptr);
+void wr_randomizer(void);
+void wr_options(void);
+void wr_ghost(void);
+void save_quick_start(void);

diff --git a/src/save/save.c b/src/save/save.c
index 5613a19..98bfd8e 100644 (file)
--- a/src/save/save.c
+++ b/src/save/save.c
@@ -40,6 +40,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "object/object-kind.h"
+#include "save/info-writer.h"
 #include "save/item-writer.h"
 #include "save/monster-writer.h"
 #include "save/save-util.h"
@@ -55,171 +56,6 @@
 #include "world/world.h"
 
 /*!
- * @brief セーブデータに店舗情報を書き込む / Write a "store" record
- * @param store_ptr 店舗情報の参照ポインタ
- * @return なし
- */
-static void wr_store(store_type *store_ptr)
-{
-    wr_u32b(store_ptr->store_open);
-    wr_s16b(store_ptr->insult_cur);
-    wr_byte(store_ptr->owner);
-    wr_s16b(store_ptr->stock_num);
-    wr_s16b(store_ptr->good_buy);
-    wr_s16b(store_ptr->bad_buy);
-    wr_s32b(store_ptr->last_visit);
-    for (int j = 0; j < store_ptr->stock_num; j++)
-        wr_item(&store_ptr->stock[j]);
-}
-
-/*!
- * @brief セーブデータに乱数情報を書き込む / Write RNG state
- * @return 常に0(成功を返す)
- */
-static errr wr_randomizer(void)
-{
-    wr_u16b(0);
-    wr_u16b(Rand_place);
-    for (int i = 0; i < RAND_DEG; i++)
-        wr_u32b(Rand_state[i]);
-
-    return 0;
-}
-
-/*!
- * @brief ゲームオプション情報を書き込む / Write the "options"
- * @return なし
- */
-static void wr_options(void)
-{
-    for (int i = 0; i < 4; i++)
-        wr_u32b(0L);
-
-    wr_byte(delay_factor);
-    wr_byte(hitpoint_warn);
-    wr_byte(mana_warn);
-
-    /*** Cheating options ***/
-    u16b c = 0;
-    if (current_world_ptr->wizard)
-        c |= 0x0002;
-
-    if (cheat_sight)
-        c |= 0x0040;
-
-    if (cheat_turn)
-        c |= 0x0080;
-
-    if (cheat_peek)
-        c |= 0x0100;
-
-    if (cheat_hear)
-        c |= 0x0200;
-
-    if (cheat_room)
-        c |= 0x0400;
-
-    if (cheat_xtra)
-        c |= 0x0800;
-
-    if (cheat_know)
-        c |= 0x1000;
-
-    if (cheat_live)
-        c |= 0x2000;
-
-    if (cheat_save)
-        c |= 0x4000;
-
-    if (cheat_diary_output)
-        c |= 0x8000;
-
-    wr_u16b(c);
-
-    wr_byte(autosave_l);
-    wr_byte(autosave_t);
-    wr_s16b(autosave_freq);
-
-    for (int i = 0; option_info[i].o_desc; i++) {
-        int os = option_info[i].o_set;
-        int ob = option_info[i].o_bit;
-        if (!option_info[i].o_var)
-            continue;
-
-        if (*option_info[i].o_var)
-            option_flag[os] |= (1L << ob);
-        else
-            option_flag[os] &= ~(1L << ob);
-    }
-
-    for (int i = 0; i < 8; i++)
-        wr_u32b(option_flag[i]);
-
-    for (int i = 0; i < 8; i++)
-        wr_u32b(option_mask[i]);
-
-    for (int i = 0; i < 8; i++)
-        wr_u32b(window_flag[i]);
-
-    for (int i = 0; i < 8; i++)
-        wr_u32b(window_mask[i]);
-}
-
-/*!
- * @brief ダミー情報スキップを書き込む / Hack -- Write the "ghost" info
- * @return なし
- */
-static void wr_ghost(void)
-{
-    wr_string(_("不正なゴースト", "Broken Ghost"));
-    for (int i = 0; i < 60; i++)
-        wr_byte(0);
-}
-
-/*!
- * @brief クイック・スタート情報を書き込む / Save quick start data
- * @return なし
- */
-static void save_quick_start(void)
-{
-    wr_byte(previous_char.psex);
-    wr_byte((byte)previous_char.prace);
-    wr_byte((byte)previous_char.pclass);
-    wr_byte((byte)previous_char.pseikaku);
-    wr_byte((byte)previous_char.realm1);
-    wr_byte((byte)previous_char.realm2);
-
-    wr_s16b(previous_char.age);
-    wr_s16b(previous_char.ht);
-    wr_s16b(previous_char.wt);
-    wr_s16b(previous_char.sc);
-    wr_s32b(previous_char.au);
-
-    for (int i = 0; i < A_MAX; i++)
-        wr_s16b(previous_char.stat_max[i]);
-
-    for (int i = 0; i < A_MAX; i++)
-        wr_s16b(previous_char.stat_max_max[i]);
-
-    for (int i = 0; i < PY_MAX_LEVEL; i++)
-        wr_s16b((s16b)previous_char.player_hp[i]);
-
-    wr_s16b(previous_char.chaos_patron);
-    for (int i = 0; i < 8; i++)
-        wr_s16b(previous_char.vir_types[i]);
-
-    for (int i = 0; i < 4; i++)
-        wr_string(previous_char.history[i]);
-
-    /* UNUSED : Was number of random quests */
-    wr_byte(0);
-    if (current_world_ptr->noscore)
-        previous_char.quick_ok = FALSE;
-
-    wr_byte((byte)previous_char.quick_ok);
-}
-
-/*!
  * @brief その他の情報を書き込む / Write some "extra" info
  * @return なし
  */