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

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 5e731ef..d702e83 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -240,6 +240,7 @@
     <ClCompile Include="..\..\src\savedata\item-loader.c" />\r
     <ClCompile Include="..\..\src\savedata\load-util.c" />\r
     <ClCompile Include="..\..\src\savedata\load-v1-5-0.c" />\r
+    <ClCompile Include="..\..\src\savedata\monster-loader.c" />\r
     <ClCompile Include="..\..\src\specific-object\death-crimson.c" />\r
     <ClCompile Include="..\..\src\spell-kind\blood-curse.c" />\r
     <ClCompile Include="..\..\src\spell-kind\spells-enchant.c" />\r
@@ -702,6 +703,7 @@
     <ClInclude Include="..\..\src\savedata\item-loader.h" />\r
     <ClInclude Include="..\..\src\savedata\load-util.h" />\r
     <ClInclude Include="..\..\src\savedata\load-v1-5-0.h" />\r
+    <ClInclude Include="..\..\src\savedata\monster-loader.h" />\r
     <ClInclude Include="..\..\src\savedata\old-feature-types.h" />\r
     <ClInclude Include="..\..\src\savedata\savedata-flag-types.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 5f59802..f3fa316 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1613,6 +1613,9 @@
     <ClCompile Include="..\..\src\savedata\item-loader.c">
       <Filter>savedata</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\savedata\monster-loader.c">
+      <Filter>savedata</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3529,6 +3532,9 @@
     <ClInclude Include="..\..\src\savedata\savedata-flag-types.h">
       <Filter>savedata</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\savedata\monster-loader.h">
+      <Filter>savedata</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ebbd92..08b4f04 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -521,6 +521,7 @@ hengband_SOURCES = \
        \
        savedata/angband-version-comparer.c savedata/angband-version-comparer.h \
        savedata/item-loader.c savedata/item-loader.h \
+       savedata/monster-loader.c savedata/monster-loader.h \
        savedata/old-feature-types.h \
        savedata/load-util.c savedata/load-util.h \
        savedata/load-v1-5-0.c savedata/load-v1-5-0.h \

diff --git a/src/savedata/load.c b/src/savedata/load.c
index fe7efe5..20b1450 100644 (file)
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -76,6 +76,7 @@
 #include "savedata/angband-version-comparer.h"
 #include "savedata/item-loader.h"
 #include "savedata/load-util.h"
+#include "savedata/monster-loader.h"
 #include "savedata/old-feature-types.h"
 #include "savedata/savedata-flag-types.h"
 #include "savedata/save.h"
@@ -102,142 +103,6 @@ static const int OLD_QUEST_WATER_CAVE = 18; // 湖の洞窟.
 static const int QUEST_OLD_CASTLE = 27; // 古い城.
 static const int QUEST_ROYAL_CRYPT = 28; // 王家の墓.
 
-/*!
- * @brief モンスターを読み込む(現版) / Read a monster (New method)
- * @param player_ptr プレーヤーへの参照ポインタ
- * @param m_ptr モンスター保存先ポインタ
- * @return なし
- */
-static void rd_monster(player_type *player_ptr, monster_type *m_ptr)
-{
-    if (h_older_than(1, 5, 0, 0)) {
-        rd_monster_old(player_ptr, m_ptr);
-        return;
-    }
-
-    BIT_FLAGS flags;
-    rd_u32b(&flags);
-    rd_s16b(&m_ptr->r_idx);
-    byte tmp8u;
-    rd_byte(&tmp8u);
-    m_ptr->fy = (POSITION)tmp8u;
-    rd_byte(&tmp8u);
-    m_ptr->fx = (POSITION)tmp8u;
-
-    s16b tmp16s;
-    rd_s16b(&tmp16s);
-    m_ptr->hp = (HIT_POINT)tmp16s;
-    rd_s16b(&tmp16s);
-    m_ptr->maxhp = (HIT_POINT)tmp16s;
-    rd_s16b(&tmp16s);
-    m_ptr->max_maxhp = (HIT_POINT)tmp16s;
-
-    if (h_older_than(2, 1, 2, 1)) {
-        m_ptr->dealt_damage = 0;
-    } else {
-        rd_s32b(&m_ptr->dealt_damage);
-    }
-
-    if (flags & SAVE_MON_AP_R_IDX)
-        rd_s16b(&m_ptr->ap_r_idx);
-    else
-        m_ptr->ap_r_idx = m_ptr->r_idx;
-
-    if (flags & SAVE_MON_SUB_ALIGN)
-        rd_byte(&m_ptr->sub_align);
-    else
-        m_ptr->sub_align = 0;
-
-    if (flags & SAVE_MON_CSLEEP)
-        rd_s16b(&m_ptr->mtimed[MTIMED_CSLEEP]);
-    else
-        m_ptr->mtimed[MTIMED_CSLEEP] = 0;
-
-    rd_byte(&tmp8u);
-    m_ptr->mspeed = tmp8u;
-
-    rd_s16b(&m_ptr->energy_need);
-
-    if (flags & SAVE_MON_FAST) {
-        rd_byte(&tmp8u);
-        m_ptr->mtimed[MTIMED_FAST] = (s16b)tmp8u;
-    } else
-        m_ptr->mtimed[MTIMED_FAST] = 0;
-
-    if (flags & SAVE_MON_SLOW) {
-        rd_byte(&tmp8u);
-        m_ptr->mtimed[MTIMED_SLOW] = (s16b)tmp8u;
-    } else
-        m_ptr->mtimed[MTIMED_SLOW] = 0;
-
-    if (flags & SAVE_MON_STUNNED) {
-        rd_byte(&tmp8u);
-        m_ptr->mtimed[MTIMED_STUNNED] = (s16b)tmp8u;
-    } else
-        m_ptr->mtimed[MTIMED_STUNNED] = 0;
-
-    if (flags & SAVE_MON_CONFUSED) {
-        rd_byte(&tmp8u);
-        m_ptr->mtimed[MTIMED_CONFUSED] = (s16b)tmp8u;
-    } else
-        m_ptr->mtimed[MTIMED_CONFUSED] = 0;
-
-    if (flags & SAVE_MON_MONFEAR) {
-        rd_byte(&tmp8u);
-        m_ptr->mtimed[MTIMED_MONFEAR] = (s16b)tmp8u;
-    } else
-        m_ptr->mtimed[MTIMED_MONFEAR] = 0;
-
-    if (flags & SAVE_MON_TARGET_Y) {
-        rd_s16b(&tmp16s);
-        m_ptr->target_y = (POSITION)tmp16s;
-    } else
-        m_ptr->target_y = 0;
-
-    if (flags & SAVE_MON_TARGET_X) {
-        rd_s16b(&tmp16s);
-        m_ptr->target_x = (POSITION)tmp16s;
-    } else
-        m_ptr->target_x = 0;
-
-    if (flags & SAVE_MON_INVULNER) {
-        rd_byte(&tmp8u);
-        m_ptr->mtimed[MTIMED_INVULNER] = (s16b)tmp8u;
-    } else
-        m_ptr->mtimed[MTIMED_INVULNER] = 0;
-
-    if (flags & SAVE_MON_SMART)
-        rd_u32b(&m_ptr->smart);
-    else
-        m_ptr->smart = 0;
-
-    if (flags & SAVE_MON_EXP) {
-        u32b tmp32u;
-        rd_u32b(&tmp32u);
-        m_ptr->exp = (EXP)tmp32u;
-    } else
-        m_ptr->exp = 0;
-
-    m_ptr->mflag = 0; /* Not saved */
-
-    if (flags & SAVE_MON_MFLAG2)
-        rd_byte(&m_ptr->mflag2);
-    else
-        m_ptr->mflag2 = 0;
-
-    if (flags & SAVE_MON_NICKNAME) {
-        char buf[128];
-        rd_string(buf, sizeof(buf));
-        m_ptr->nickname = quark_add(buf);
-    } else
-        m_ptr->nickname = 0;
-
-    if (flags & SAVE_MON_PARENT)
-        rd_s16b(&m_ptr->parent_m_idx);
-    else
-        m_ptr->parent_m_idx = 0;
-}
-
 /*
  * Old monster bit flags of racial resistances
  */

diff --git a/src/savedata/monster-loader.c b/src/savedata/monster-loader.c
new file mode 100644 (file)
index 0000000..0e7e4aa
--- /dev/null
+++ b/src/savedata/monster-loader.c
@@ -0,0 +1,142 @@
+#include "savedata/monster-loader.h"
+#include "savedata/angband-version-comparer.h"
+#include "savedata/load-v1-5-0.h"
+#include "savedata/load-util.h"
+#include "savedata/savedata-flag-types.h"
+#include "util/quarks.h"
+
+/*!
+ * @brief モンスターを読み込む(現版) / Read a monster (New method)
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @param m_ptr モンスター保存先ポインタ
+ * @return なし
+ */
+void rd_monster(player_type *player_ptr, monster_type *m_ptr)
+{
+    if (h_older_than(1, 5, 0, 0)) {
+        rd_monster_old(player_ptr, m_ptr);
+        return;
+    }
+
+    BIT_FLAGS flags;
+    rd_u32b(&flags);
+    rd_s16b(&m_ptr->r_idx);
+    byte tmp8u;
+    rd_byte(&tmp8u);
+    m_ptr->fy = (POSITION)tmp8u;
+    rd_byte(&tmp8u);
+    m_ptr->fx = (POSITION)tmp8u;
+
+    s16b tmp16s;
+    rd_s16b(&tmp16s);
+    m_ptr->hp = (HIT_POINT)tmp16s;
+    rd_s16b(&tmp16s);
+    m_ptr->maxhp = (HIT_POINT)tmp16s;
+    rd_s16b(&tmp16s);
+    m_ptr->max_maxhp = (HIT_POINT)tmp16s;
+
+    if (h_older_than(2, 1, 2, 1)) {
+        m_ptr->dealt_damage = 0;
+    } else {
+        rd_s32b(&m_ptr->dealt_damage);
+    }
+
+    if (flags & SAVE_MON_AP_R_IDX)
+        rd_s16b(&m_ptr->ap_r_idx);
+    else
+        m_ptr->ap_r_idx = m_ptr->r_idx;
+
+    if (flags & SAVE_MON_SUB_ALIGN)
+        rd_byte(&m_ptr->sub_align);
+    else
+        m_ptr->sub_align = 0;
+
+    if (flags & SAVE_MON_CSLEEP)
+        rd_s16b(&m_ptr->mtimed[MTIMED_CSLEEP]);
+    else
+        m_ptr->mtimed[MTIMED_CSLEEP] = 0;
+
+    rd_byte(&tmp8u);
+    m_ptr->mspeed = tmp8u;
+
+    rd_s16b(&m_ptr->energy_need);
+
+    if (flags & SAVE_MON_FAST) {
+        rd_byte(&tmp8u);
+        m_ptr->mtimed[MTIMED_FAST] = (s16b)tmp8u;
+    } else
+        m_ptr->mtimed[MTIMED_FAST] = 0;
+
+    if (flags & SAVE_MON_SLOW) {
+        rd_byte(&tmp8u);
+        m_ptr->mtimed[MTIMED_SLOW] = (s16b)tmp8u;
+    } else
+        m_ptr->mtimed[MTIMED_SLOW] = 0;
+
+    if (flags & SAVE_MON_STUNNED) {
+        rd_byte(&tmp8u);
+        m_ptr->mtimed[MTIMED_STUNNED] = (s16b)tmp8u;
+    } else
+        m_ptr->mtimed[MTIMED_STUNNED] = 0;
+
+    if (flags & SAVE_MON_CONFUSED) {
+        rd_byte(&tmp8u);
+        m_ptr->mtimed[MTIMED_CONFUSED] = (s16b)tmp8u;
+    } else
+        m_ptr->mtimed[MTIMED_CONFUSED] = 0;
+
+    if (flags & SAVE_MON_MONFEAR) {
+        rd_byte(&tmp8u);
+        m_ptr->mtimed[MTIMED_MONFEAR] = (s16b)tmp8u;
+    } else
+        m_ptr->mtimed[MTIMED_MONFEAR] = 0;
+
+    if (flags & SAVE_MON_TARGET_Y) {
+        rd_s16b(&tmp16s);
+        m_ptr->target_y = (POSITION)tmp16s;
+    } else
+        m_ptr->target_y = 0;
+
+    if (flags & SAVE_MON_TARGET_X) {
+        rd_s16b(&tmp16s);
+        m_ptr->target_x = (POSITION)tmp16s;
+    } else
+        m_ptr->target_x = 0;
+
+    if (flags & SAVE_MON_INVULNER) {
+        rd_byte(&tmp8u);
+        m_ptr->mtimed[MTIMED_INVULNER] = (s16b)tmp8u;
+    } else
+        m_ptr->mtimed[MTIMED_INVULNER] = 0;
+
+    if (flags & SAVE_MON_SMART)
+        rd_u32b(&m_ptr->smart);
+    else
+        m_ptr->smart = 0;
+
+    if (flags & SAVE_MON_EXP) {
+        u32b tmp32u;
+        rd_u32b(&tmp32u);
+        m_ptr->exp = (EXP)tmp32u;
+    } else
+        m_ptr->exp = 0;
+
+    m_ptr->mflag = 0; /* Not saved */
+
+    if (flags & SAVE_MON_MFLAG2)
+        rd_byte(&m_ptr->mflag2);
+    else
+        m_ptr->mflag2 = 0;
+
+    if (flags & SAVE_MON_NICKNAME) {
+        char buf[128];
+        rd_string(buf, sizeof(buf));
+        m_ptr->nickname = quark_add(buf);
+    } else
+        m_ptr->nickname = 0;
+
+    if (flags & SAVE_MON_PARENT)
+        rd_s16b(&m_ptr->parent_m_idx);
+    else
+        m_ptr->parent_m_idx = 0;
+}

diff --git a/src/savedata/monster-loader.h b/src/savedata/monster-loader.h
new file mode 100644 (file)
index 0000000..838c8cd
--- /dev/null
+++ b/src/savedata/monster-loader.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "system/angband.h"
+#include "system/monster-type-definition.h"
+
+void rd_monster(player_type *player_ptr, monster_type *m_ptr);