From 8b72ac84c93c7064d3a3581fc4b6b5d152d7f366 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 24 May 2020 12:48:03 +0900
Subject: [PATCH] [Refactor] #40416 Rehsaped mon_take_hit_mon()

---
 src/combat/melee-postprocess.c | 8 ++------
 src/util/util.c                | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/combat/melee-postprocess.c b/src/combat/melee-postprocess.c
index f26c679af..9ef524b2a 100644
--- a/src/combat/melee-postprocess.c
+++ b/src/combat/melee-postprocess.c
@@ -174,12 +174,8 @@ void mon_take_hit_mon(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam,
         if (((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & RF7_NAZGUL)) && !player_ptr->phase_out) {
             m_ptr->hp = 1;
         } else {
-            if (!monster_living(m_ptr->r_idx)) {
-                sound(SOUND_N_KILL);
-            } else {
-                sound(SOUND_KILL);
-            }
-
+            sound_type kill_sound = monster_living(m_ptr->r_idx) ? SOUND_KILL : SOUND_N_KILL;
+            sound(kill_sound);
             *dead = TRUE;
             print_monster_dead_by_monster(player_ptr, mam_pp_ptr);
             monster_gain_exp(player_ptr, who, m_ptr->r_idx);
diff --git a/src/util/util.c b/src/util/util.c
index d9da303de..25ddfe329 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -1367,7 +1367,8 @@ void bell(void)
 
 
 /*
- * Hack -- Make a (relevant?) sound
+ * todo intをsound_typeに差し替える
+ * @brief 音を鳴らす
  */
 void sound(int val)
 {
-- 
2.11.0