From b8b2bb2523a345ecd8f9f977e93e914ef4e81c52 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 31 May 2020 18:06:38 +0900
Subject: [PATCH] [Refactor] #40416 Separated monster_explode() from
 make_attack_normal()

---
 src/combat/monster-attack-player.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index dfa94e210..b90190f80 100644
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -220,6 +220,18 @@ static void calc_player_stun(player_type *target_ptr, monap_type *monap_ptr)
         (void)set_stun(target_ptr, target_ptr->stun + stun_plus);
 }
 
+static void monster_explode(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!monap_ptr->explode)
+        return;
+
+    sound(SOUND_EXPLODE);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, monap_ptr->m_ptr->hp + 1, &monap_ptr->fear, NULL)) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+    }
+}
+
 /*!
  * @brief モンスターからプレイヤーへの打撃処理 / Attack the player via physical attacks.
  * @param m_idx 打撃を行うモンスターのID
@@ -283,15 +295,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
             select_cut_stun(monap_ptr);
             calc_player_cut(target_ptr, monap_ptr);
             calc_player_stun(target_ptr, monap_ptr);
-            if (monap_ptr->explode) {
-                sound(SOUND_EXPLODE);
-
-                if (mon_take_hit(target_ptr, m_idx, monap_ptr->m_ptr->hp + 1, &monap_ptr->fear, NULL)) {
-                    monap_ptr->blinked = FALSE;
-                    monap_ptr->alive = FALSE;
-                }
-            }
-
+            monster_explode(target_ptr, monap_ptr);
             process_aura_counterattack(target_ptr, monap_ptr);
         }
         else {
-- 
2.11.0