From eb192de9939759dbe399f23a6f60013ac75dc527 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Fri, 12 Jun 2020 23:03:24 +0900
Subject: [PATCH] [Refactor] #40414 Separated display_monster_drop_golds() from
 process_monster_lore() to display-lore-drops.c/h

---
 src/lore/monster-lore.c       | 44 ++----------------------------------
 src/view/display-lore-drops.c | 52 +++++++++++++++++++++++++++++++++++++++++++
 src/view/display-lore-drops.h |  2 ++
 3 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/src/lore/monster-lore.c b/src/lore/monster-lore.c
index b315ccb0c..f167865fa 100644
--- a/src/lore/monster-lore.c
+++ b/src/lore/monster-lore.c
@@ -223,48 +223,8 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
 
         display_monster_drop_quantity(lore_ptr);
         display_monster_drop_quality(lore_ptr);
-        if (lore_ptr->drop_item) {
-#ifdef JP
-#else
-            if (lore_ptr->sin)
-                hooked_roff("n");
-
-            lore_ptr->sin = FALSE;
-#endif
-            if (lore_ptr->drop_quality != NULL)
-                hooked_roff(lore_ptr->drop_quality);
-
-            hooked_roff(_("アイテム", " object"));
-#ifdef JP
-#else
-            if (lore_ptr->drop_quantity != 1)
-                hooked_roff("s");
-#endif
-            lore_ptr->drop_quality = _("や", " or");
-        }
-
-        if (lore_ptr->drop_gold) {
-#ifdef JP
-#else
-            if (lore_ptr->drop_quality == NULL)
-                lore_ptr->sin = FALSE;
-
-            if (lore_ptr->sin)
-                hooked_roff("n");
-
-            lore_ptr->sin = FALSE;
-#endif
-            if (lore_ptr->drop_quality != NULL)
-                hooked_roff(lore_ptr->drop_quality);
-
-            hooked_roff(_("財宝", " treasure"));
-#ifdef JP
-#else
-            if (lore_ptr->drop_quantity != 1)
-                hooked_roff("s");
-#endif
-        }
-
+        display_monster_drop_items(lore_ptr);
+        display_monster_drop_golds(lore_ptr);
         hooked_roff(_("を持っていることがある。", ".  "));
     }
 
diff --git a/src/view/display-lore-drops.c b/src/view/display-lore-drops.c
index c97e66747..7015c977c 100644
--- a/src/view/display-lore-drops.c
+++ b/src/view/display-lore-drops.c
@@ -31,3 +31,55 @@ void display_monster_drop_quality(lore_type* lore_ptr)
         lore_ptr->drop_quality = NULL;
     }
 }
+
+void display_monster_drop_items(lore_type *lore_ptr)
+{
+    if (lore_ptr->drop_item == 0)
+        return;
+
+#ifdef JP
+#else
+    if (lore_ptr->sin)
+        hooked_roff("n");
+
+    lore_ptr->sin = FALSE;
+#endif
+
+    if (lore_ptr->drop_quality != NULL)
+        hooked_roff(lore_ptr->drop_quality);
+
+    hooked_roff(_("アイテム", " object"));
+#ifdef JP
+#else
+    if (lore_ptr->drop_quantity != 1)
+        hooked_roff("s");
+#endif
+    lore_ptr->drop_quality = _("や", " or");
+}
+
+void display_monster_drop_golds(lore_type *lore_ptr)
+{
+    if (lore_ptr->drop_gold == 0)
+        return;
+
+#ifdef JP
+#else
+    if (lore_ptr->drop_quality == NULL)
+        lore_ptr->sin = FALSE;
+
+    if (lore_ptr->sin)
+        hooked_roff("n");
+
+    lore_ptr->sin = FALSE;
+#endif
+
+    if (lore_ptr->drop_quality != NULL)
+        hooked_roff(lore_ptr->drop_quality);
+
+    hooked_roff(_("財宝", " treasure"));
+#ifdef JP
+#else
+    if (lore_ptr->drop_quantity != 1)
+        hooked_roff("s");
+#endif
+}
diff --git a/src/view/display-lore-drops.h b/src/view/display-lore-drops.h
index 5506457de..9765814d0 100644
--- a/src/view/display-lore-drops.h
+++ b/src/view/display-lore-drops.h
@@ -5,3 +5,5 @@
 
 void display_monster_drop_quantity(lore_type *lore_ptr);
 void display_monster_drop_quality(lore_type *lore_ptr);
+void display_monster_drop_items(lore_type *lore_ptr);
+void display_monster_drop_golds(lore_type *lore_ptr);
-- 
2.11.0