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

diff --git a/src/lore/monster-lore.c b/src/lore/monster-lore.c
index 99264bc..e87a881 100644 (file)
--- a/src/lore/monster-lore.c
+++ b/src/lore/monster-lore.c
@@ -301,42 +301,7 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
     if (!display_where_to_appear(lore_ptr))
         return;
 
-#ifdef JP
-#else
-    hooked_roff("moves");
-#endif
-
-    display_random_move(lore_ptr);
-    if (lore_ptr->speed > 110) {
-        if (lore_ptr->speed > 139)
-            hook_c_roff(TERM_RED, _("信じ難いほど", " incredibly"));
-        else if (lore_ptr->speed > 134)
-            hook_c_roff(TERM_ORANGE, _("猛烈に", " extremely"));
-        else if (lore_ptr->speed > 129)
-            hook_c_roff(TERM_ORANGE, _("非常に", " very"));
-        else if (lore_ptr->speed > 124)
-            hook_c_roff(TERM_UMBER, _("かなり", " fairly"));
-        else if (lore_ptr->speed < 120)
-            hook_c_roff(TERM_L_UMBER, _("やや", " somewhat"));
-        hook_c_roff(TERM_L_RED, _("素早く", " quickly"));
-    } else if (lore_ptr->speed < 110) {
-        if (lore_ptr->speed < 90)
-            hook_c_roff(TERM_L_GREEN, _("信じ難いほど", " incredibly"));
-        else if (lore_ptr->speed < 95)
-            hook_c_roff(TERM_BLUE, _("非常に", " very"));
-        else if (lore_ptr->speed < 100)
-            hook_c_roff(TERM_BLUE, _("かなり", " fairly"));
-        else if (lore_ptr->speed > 104)
-            hook_c_roff(TERM_GREEN, _("やや", " somewhat"));
-        hook_c_roff(TERM_L_BLUE, _("ゆっくりと", " slowly"));
-    } else {
-        hooked_roff(_("普通の速さで", " at normal speed"));
-    }
-
-#ifdef JP
-    hooked_roff("動いている");
-#endif
-
+    display_monster_move(lore_ptr);
     if (lore_ptr->flags1 & RF1_NEVER_MOVE) {
         if (lore_ptr->old) {
             hooked_roff(_("、しかし", ", but "));

diff --git a/src/view/display-monster-lore.c b/src/view/display-monster-lore.c
index 2a73d00..a8799b9 100644 (file)
--- a/src/view/display-monster-lore.c
+++ b/src/view/display-monster-lore.c
@@ -208,6 +208,45 @@ bool display_where_to_appear(lore_type *lore_ptr)
     return TRUE;
 }
 
+void display_monster_move(lore_type *lore_ptr)
+{
+#ifdef JP
+#else
+    hooked_roff("moves");
+#endif
+
+    display_random_move(lore_ptr);
+    if (lore_ptr->speed > 110) {
+        if (lore_ptr->speed > 139)
+            hook_c_roff(TERM_RED, _("信じ難いほど", " incredibly"));
+        else if (lore_ptr->speed > 134)
+            hook_c_roff(TERM_ORANGE, _("猛烈に", " extremely"));
+        else if (lore_ptr->speed > 129)
+            hook_c_roff(TERM_ORANGE, _("非常に", " very"));
+        else if (lore_ptr->speed > 124)
+            hook_c_roff(TERM_UMBER, _("かなり", " fairly"));
+        else if (lore_ptr->speed < 120)
+            hook_c_roff(TERM_L_UMBER, _("やや", " somewhat"));
+        hook_c_roff(TERM_L_RED, _("素早く", " quickly"));
+    } else if (lore_ptr->speed < 110) {
+        if (lore_ptr->speed < 90)
+            hook_c_roff(TERM_L_GREEN, _("信じ難いほど", " incredibly"));
+        else if (lore_ptr->speed < 95)
+            hook_c_roff(TERM_BLUE, _("非常に", " very"));
+        else if (lore_ptr->speed < 100)
+            hook_c_roff(TERM_BLUE, _("かなり", " fairly"));
+        else if (lore_ptr->speed > 104)
+            hook_c_roff(TERM_GREEN, _("やや", " somewhat"));
+        hook_c_roff(TERM_L_BLUE, _("ゆっくりと", " slowly"));
+    } else {
+        hooked_roff(_("普通の速さで", " at normal speed"));
+    }
+
+#ifdef JP
+    hooked_roff("動いている");
+#endif
+}
+
 void display_random_move(lore_type *lore_ptr)
 {
     if (((lore_ptr->flags1 & RF1_RAND_50) == 0) && ((lore_ptr->flags1 & RF1_RAND_25) == 0))

diff --git a/src/view/display-monster-lore.h b/src/view/display-monster-lore.h
index 8de2553..f782554 100644 (file)
--- a/src/view/display-monster-lore.h
+++ b/src/view/display-monster-lore.h
@@ -10,3 +10,4 @@ void output_monster_spoiler(player_type *player_ptr, MONRACE_IDX r_idx, void (*r
 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);
+void display_monster_move(lore_type *lore_ptr);