[Refactor] #40416 Separated slaying.c/h from melee.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0d913b9..a9b01cd 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -174,6 +174,7 @@
     <ClCompile Include="..\..\src\combat\martial-arts-table.c" />\r
     <ClCompile Include="..\..\src\combat\monster-attack-types.c" />\r
     <ClCompile Include="..\..\src\combat\attack-accuracy.c" />\r
+    <ClCompile Include="..\..\src\combat\slaying.c" />\r
     <ClCompile Include="..\..\src\io\pref-file-expressor.c" />\r
     <ClCompile Include="..\..\src\market\arena.c" />\r
     <ClCompile Include="..\..\src\market\bounty-prize-table.c" />\r
@@ -424,6 +425,7 @@
     <ClInclude Include="..\..\src\combat\monster-attack-effect.h" />\r
     <ClInclude Include="..\..\src\combat\monster-attack-types.h" />\r
     <ClInclude Include="..\..\src\combat\attack-accuracy.h" />\r
+    <ClInclude Include="..\..\src\combat\slaying.h" />\r
     <ClInclude Include="..\..\src\io\pref-file-expressor.h" />\r
     <ClInclude Include="..\..\src\market\arena.h" />\r
     <ClInclude Include="..\..\src\market\bounty-prize-table.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index a879c03..bf039f0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -986,6 +986,9 @@
     <ClCompile Include="..\..\src\combat\attack-accuracy.c">
       <Filter>combat</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\combat\slaying.c">
+      <Filter>combat</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -2041,6 +2044,9 @@
     <ClInclude Include="..\..\src\combat\attack-accuracy.h">
       <Filter>combat</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\combat\slaying.h">
+      <Filter>combat</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index cbd73f0..5fc0857 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -340,6 +340,7 @@ hengband_SOURCES = \
        combat/insults-moans.c combat/insults-moans.h \
        combat/monster-attack-effects.h \
        combat/attack-accuracy.c combat/attack-accuracy.h \
+       combat/slaying.c combat/slaying.h \
        combat/combat-options-type.h \
        combat/shoot.c combat/shoot.h \
        combat/snipe.c combat/snipe.h \

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 4b51f51..aaaacf6 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -55,6 +55,7 @@
 #include "combat/insults-moans.h"
 #include "combat/monster-attack-effect.h"
 #include "combat/attack-accuracy.h"
+#include "combat/slaying.h"
 
 #define BLOW_EFFECT_TYPE_NONE  0
 #define BLOW_EFFECT_TYPE_FEAR  1
@@ -62,127 +63,6 @@
 #define BLOW_EFFECT_TYPE_HEAL  3
 
 /*!
- * @brief プレイヤー攻撃の種族スレイング倍率計算
- * @param player_ptr プレーヤーへの参照ポインタ
- * @param mult 算出前の基本倍率(/10倍)
- * @param flgs スレイフラグ配列
- * @param m_ptr 目標モンスターの構造体参照ポインタ
- * @return スレイング加味後の倍率(/10倍)
- */
-static MULTIPLY mult_slaying(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS* flgs, monster_type* m_ptr)
-{
-       static const struct slay_table_t {
-               int slay_flag;
-               BIT_FLAGS affect_race_flag;
-               MULTIPLY slay_mult;
-               size_t flag_offset;
-               size_t r_flag_offset;
-       } slay_table[] = {
-#define OFFSET(X) offsetof(monster_race, X)
-               {TR_SLAY_ANIMAL, RF3_ANIMAL, 25, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_ANIMAL, RF3_ANIMAL, 40, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_EVIL,   RF3_EVIL,   20, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_EVIL,   RF3_EVIL,   35, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_GOOD,   RF3_GOOD,   20, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_GOOD,   RF3_GOOD,   35, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_HUMAN,  RF2_HUMAN,  25, OFFSET(flags2), OFFSET(r_flags2)},
-               {TR_KILL_HUMAN,  RF2_HUMAN,  40, OFFSET(flags2), OFFSET(r_flags2)},
-               {TR_SLAY_UNDEAD, RF3_UNDEAD, 30, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_UNDEAD, RF3_UNDEAD, 50, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_DEMON,  RF3_DEMON,  30, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_DEMON,  RF3_DEMON,  50, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_ORC,    RF3_ORC,    30, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_ORC,    RF3_ORC,    50, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_TROLL,  RF3_TROLL,  30, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_TROLL,  RF3_TROLL,  50, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_GIANT,  RF3_GIANT,  30, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_GIANT,  RF3_GIANT,  50, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_SLAY_DRAGON, RF3_DRAGON, 30, OFFSET(flags3), OFFSET(r_flags3)},
-               {TR_KILL_DRAGON, RF3_DRAGON, 50, OFFSET(flags3), OFFSET(r_flags3)},
-#undef OFFSET
-       };
-
-       monster_race* r_ptr = &r_info[m_ptr->r_idx];
-       for (size_t i = 0; i < sizeof(slay_table) / sizeof(slay_table[0]); ++i)
-       {
-               const struct slay_table_t* p = &slay_table[i];
-
-               if (!have_flag(flgs, p->slay_flag) ||
-                       !(atoffset(BIT_FLAGS, r_ptr, p->flag_offset) & p->affect_race_flag))
-                       continue;
-
-               if (is_original_ap_and_seen(player_ptr, m_ptr))
-               {
-                       atoffset(BIT_FLAGS, r_ptr, p->r_flag_offset) |= p->affect_race_flag;
-               }
-
-               mult = MAX(mult, p->slay_mult);
-       }
-
-       return mult;
-}
-
-
-/*!
- * @brief プレイヤー攻撃の属性スレイング倍率計算
- * @param player_ptr プレーヤーへの参照ポインタ
- * @param mult 算出前の基本倍率(/10倍)
- * @param flgs スレイフラグ配列
- * @param m_ptr 目標モンスターの構造体参照ポインタ
- * @return スレイング加味後の倍率(/10倍)
- */
-static MULTIPLY mult_brand(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS* flgs, monster_type* m_ptr)
-{
-       static const struct brand_table_t {
-               int brand_flag;
-               BIT_FLAGS resist_mask;
-               BIT_FLAGS hurt_flag;
-       } brand_table[] = {
-               {TR_BRAND_ACID, RFR_EFF_IM_ACID_MASK, 0U           },
-               {TR_BRAND_ELEC, RFR_EFF_IM_ELEC_MASK, 0U           },
-               {TR_BRAND_FIRE, RFR_EFF_IM_FIRE_MASK, RF3_HURT_FIRE},
-               {TR_BRAND_COLD, RFR_EFF_IM_COLD_MASK, RF3_HURT_COLD},
-               {TR_BRAND_POIS, RFR_EFF_IM_POIS_MASK, 0U           },
-       };
-
-       monster_race* r_ptr = &r_info[m_ptr->r_idx];
-       for (size_t i = 0; i < sizeof(brand_table) / sizeof(brand_table[0]); ++i)
-       {
-               const struct brand_table_t* p = &brand_table[i];
-
-               if (!have_flag(flgs, p->brand_flag)) continue;
-
-               /* Notice immunity */
-               if (r_ptr->flagsr & p->resist_mask)
-               {
-                       if (is_original_ap_and_seen(player_ptr, m_ptr))
-                       {
-                               r_ptr->r_flagsr |= (r_ptr->flagsr & p->resist_mask);
-                       }
-
-                       continue;
-               }
-
-               /* Otherwise, take the damage */
-               if (r_ptr->flags3 & p->hurt_flag)
-               {
-                       if (is_original_ap_and_seen(player_ptr, m_ptr))
-                       {
-                               r_ptr->r_flags3 |= p->hurt_flag;
-                       }
-
-                       mult = MAX(mult, 50);
-                       continue;
-               }
-
-               mult = MAX(mult, 25);
-       }
-
-       return mult;
-}
-
-
-/*!
  * @brief 剣術のスレイ倍率計算を行う /
  * Calcurate magnification of hissatsu technics
  * @param mult 剣術のスレイ効果以前に算出している多要素の倍率(/10倍)

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
new file mode 100644 (file)
index 0000000..03ea501
--- /dev/null
+++ b/src/combat/slaying.c
@@ -0,0 +1,114 @@
+#include "system/angband.h"
+#include "combat/slaying.h"
+
+/*!
+ * @brief プレイヤー攻撃の種族スレイング倍率計算
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @param mult 算出前の基本倍率(/10倍)
+ * @param flgs スレイフラグ配列
+ * @param m_ptr 目標モンスターの構造体参照ポインタ
+ * @return スレイング加味後の倍率(/10倍)
+ */
+MULTIPLY mult_slaying(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr)
+{
+    static const struct slay_table_t {
+        int slay_flag;
+        BIT_FLAGS affect_race_flag;
+        MULTIPLY slay_mult;
+        size_t flag_offset;
+        size_t r_flag_offset;
+    } slay_table[] = {
+#define OFFSET(X) offsetof(monster_race, X)
+        { TR_SLAY_ANIMAL, RF3_ANIMAL, 25, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_ANIMAL, RF3_ANIMAL, 40, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_EVIL, RF3_EVIL, 20, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_EVIL, RF3_EVIL, 35, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_GOOD, RF3_GOOD, 20, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_GOOD, RF3_GOOD, 35, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_HUMAN, RF2_HUMAN, 25, OFFSET(flags2), OFFSET(r_flags2) },
+        { TR_KILL_HUMAN, RF2_HUMAN, 40, OFFSET(flags2), OFFSET(r_flags2) },
+        { TR_SLAY_UNDEAD, RF3_UNDEAD, 30, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_UNDEAD, RF3_UNDEAD, 50, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_DEMON, RF3_DEMON, 30, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_DEMON, RF3_DEMON, 50, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_ORC, RF3_ORC, 30, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_ORC, RF3_ORC, 50, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_TROLL, RF3_TROLL, 30, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_TROLL, RF3_TROLL, 50, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_GIANT, RF3_GIANT, 30, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_GIANT, RF3_GIANT, 50, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_SLAY_DRAGON, RF3_DRAGON, 30, OFFSET(flags3), OFFSET(r_flags3) },
+        { TR_KILL_DRAGON, RF3_DRAGON, 50, OFFSET(flags3), OFFSET(r_flags3) },
+#undef OFFSET
+    };
+
+    monster_race *r_ptr = &r_info[m_ptr->r_idx];
+    for (size_t i = 0; i < sizeof(slay_table) / sizeof(slay_table[0]); ++i) {
+        const struct slay_table_t *p = &slay_table[i];
+
+        if (!have_flag(flgs, p->slay_flag) || !(atoffset(BIT_FLAGS, r_ptr, p->flag_offset) & p->affect_race_flag))
+            continue;
+
+        if (is_original_ap_and_seen(player_ptr, m_ptr)) {
+            atoffset(BIT_FLAGS, r_ptr, p->r_flag_offset) |= p->affect_race_flag;
+        }
+
+        mult = MAX(mult, p->slay_mult);
+    }
+
+    return mult;
+}
+
+/*!
+ * @brief プレイヤー攻撃の属性スレイング倍率計算
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @param mult 算出前の基本倍率(/10倍)
+ * @param flgs スレイフラグ配列
+ * @param m_ptr 目標モンスターの構造体参照ポインタ
+ * @return スレイング加味後の倍率(/10倍)
+ */
+MULTIPLY mult_brand(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr)
+{
+    static const struct brand_table_t {
+        int brand_flag;
+        BIT_FLAGS resist_mask;
+        BIT_FLAGS hurt_flag;
+    } brand_table[] = {
+        { TR_BRAND_ACID, RFR_EFF_IM_ACID_MASK, 0U },
+        { TR_BRAND_ELEC, RFR_EFF_IM_ELEC_MASK, 0U },
+        { TR_BRAND_FIRE, RFR_EFF_IM_FIRE_MASK, RF3_HURT_FIRE },
+        { TR_BRAND_COLD, RFR_EFF_IM_COLD_MASK, RF3_HURT_COLD },
+        { TR_BRAND_POIS, RFR_EFF_IM_POIS_MASK, 0U },
+    };
+
+    monster_race *r_ptr = &r_info[m_ptr->r_idx];
+    for (size_t i = 0; i < sizeof(brand_table) / sizeof(brand_table[0]); ++i) {
+        const struct brand_table_t *p = &brand_table[i];
+
+        if (!have_flag(flgs, p->brand_flag))
+            continue;
+
+        /* Notice immunity */
+        if (r_ptr->flagsr & p->resist_mask) {
+            if (is_original_ap_and_seen(player_ptr, m_ptr)) {
+                r_ptr->r_flagsr |= (r_ptr->flagsr & p->resist_mask);
+            }
+
+            continue;
+        }
+
+        /* Otherwise, take the damage */
+        if (r_ptr->flags3 & p->hurt_flag) {
+            if (is_original_ap_and_seen(player_ptr, m_ptr)) {
+                r_ptr->r_flags3 |= p->hurt_flag;
+            }
+
+            mult = MAX(mult, 50);
+            continue;
+        }
+
+        mult = MAX(mult, 25);
+    }
+
+    return mult;
+}

diff --git a/src/combat/slaying.h b/src/combat/slaying.h
new file mode 100644 (file)
index 0000000..d29a08d
--- /dev/null
+++ b/src/combat/slaying.h
@@ -0,0 +1,4 @@
+#pragma once
+
+MULTIPLY mult_slaying(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr);
+MULTIPLY mult_brand(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr);