From 911e38951cff4955b23bdf73d816839652635085 Mon Sep 17 00:00:00 2001
From: Hourier <grapefox.whitelucifer.0408@gmail.com>
Date: Sun, 12 Sep 2021 09:57:36 +0900
Subject: [PATCH] [Refactor] #1473 Replaced hex_revenge_turn() to
 get_revenge_turn()

---
 src/realm/realm-hex.cpp                | 8 ++++----
 src/spell-realm/spells-hex.cpp         | 9 +++++++--
 src/spell-realm/spells-hex.h           | 1 +
 src/window/main-window-stat-poster.cpp | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index f615e1e8c..e46ab7215 100644
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -285,7 +285,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
             int a = 3 - (player_ptr->pspeed - 100) / 10;
             byte r = 3 + randint1(3) + MAX(0, MIN(3, a));
 
-            if (hex_revenge_turn(player_ptr) > 0) {
+            if (spell_hex.get_revenge_turn() > 0) {
                 msg_print(_("すでに我慢をしている。", "You are already biding your time for vengeance."));
                 return nullptr;
             }
@@ -301,7 +301,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
 
             hex_revenge_turn(player_ptr)--;
 
-            if ((hex_revenge_turn(player_ptr) <= 0) || (power >= 200)) {
+            if ((spell_hex.get_revenge_turn() == 0) || (power >= 200)) {
                 msg_print(_("我慢が解かれた！", "My patience is at an end!"));
                 if (power) {
                     project(player_ptr, 0, rad, player_ptr->y, player_ptr->x, power, GF_HELL_FIRE, (PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL));
@@ -858,7 +858,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
             int a = 3 - (player_ptr->pspeed - 100) / 10;
             r = 1 + randint1(2) + MAX(0, MIN(3, a));
 
-            if (hex_revenge_turn(player_ptr) > 0) {
+            if (spell_hex.get_revenge_turn() > 0) {
                 msg_print(_("すでに復讐は宣告済みだ。", "You've already declared your revenge."));
                 return nullptr;
             }
@@ -871,7 +871,7 @@ concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type m
 
         if (cont) {
             hex_revenge_turn(player_ptr)--;
-            if (hex_revenge_turn(player_ptr) <= 0) {
+            if (spell_hex.get_revenge_turn() == 0) {
                 DIRECTION dir;
 
                 if (power) {
diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index b5f15f65c..af01aca5f 100644
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -335,7 +335,7 @@ bool SpellHex::is_casting_full_capacity() const
  */
 void SpellHex::continue_revenge()
 {
-    if ((this->player_ptr->realm1 != REALM_HEX) || (hex_revenge_turn(this->player_ptr) <= 0)) {
+    if ((this->player_ptr->realm1 != REALM_HEX) || (this->get_revenge_turn() == 0)) {
         return;
     }
 
@@ -357,7 +357,7 @@ void SpellHex::continue_revenge()
  */
 void SpellHex::store_vengeful_damage(HIT_POINT dam)
 {
-    if ((this->player_ptr->realm1 != REALM_HEX) || (hex_revenge_turn(this->player_ptr) <= 0)) {
+    if ((this->player_ptr->realm1 != REALM_HEX) || (this->get_revenge_turn() == 0)) {
         return;
     }
 
@@ -482,3 +482,8 @@ void SpellHex::set_revenge_power(int32_t power, bool substitution)
         this->player_ptr->magic_num1[2] += power;
     }
 }
+
+byte SpellHex::get_revenge_turn() const
+{
+    return this->player_ptr->magic_num2[2];
+}
diff --git a/src/spell-realm/spells-hex.h b/src/spell-realm/spells-hex.h
index e9b935574..689949200 100644
--- a/src/spell-realm/spells-hex.h
+++ b/src/spell-realm/spells-hex.h
@@ -29,6 +29,7 @@ public:
     void add_casting_num(bool is_incremental);
     int32_t get_revenge_power() const;
     void set_revenge_power(int32_t power, bool substitution);
+    byte get_revenge_turn() 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 fdd369d0c..679204cfe 100644
--- a/src/window/main-window-stat-poster.cpp
+++ b/src/window/main-window-stat-poster.cpp
@@ -444,7 +444,7 @@ static void add_hex_status_flags(player_type *player_ptr, BIT_FLAGS *bar_flags)
         ADD_BAR_FLAG(BAR_CURE);
     }
 
-    if (hex_revenge_turn(player_ptr)) {
+    if (spell_hex.get_revenge_turn() > 0) {
         if (hex_revenge_type(player_ptr) == 1)
             ADD_BAR_FLAG(BAR_PATIENCE);
         if (hex_revenge_type(player_ptr) == 2)
-- 
2.11.0