From fed443a77f0f56bccb3c61872cd77fa2afc9807e Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 24 May 2020 12:11:11 +0900
Subject: [PATCH] [Refactor] #40416 Separated prepare_redraw() from
 mon_take_hit_mon()

---
 src/combat/melee-postprocess.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/combat/melee-postprocess.c b/src/combat/melee-postprocess.c
index 1de5d640b..d0ae3c7e4 100644
--- a/src/combat/melee-postprocess.c
+++ b/src/combat/melee-postprocess.c
@@ -46,6 +46,18 @@ mam_pp_type *initialize_mam_pp_type(player_type *player_ptr, mam_pp_type *mam_pp
     return mam_pp_ptr;
 }
 
+static void prepare_redraw(player_type *player_ptr, mam_pp_type *mam_pp_ptr)
+{
+    if (!mam_pp_ptr->m_ptr->ml)
+        return;
+
+    if (player_ptr->health_who == mam_pp_ptr->m_idx)
+        player_ptr->redraw |= (PR_HEALTH);
+
+    if (player_ptr->riding == mam_pp_ptr->m_idx)
+        player_ptr->redraw |= (PR_UHEALTH);
+}
+
 /*!
  * @brief モンスターが無敵だった場合の処理
  * @param mam_pp_ptr 標的モンスター構造体への参照ポインタ
@@ -108,15 +120,7 @@ void mon_take_hit_mon(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam,
     mam_pp_type tmp_mam_pp;
     mam_pp_type *mam_pp_ptr = initialize_mam_pp_type(player_ptr, &tmp_mam_pp, m_idx, dam);
     monster_desc(player_ptr, mam_pp_ptr->m_name, m_ptr, 0);
-
-    /* Redraw (later) if needed */
-    if (m_ptr->ml) {
-        if (player_ptr->health_who == m_idx)
-            player_ptr->redraw |= (PR_HEALTH);
-        if (player_ptr->riding == m_idx)
-            player_ptr->redraw |= (PR_UHEALTH);
-    }
-
+    prepare_redraw(player_ptr, mam_pp_ptr);
     (void)set_monster_csleep(player_ptr, m_idx, 0);
 
     if (player_ptr->riding && (m_idx == player_ptr->riding))
-- 
2.11.0