[Refactor] #1473 Replaced hex_revenge_type() to set_revenge_type()

diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index 6c9f813..f3e161e 100644 (file)
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -292,7 +292,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
                 return nullptr;
             }
 
-            hex_revenge_type(player_ptr) = 1;
+            spell_hex.set_revenge_type(1);
             spell_hex.set_revenge_turn(r, true);
             spell_hex.set_revenge_power(0, true);
             msg_print(_("じっと耐えることにした。", "You decide to endure damage for future retribution."));
@@ -312,8 +312,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
                     msg_format(_("%d点のダメージを返した。", "You return %d damage."), power);
                 }
 
-                /* Reset */
-                hex_revenge_type(player_ptr) = 0;
+                spell_hex.set_revenge_type(0);
                 spell_hex.set_revenge_turn(0, true);
                 spell_hex.set_revenge_power(0, true);
             }
@@ -864,7 +863,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
                 return nullptr;
             }
 
-            hex_revenge_type(player_ptr) = 2;
+            spell_hex.set_revenge_type(2);
             spell_hex.set_revenge_turn(r, true);
             msg_format(_("あなたは復讐を宣告した。あと %d ターン。", "You declare your revenge. %d turns left."), r);
             add = false;

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index 1f7637d..5932a62 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -506,3 +506,8 @@ byte SpellHex::get_revenge_type() const
 {
     return this->player_ptr->magic_num2[1];
 }
+
+void SpellHex::set_revenge_type(byte type)
+{
+    this->player_ptr->magic_num2[1] = type;
+}

diff --git a/src/spell-realm/spells-hex.h b/src/spell-realm/spells-hex.h
index d8371d0..10a005b 100644 (file)
--- a/src/spell-realm/spells-hex.h
+++ b/src/spell-realm/spells-hex.h
@@ -32,6 +32,7 @@ public:
     byte get_revenge_turn() const;
     void set_revenge_turn(byte power, bool substitution);
     byte get_revenge_type() const;
+    void set_revenge_type(byte type);
 
 private:
     player_type *player_ptr;