X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmspell%2Fmspell-dispel.cpp;h=59de9d499e25a30174eba1c2fd58710c53c1afd9;hb=23cf9fbcf5bcaddd0d8c2ff163a3c2791c201751;hp=347b7494a163045d690e526dd627222bf4b81186;hpb=068bb953b1bf465c8a9586d02758a7a60acac02f;p=hengbandforosx%2Fhengbandosx.git

diff --git a/src/mspell/mspell-dispel.cpp b/src/mspell/mspell-dispel.cpp
index 347b7494a..59de9d499 100644
--- a/src/mspell/mspell-dispel.cpp
+++ b/src/mspell/mspell-dispel.cpp
@@ -1,7 +1,5 @@
 #include "mspell/mspell-dispel.h"
 #include "blue-magic/blue-magic-checker.h"
-#include "core/player-redraw-types.h"
-#include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "core/window-redrawer.h"
 #include "mind/mind-force-trainer.h"
@@ -29,6 +27,7 @@
 #include "status/sight-setter.h"
 #include "status/temporary-resistance.h"
 #include "system/player-type-definition.h"
+#include "system/redrawing-flags-updater.h"
 #include "view/display-messages.h"
 
 /*!
@@ -36,9 +35,9 @@
  */
 static void dispel_player(PlayerType *player_ptr)
 {
-    (void)set_fast(player_ptr, 0, true);
+    (void)set_acceleration(player_ptr, 0, true);
     set_lightspeed(player_ptr, 0, true);
-    (void)BadStatusSetter(player_ptr).slowness(0, true);
+    (void)BadStatusSetter(player_ptr).set_deceleration(0, true);
     (void)set_shield(player_ptr, 0, true);
     (void)set_blessed(player_ptr, 0, true);
     (void)set_tsuyoshi(player_ptr, 0, true);
@@ -72,7 +71,7 @@ static void dispel_player(PlayerType *player_ptr)
     (void)set_oppose_cold(player_ptr, 0, true);
     (void)set_oppose_pois(player_ptr, 0, true);
     (void)set_ultimate_res(player_ptr, 0, true);
-    (void)set_mimic(player_ptr, 0, 0, true);
+    (void)set_mimic(player_ptr, 0, MimicKindType::NONE, true);
     (void)set_ele_attack(player_ptr, 0, 0);
     (void)set_ele_immune(player_ptr, 0, 0);
 
@@ -96,8 +95,19 @@ static void dispel_player(PlayerType *player_ptr)
         }
 
         player_ptr->action = ACTION_NONE;
-        player_ptr->update |= (PU_BONUS | PU_HP | PU_MONSTERS);
-        player_ptr->redraw |= (PR_MAP | PR_STATUS | PR_STATE);
+        auto &rfu = RedrawingFlagsUpdater::get_instance();
+        const auto flags_srf = {
+            StatusRedrawingFlag::BONUS,
+            StatusRedrawingFlag::HP,
+            StatusRedrawingFlag::MONSTER_STATUSES,
+        };
+        rfu.set_flags(flags_srf);
+        const auto flags_mwrf = {
+            MainWindowRedrawingFlag::MAP,
+            MainWindowRedrawingFlag::TIMED_EFFECT,
+            MainWindowRedrawingFlag::ACTION,
+        };
+        rfu.set_flags(flags_mwrf);
         player_ptr->window_flags |= (PW_OVERHEAD | PW_DUNGEON);
         player_ptr->energy_need += ENERGY_NEED();
     }
@@ -108,44 +118,43 @@ static void dispel_player(PlayerType *player_ptr)
  * @param m_idx 呪文を唱えるモンスターID
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param t_idx 呪文を受けるモンスターID。プレイヤーの場合はdummyで0とする。
- * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER
+ * @param target_type プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER
  *
  * プレイヤーが対象ならラーニング可。
  */
-MonsterSpellResult spell_RF4_DISPEL(MONSTER_IDX m_idx, PlayerType *player_ptr, MONSTER_IDX t_idx, int TARGET_TYPE)
+MonsterSpellResult spell_RF4_DISPEL(MONSTER_IDX m_idx, PlayerType *player_ptr, MONSTER_IDX t_idx, int target_type)
 {
     auto res = MonsterSpellResult::make_valid();
-    res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER;
+    res.learnable = target_type == MONSTER_TO_PLAYER;
 
-    GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN];
-    monster_name(player_ptr, m_idx, m_name);
-    monster_name(player_ptr, t_idx, t_name);
+    mspell_cast_msg_blind msg(_("%s^が何かを力強くつぶやいた。", "%s^ mumbles powerfully."),
+        _("%s^が魔力消去の呪文を念じた。", "%s^ invokes a dispel magic."), _("%s^が%sに対して魔力消去の呪文を念じた。", "%s^ invokes a dispel magic at %s."));
 
-    mspell_cast_msg_blind msg(_("%^sが何かを力強くつぶやいた。", "%^s mumbles powerfully."),
-        _("%^sが魔力消去の呪文を念じた。", "%^s invokes a dispel magic."), _("%^sが%sに対して魔力消去の呪文を念じた。", "%^s invokes a dispel magic at %s."));
+    monspell_message(player_ptr, m_idx, t_idx, msg, target_type);
 
-    monspell_message(player_ptr, m_idx, t_idx, msg, TARGET_TYPE);
-
-    if (TARGET_TYPE == MONSTER_TO_PLAYER) {
+    if (target_type == MONSTER_TO_PLAYER) {
         dispel_player(player_ptr);
-        if (player_ptr->riding)
+        if (player_ptr->riding) {
             dispel_monster_status(player_ptr, player_ptr->riding);
+        }
 
-        if (is_echizen(player_ptr))
+        if (is_echizen(player_ptr)) {
             msg_print(_("やりやがったな！", ""));
-        else if (is_chargeman(player_ptr)) {
-            if (randint0(2) == 0)
+        } else if (is_chargeman(player_ptr)) {
+            if (randint0(2) == 0) {
                 msg_print(_("ジュラル星人め！", ""));
-            else
+            } else {
                 msg_print(_("弱い者いじめは止めるんだ！", ""));
+            }
         }
 
         return res;
     }
 
-    if (TARGET_TYPE == MONSTER_TO_MONSTER) {
-        if (t_idx == player_ptr->riding)
+    if (target_type == MONSTER_TO_MONSTER) {
+        if (t_idx == player_ptr->riding) {
             dispel_player(player_ptr);
+        }
 
         dispel_monster_status(player_ptr, t_idx);
     }