[Refactor] #3286 Removed player-redraw-types.h

[hengbandforosx/hengbandosx.git] / src / specific-object / stone-of-lore.cpp

diff --git a/src/specific-object/stone-of-lore.cpp b/src/specific-object/stone-of-lore.cpp
index 690bcc8..749842a 100644 (file)
--- a/src/specific-object/stone-of-lore.cpp
+++ b/src/specific-object/stone-of-lore.cpp
@@ -5,14 +5,15 @@
  */
 
 #include "specific-object/stone-of-lore.h"
-#include "core/player-redraw-types.h"
 #include "player/player-damage.h"
 #include "spell-kind/spells-perception.h"
 #include "status/bad-status-setter.h"
 #include "system/player-type-definition.h"
+#include "system/redrawing-flags-updater.h"
+#include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 
-StoneOfLore::StoneOfLore(player_type *player_ptr)
+StoneOfLore::StoneOfLore(PlayerType *player_ptr)
     : player_ptr(player_ptr)
 {
 }
@@ -32,30 +33,39 @@ bool StoneOfLore::perilous_secrets()
         return false;
     }
 
-    BadStatusSetter bss(this->player_ptr);
-    if (this->player_ptr->msp > 0) {
-        if (20 <= this->player_ptr->csp) {
-            this->player_ptr->csp -= 20;
-        } else {
-            auto oops = 20 - this->player_ptr->csp;
-            this->player_ptr->csp = 0;
-            this->player_ptr->csp_frac = 0;
-            msg_print(_("石を制御できない！", "You are too weak to control the stone!"));
-            (void)bss.mod_paralysis(randint1(5 * oops + 1));
-            (void)bss.mod_confusion(randint1(5 * oops + 1));
-        }
-
-        this->player_ptr->redraw |= PR_MANA;
-    }
-
-    take_hit(this->player_ptr, DAMAGE_LOSELIFE, damroll(1, 12), _("危険な秘密", "perilous secrets"));
+    this->consume_mp();
+    auto dam_source = _("危険な秘密", "perilous secrets");
+    take_hit(this->player_ptr, DAMAGE_LOSELIFE, damroll(1, 12), dam_source);
     if (one_in_(5)) {
-        (void)bss.mod_confusion(randint1(10));
+        (void)BadStatusSetter(this->player_ptr).mod_confusion(randint1(10));
     }
 
     if (one_in_(20)) {
-        take_hit(this->player_ptr, DAMAGE_LOSELIFE, damroll(4, 10), _("危険な秘密", "perilous secrets"));
+        take_hit(this->player_ptr, DAMAGE_LOSELIFE, damroll(4, 10), dam_source);
     }
 
     return true;
 }
+
+void StoneOfLore::consume_mp()
+{
+    if (this->player_ptr->msp <= 0) {
+        return;
+    }
+
+    auto &rfu = RedrawingFlagsUpdater::get_instance();
+    if (this->player_ptr->csp >= 20) {
+        this->player_ptr->csp -= 20;
+        rfu.set_flag(MainWindowRedrawingFlag::MP);
+        return;
+    }
+
+    auto oops = 20 - this->player_ptr->csp;
+    this->player_ptr->csp = 0;
+    this->player_ptr->csp_frac = 0;
+    msg_print(_("石を制御できない！", "You are too weak to control the stone!"));
+    BadStatusSetter bss(this->player_ptr);
+    (void)bss.mod_paralysis(randint1(5 * oops + 1));
+    (void)bss.mod_confusion(randint1(5 * oops + 1));
+    rfu.set_flag(MainWindowRedrawingFlag::MP);
+}