OSDN Git Service

[Refactor] #40414 Separated display_monster_alignment() from process_monster_lore...
authorHourier <hourier@users.sourceforge.jp>
Thu, 11 Jun 2020 14:04:48 +0000 (23:04 +0900)
committerHourier <hourier@users.sourceforge.jp>
Thu, 11 Jun 2020 14:04:48 +0000 (23:04 +0900)
src/lore/monster-lore.c
src/view/display-monster-lore.c
src/view/display-monster-lore.h

index 53ac327..b07f3f5 100644 (file)
@@ -319,24 +319,7 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
         }
 #endif
 
-        if (lore_ptr->flags2 & RF2_ELDRITCH_HORROR)
-            hook_c_roff(TERM_VIOLET, _("狂気を誘う", " sanity-blasting"));
-
-        if (lore_ptr->flags3 & RF3_ANIMAL)
-            hook_c_roff(TERM_L_GREEN, _("自然界の", " natural"));
-
-        if (lore_ptr->flags3 & RF3_EVIL)
-            hook_c_roff(TERM_L_DARK, _("邪悪なる", " evil"));
-
-        if (lore_ptr->flags3 & RF3_GOOD)
-            hook_c_roff(TERM_YELLOW, _("善良な", " good"));
-
-        if (lore_ptr->flags3 & RF3_UNDEAD)
-            hook_c_roff(TERM_VIOLET, _("アンデッドの", " undead"));
-
-        if (lore_ptr->flags3 & RF3_AMBERITE)
-            hook_c_roff(TERM_VIOLET, _("アンバーの王族の", " Amberite"));
-
+        display_monster_alignment(lore_ptr);
         display_monster_kind(lore_ptr);
 #ifdef JP
         hooked_roff("を倒すことは");
index 8def5e7..1f25f02 100644 (file)
@@ -313,3 +313,24 @@ void display_monster_kind(lore_type *lore_ptr)
     if (lore_ptr->flags3 & RF3_ANGEL)
         hook_c_roff(TERM_YELLOW, _("天使", " angel"));
 }
+
+void display_monster_alignment(lore_type *lore_ptr)
+{
+    if (lore_ptr->flags2 & RF2_ELDRITCH_HORROR)
+        hook_c_roff(TERM_VIOLET, _("狂気を誘う", " sanity-blasting"));
+
+    if (lore_ptr->flags3 & RF3_ANIMAL)
+        hook_c_roff(TERM_L_GREEN, _("自然界の", " natural"));
+
+    if (lore_ptr->flags3 & RF3_EVIL)
+        hook_c_roff(TERM_L_DARK, _("邪悪なる", " evil"));
+
+    if (lore_ptr->flags3 & RF3_GOOD)
+        hook_c_roff(TERM_YELLOW, _("善良な", " good"));
+
+    if (lore_ptr->flags3 & RF3_UNDEAD)
+        hook_c_roff(TERM_VIOLET, _("アンデッドの", " undead"));
+
+    if (lore_ptr->flags3 & RF3_AMBERITE)
+        hook_c_roff(TERM_VIOLET, _("アンバーの王族の", " Amberite"));
+}
index 004be96..019cc38 100644 (file)
@@ -13,3 +13,4 @@ void display_random_move(lore_type *lore_ptr);
 void display_monster_move(lore_type *lore_ptr);
 void display_monster_never_move(lore_type *lore_ptr);
 void display_monster_kind(lore_type *lore_ptr);
+void display_monster_alignment(lore_type *lore_ptr);