From b9ed27b1ed0920dcabaf89bc35e0aa28059a89bf Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Fri, 17 Jul 2020 23:30:05 +0900
Subject: [PATCH] [Refactor] #40233 Separated check_store_armoury() and
 check_store_weapon() from store_will_buy()

---
 src/store/service-checker.c | 75 +++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/store/service-checker.c b/src/store/service-checker.c
index 5c3dc0c75..98f9b5ae4 100644
--- a/src/store/service-checker.c
+++ b/src/store/service-checker.c
@@ -50,6 +50,43 @@ static bool check_store_general(object_type *o_ptr)
     }
 }
 
+static bool check_store_armoury(object_type *o_ptr)
+{
+    switch (o_ptr->tval) {
+    case TV_BOOTS:
+    case TV_GLOVES:
+    case TV_CROWN:
+    case TV_HELM:
+    case TV_SHIELD:
+    case TV_CLOAK:
+    case TV_SOFT_ARMOR:
+    case TV_HARD_ARMOR:
+    case TV_DRAG_ARMOR:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
+static bool check_store_weapon(object_type *o_ptr)
+{
+    switch (o_ptr->tval) {
+    case TV_SHOT:
+    case TV_BOLT:
+    case TV_ARROW:
+    case TV_BOW:
+    case TV_DIGGING:
+    case TV_POLEARM:
+    case TV_SWORD:
+    case TV_HISSATSU_BOOK:
+        return TRUE;
+    case TV_HAFTED:
+        return o_ptr->sval != SV_WIZSTAFF;
+    default:
+        return FALSE;
+    }
+}
+
 /*!
  * @brief オブジェクトが所定の店舗で引き取れるかどうかを返す /
  * Determine if the current store will purchase the given item
@@ -71,46 +108,16 @@ bool store_will_buy(player_type *player_ptr, object_type *o_ptr)
             return FALSE;
 
         break;
-    case STORE_ARMOURY: {
-        switch (o_ptr->tval) {
-        case TV_BOOTS:
-        case TV_GLOVES:
-        case TV_CROWN:
-        case TV_HELM:
-        case TV_SHIELD:
-        case TV_CLOAK:
-        case TV_SOFT_ARMOR:
-        case TV_HARD_ARMOR:
-        case TV_DRAG_ARMOR:
-            break;
-        default:
+    case STORE_ARMOURY:
+        if (!check_store_armoury(o_ptr))
             return FALSE;
-        }
 
         break;
-    }
-    case STORE_WEAPON: {
-        switch (o_ptr->tval) {
-        case TV_SHOT:
-        case TV_BOLT:
-        case TV_ARROW:
-        case TV_BOW:
-        case TV_DIGGING:
-        case TV_POLEARM:
-        case TV_SWORD:
-        case TV_HISSATSU_BOOK:
-            break;
-        case TV_HAFTED:
-            if (o_ptr->sval == SV_WIZSTAFF)
-                return FALSE;
-
-            break;
-        default:
+    case STORE_WEAPON:
+        if (!check_store_weapon(o_ptr))
             return FALSE;
-        }
 
         break;
-    }
     case STORE_TEMPLE: {
         switch (o_ptr->tval) {
         case TV_LIFE_BOOK:
-- 
2.11.0