[Refactor] #1469 Moved multiply_barrier() from global to RealmHex

diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp
index 7288aa2..6989a85 100644 (file)
--- a/src/monster/monster-processor.cpp
+++ b/src/monster/monster-processor.cpp
@@ -410,7 +410,7 @@ bool decide_monster_multiplication(player_type *target_ptr, MONSTER_IDX m_idx, P
         }
     }
 
-    if (multiply_barrier(target_ptr, m_idx))
+    if (RealmHex(target_ptr).multiply_barrier(m_idx))
         k = 8;
 
     if ((k < 4) && (!k || !randint0(k * MON_MULT_ADJ))) {

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index b8d68b8..a7ce4fc 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -363,7 +363,7 @@ bool RealmHex::magic_barrier(MONSTER_IDX m_idx)
  * @param m_idx 判定の対象となるモンスターID
  * @return 反増殖の効果が適用されるならTRUEを返す
  */
-bool multiply_barrier(player_type *caster_ptr, MONSTER_IDX m_idx)
+bool RealmHex::multiply_barrier(MONSTER_IDX m_idx)
 {
     monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx];
     monster_race *r_ptr = &r_info[m_ptr->r_idx];

diff --git a/src/spell-realm/spells-hex.h b/src/spell-realm/spells-hex.h
index f0f9914..244376c 100644 (file)
--- a/src/spell-realm/spells-hex.h
+++ b/src/spell-realm/spells-hex.h
@@ -17,6 +17,7 @@ public:
     void revenge_store(HIT_POINT dam);
     bool teleport_barrier(MONSTER_IDX m_idx);
     bool magic_barrier(MONSTER_IDX m_idx);
+    bool multiply_barrier(MONSTER_IDX m_idx);
 
 private:
     player_type *caster_ptr;
@@ -32,7 +33,6 @@ private:
     void gain_exp_master(const int spell);
 };
 
-bool multiply_barrier(player_type *caster_ptr, MONSTER_IDX m_idx);
 bool hex_spelling(player_type *caster_ptr, int hex);
 bool hex_spelling_any(player_type *caster_ptr);