[Refactor] #1473 Replaced casting_hex_num() to get_revenge_power()

diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index d6cf9d6..3e96014 100644 (file)
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -274,7 +274,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
         if (desc)
             return _(
                 "数ターン攻撃を耐えた後、受けたダメージを地獄の業火として周囲に放出する。", "Bursts hell fire strongly after enduring damage for a few turns.");
-        power = MIN(200, (hex_revenge_power(player_ptr) * 2));
+        power = MIN(200, (SpellHex(player_ptr).get_revenge_power() * 2));
         if (info)
             return info_damage(0, 0, power);
         if (cast) {
@@ -839,7 +839,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
         if (desc)
             return _(
                 "数ターン後にそれまで受けたダメージに応じた威力の地獄の劫火の弾を放つ。", "Fires a ball of hell fire to try avenging damage from a few turns.");
-        power = hex_revenge_power(player_ptr);
+        power = SpellHex(player_ptr).get_revenge_power();
         if (info)
             return info_damage(0, 0, power);
         if (cast) {

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index c60c488..444bba3 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -468,3 +468,8 @@ void SpellHex::add_casting_num(bool is_incremental)
         this->player_ptr->magic_num2[0]--;
     }
 }
+
+int32_t SpellHex::get_revenge_power() const
+{
+    return this->player_ptr->magic_num1[2];
+}

diff --git a/src/spell-realm/spells-hex.h b/src/spell-realm/spells-hex.h
index 53aedae..47426e1 100644 (file)
--- a/src/spell-realm/spells-hex.h
+++ b/src/spell-realm/spells-hex.h
@@ -27,6 +27,7 @@ public:
     void reset_casting_flag(spell_hex_type type);
     int32_t get_casting_num() const;
     void add_casting_num(bool is_incremental);
+    int32_t get_revenge_power() const;
 
 private:
     player_type *player_ptr;