From bf10558626cb7961a3dc89aec405ed87e25dc45e Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sat, 8 Aug 2020 14:04:20 +0900
Subject: [PATCH] [Refactor] #39010 Separated check_throw_boomerang() from
 check_what_throw()

---
 src/cmd-item/cmd-throw.c | 55 +++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c
index 66ed982fd..1ad70f828 100644
--- a/src/cmd-item/cmd-throw.c
+++ b/src/cmd-item/cmd-throw.c
@@ -58,39 +58,46 @@
 #include "view/object-describer.h"
 #include "wizard/wizard-messages.h"
 
-static bool check_what_throw(player_type *creature_ptr, it_type *it_ptr)
+static bool check_throw_boomerang(player_type *creature_ptr, it_type *it_ptr, concptr *q, concptr *s)
 {
-    if (it_ptr->shuriken >= 0) {
-        it_ptr->item = it_ptr->shuriken;
+    if (!it_ptr->boomerang)
+        return TRUE;
+
+    if (has_melee_weapon(creature_ptr, INVEN_RARM) && has_melee_weapon(creature_ptr, INVEN_LARM)) {
+        item_tester_hook = item_tester_hook_boomerang;
+        *q = _("どの武器を投げますか? ", "Throw which it_ptr->item? ");
+        *s = _("投げる武器がない。", "You have nothing to throw.");
+        it_ptr->o_ptr = choose_object(creature_ptr, &it_ptr->item, q, s, USE_EQUIP, 0);
+        if (!it_ptr->o_ptr) {
+            flush();
+            return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    if (has_melee_weapon(creature_ptr, INVEN_LARM)) {
+        it_ptr->item = INVEN_LARM;
         it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item];
         return TRUE;
     }
-    
-    concptr q, s;
-    if (it_ptr->boomerang) {
-        if (has_melee_weapon(creature_ptr, INVEN_RARM) && has_melee_weapon(creature_ptr, INVEN_LARM)) {
-            item_tester_hook = item_tester_hook_boomerang;
-            q = _("どの武器を投げますか? ", "Throw which it_ptr->item? ");
-            s = _("投げる武器がない。", "You have nothing to throw.");
-            it_ptr->o_ptr = choose_object(creature_ptr, &it_ptr->item, q, s, USE_EQUIP, 0);
-            if (!it_ptr->o_ptr) {
-                flush();
-                return FALSE;
-            }
 
-            return TRUE;
-        }
-        
-        if (has_melee_weapon(creature_ptr, INVEN_LARM)) {
-            it_ptr->item = INVEN_LARM;
-            it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item];
-            return TRUE;
-        }
+    it_ptr->item = INVEN_RARM;
+    it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item];
+    return TRUE;
+}
 
-        it_ptr->item = INVEN_RARM;
+static bool check_what_throw(player_type *creature_ptr, it_type *it_ptr)
+{
+    if (it_ptr->shuriken >= 0) {
+        it_ptr->item = it_ptr->shuriken;
         it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item];
         return TRUE;
     }
+    
+    concptr q, s;
+    if (!check_throw_boomerang(creature_ptr, it_ptr, &q, &s))
+        return FALSE;
 
     q = _("どのアイテムを投げますか? ", "Throw which it_ptr->item? ");
     s = _("投げるアイテムがない。", "You have nothing to throw.");
-- 
2.11.0