[Refactor] #40414 Separated display_random_move() from process_monster_lore()

diff --git a/src/lore/monster-lore.c b/src/lore/monster-lore.c
index b1552b8..99264bc 100644 (file)
--- a/src/lore/monster-lore.c
+++ b/src/lore/monster-lore.c
@@ -306,20 +306,7 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
     hooked_roff("moves");
 #endif
 
-    if ((lore_ptr->flags1 & RF1_RAND_50) || (lore_ptr->flags1 & RF1_RAND_25)) {
-        if ((lore_ptr->flags1 & RF1_RAND_50) && (lore_ptr->flags1 & RF1_RAND_25)) {
-            hooked_roff(_("かなり", " extremely"));
-        } else if (lore_ptr->flags1 & RF1_RAND_50) {
-            hooked_roff(_("幾分", " somewhat"));
-        } else if (lore_ptr->flags1 & RF1_RAND_25) {
-            hooked_roff(_("少々", " a bit"));
-        }
-
-        hooked_roff(_("不規則に", " erratically"));
-        if (lore_ptr->speed != 110)
-            hooked_roff(_("、かつ", ", and"));
-    }
-
+    display_random_move(lore_ptr);
     if (lore_ptr->speed > 110) {
         if (lore_ptr->speed > 139)
             hook_c_roff(TERM_RED, _("信じ難いほど", " incredibly"));

diff --git a/src/view/display-monster-lore.c b/src/view/display-monster-lore.c
index 4fdf02d..2a73d00 100644 (file)
--- a/src/view/display-monster-lore.c
+++ b/src/view/display-monster-lore.c
@@ -207,3 +207,21 @@ bool display_where_to_appear(lore_type *lore_ptr)
 
     return TRUE;
 }
+
+void display_random_move(lore_type *lore_ptr)
+{
+    if (((lore_ptr->flags1 & RF1_RAND_50) == 0) && ((lore_ptr->flags1 & RF1_RAND_25) == 0))
+        return;
+
+    if ((lore_ptr->flags1 & RF1_RAND_50) && (lore_ptr->flags1 & RF1_RAND_25)) {
+        hooked_roff(_("かなり", " extremely"));
+    } else if (lore_ptr->flags1 & RF1_RAND_50) {
+        hooked_roff(_("幾分", " somewhat"));
+    } else if (lore_ptr->flags1 & RF1_RAND_25) {
+        hooked_roff(_("少々", " a bit"));
+    }
+
+    hooked_roff(_("不規則に", " erratically"));
+    if (lore_ptr->speed != 110)
+        hooked_roff(_("、かつ", ", and"));
+}

diff --git a/src/view/display-monster-lore.h b/src/view/display-monster-lore.h
index 23528a1..8de2553 100644 (file)
--- a/src/view/display-monster-lore.h
+++ b/src/view/display-monster-lore.h
@@ -9,3 +9,4 @@ void display_roff(player_type *player_ptr);
 void output_monster_spoiler(player_type *player_ptr, MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str));
 void display_kill_numbers(lore_type *lore_ptr);
 bool display_where_to_appear(lore_type *lore_ptr);
+void display_random_move(lore_type *lore_ptr);