[Refactor] #37353 mon_damage_mod() を monster-status.c/h へ移動。 / Move mon_damage_mod...

diff --git a/src/externs.h b/src/externs.h
index 8aea043..4f8d358 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1268,7 +1268,6 @@ extern bool get_rep_dir(DIRECTION *dp, bool under);
 extern bool tgt_pt(POSITION *x, POSITION *y);
 extern void do_poly_wounds(void);
 extern void change_race(CHARACTER_IDX new_race, concptr effect_msg);
-extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear);
 extern ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval);
 extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval);
 extern void display_rumor(bool ex);

diff --git a/src/monster-status.c b/src/monster-status.c
index 6c7ef8a..16650a2 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -6,6 +6,51 @@
 #include "object-curse.h"
 
 
+
+/*!
+ * @brief モンスターに与えたダメージの修正処理 /
+ * Modify the physical damage done to the monster.
+ * @param m_ptr ダメージを受けるモンスターの構造体参照ポインタ
+ * @param dam ダメージ基本値
+ * @param is_psy_spear 攻撃手段が光の剣ならばTRUE
+ * @return 修正を行った結果のダメージ量
+ * @details
+ * <pre>
+ * (for example when it's invulnerable or shielded)
+ * ToDo: Accept a damage-type to calculate the modified damage from
+ * things like fire, frost, lightning, poison, ... attacks.
+ * "type" is not yet used and should be 0.
+ * </pre>
+ */
+HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear)
+{
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+       if ((r_ptr->flagsr & RFR_RES_ALL) && dam > 0)
+       {
+               dam /= 100;
+               if ((dam == 0) && one_in_(3)) dam = 1;
+       }
+
+       if (MON_INVULNER(m_ptr))
+       {
+               if (is_psy_spear)
+               {
+                       if (!p_ptr->blind && is_seen(m_ptr))
+                       {
+                               msg_print(_("バリアを切り裂いた！", "The barrier is penetrated!"));
+                       }
+               }
+               else if (!one_in_(PENETRATE_INVULNERABILITY))
+               {
+                       return (0);
+               }
+       }
+       return (dam);
+}
+
+
+
 /*!
  * @brief モンスターに与えたダメージを元に経験値を加算する /
  * Calculate experience point to be get

diff --git a/src/monster-status.h b/src/monster-status.h
index fc5a8e1..753349b 100644 (file)
--- a/src/monster-status.h
+++ b/src/monster-status.h
@@ -1,4 +1,5 @@
 \r
+extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear);\r
 extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note);\r
 extern int get_mproc_idx(MONSTER_IDX m_idx, int mproc_type);\r
 \r

diff --git a/src/xtra2.c b/src/xtra2.c
index 67a49c5..d4ca9bd 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -216,50 +216,6 @@ concptr extract_note_dies(MONRACE_IDX r_idx)
 }
 
 
-/*!
- * @brief モンスターに与えたダメージの修正処理 /
- * Modify the physical damage done to the monster.
- * @param m_ptr ダメージを受けるモンスターの構造体参照ポインタ
- * @param dam ダメージ基本値
- * @param is_psy_spear 攻撃手段が光の剣ならばTRUE
- * @return 修正を行った結果のダメージ量
- * @details
- * <pre>
- * (for example when it's invulnerable or shielded)
- * ToDo: Accept a damage-type to calculate the modified damage from
- * things like fire, frost, lightning, poison, ... attacks.
- * "type" is not yet used and should be 0.
- * </pre>
- */
-HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear)
-{
-       monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-
-       if ((r_ptr->flagsr & RFR_RES_ALL) && dam > 0)
-       {
-               dam /= 100;
-               if ((dam == 0) && one_in_(3)) dam = 1;
-       }
-
-       if (MON_INVULNER(m_ptr))
-       {
-               if (is_psy_spear)
-               {
-                       if (!p_ptr->blind && is_seen(m_ptr))
-                       {
-                               msg_print(_("バリアを切り裂いた！", "The barrier is penetrated!"));
-                       }
-               }
-               else if (!one_in_(PENETRATE_INVULNERABILITY))
-               {
-                       return (0);
-               }
-       }
-       return (dam);
-}
-
-
-
 
 /*!
  * @brief 現在のコンソール表示の縦横を返す。 /