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

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

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index cdbcb5cd9..c318f53b2 100644
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -357,6 +357,23 @@ static void process_eat_food(player_type *target_ptr, monap_type *monap_ptr)
     }
 }
 
+static void process_eat_lite(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if ((monap_ptr->o_ptr->xtra4 <= 0) || object_is_fixed_artifact(monap_ptr->o_ptr))
+        return;
+
+    monap_ptr->o_ptr->xtra4 -= (s16b)(250 + randint1(250));
+    if (monap_ptr->o_ptr->xtra4 < 1)
+        monap_ptr->o_ptr->xtra4 = 1;
+
+    if (!target_ptr->blind) {
+        msg_print(_("明かりが暗くなってしまった。", "Your light dims."));
+        monap_ptr->obvious = TRUE;
+    }
+
+    target_ptr->window |= (PW_EQUIP);
+}
+
 /*!
  * @brief モンスターからの攻撃による充填魔力吸収処理
  * @param target_ptr プレーヤーへの参照ポインタ
@@ -599,19 +616,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
                 if (target_ptr->is_dead || check_multishadow(target_ptr))
                     break;
 
-                if ((monap_ptr->o_ptr->xtra4 > 0) && (!object_is_fixed_artifact(monap_ptr->o_ptr))) {
-                    monap_ptr->o_ptr->xtra4 -= (s16b)(250 + randint1(250));
-                    if (monap_ptr->o_ptr->xtra4 < 1)
-                        monap_ptr->o_ptr->xtra4 = 1;
-
-                    if (!target_ptr->blind) {
-                        msg_print(_("明かりが暗くなってしまった。", "Your light dims."));
-                        monap_ptr->obvious = TRUE;
-                    }
-
-                    target_ptr->window |= (PW_EQUIP);
-                }
-
+                process_eat_lite(target_ptr, monap_ptr);
                 break;
             }
             case RBE_ACID: {
-- 
2.11.0