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

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index 3cd8621..1f7637d 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -339,7 +339,7 @@ void SpellHex::continue_revenge()
         return;
     }
 
-    switch (hex_revenge_type(this->player_ptr)) {
+    switch (this->get_revenge_type()) {
     case 1:
         exe_spell(this->player_ptr, REALM_HEX, HEX_PATIENCE, SPELL_CONT);
         return;
@@ -501,3 +501,8 @@ void SpellHex::set_revenge_turn(byte turn, bool substitution)
         this->player_ptr->magic_num2[2] -= turn;
     }
 }
+
+byte SpellHex::get_revenge_type() const
+{
+    return this->player_ptr->magic_num2[1];
+}

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

diff --git a/src/window/main-window-stat-poster.cpp b/src/window/main-window-stat-poster.cpp
index 679204c..b60da11 100644 (file)
--- a/src/window/main-window-stat-poster.cpp
+++ b/src/window/main-window-stat-poster.cpp
@@ -445,10 +445,14 @@ static void add_hex_status_flags(player_type *player_ptr, BIT_FLAGS *bar_flags)
     }
 
     if (spell_hex.get_revenge_turn() > 0) {
-        if (hex_revenge_type(player_ptr) == 1)
+        auto revenge_type = spell_hex.get_revenge_type();
+        if (revenge_type == 1) {
             ADD_BAR_FLAG(BAR_PATIENCE);
-        if (hex_revenge_type(player_ptr) == 2)
+        }
+
+        if (revenge_type == 2) {
             ADD_BAR_FLAG(BAR_REVENGE);
+        }
     }
 }