英語版でモンスターの思い出の一部が正しく配色されていなかったバグを修正.

diff --git a/src/monster1.c b/src/monster1.c
index dca0c8e..9d4591d 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -719,36 +719,36 @@ path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "r_info_j.raw");
 #ifdef JP
 if (flags2 & RF2_ELDRITCH_HORROR) hook_c_roff(TERM_VIOLET, "¶¸µ¤¤òͶ¤¦");/*nuke me*/
 #else
-               if (flags2 & RF2_ELDRITCH_HORROR) hooked_roff(" sanity-blasting");
+               if (flags2 & RF2_ELDRITCH_HORROR) hook_c_roff(TERM_VIOLET, " sanity-blasting");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_ANIMAL)          hook_c_roff(TERM_L_GREEN, "¼«Á³³¦¤Î");
 #else
-               if (flags3 & RF3_ANIMAL)          hooked_roff(" natural");
+               if (flags3 & RF3_ANIMAL)          hook_c_roff(TERM_L_GREEN, " natural");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_EVIL)            hook_c_roff(TERM_L_DARK, "¼Ù°­¤Ê¤ë");
 #else
-               if (flags3 & RF3_EVIL)            hooked_roff(" evil");
+               if (flags3 & RF3_EVIL)            hook_c_roff(TERM_L_DARK, " evil");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_GOOD)            hook_c_roff(TERM_YELLOW, "Á±ÎɤÊ");
 #else
-               if (flags3 & RF3_GOOD)            hooked_roff(" good");
+               if (flags3 & RF3_GOOD)            hook_c_roff(TERM_YELLOW, " good");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_UNDEAD)          hook_c_roff(TERM_VIOLET, "¥¢¥ó¥Ç¥Ã¥É¤Î");
 #else
-               if (flags3 & RF3_UNDEAD)          hooked_roff(" undead");
+               if (flags3 & RF3_UNDEAD)          hook_c_roff(TERM_VIOLET, " undead");
 #endif
 #ifdef JP
 if (flags3 & RF3_AMBERITE)        hook_c_roff(TERM_VIOLET, "¥¢¥ó¥Ð¡¼¤Î²¦Â²¤Î");
 #else
-               if (flags3 & RF3_AMBERITE)        hooked_roff(" Amberite");
+               if (flags3 & RF3_AMBERITE)        hook_c_roff(TERM_VIOLET, " Amberite");
 #endif
 
 
@@ -758,43 +758,43 @@ if (flags3 & RF3_AMBERITE)        hook_c_roff(TERM_VIOLET, "
 #ifdef JP
      if (flags3 & RF3_DRAGON)   hook_c_roff(TERM_ORANGE, "¥É¥é¥´¥ó");
 #else
-                    if (flags3 & RF3_DRAGON)   hooked_roff(" dragon");
+                    if (flags3 & RF3_DRAGON)   hook_c_roff(TERM_ORANGE, " dragon");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_DEMON)    hook_c_roff(TERM_VIOLET, "¥Ç¡¼¥â¥ó");
 #else
-               if (flags3 & RF3_DEMON)    hooked_roff(" demon");
+               if (flags3 & RF3_DEMON)    hook_c_roff(TERM_VIOLET, " demon");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_GIANT)    hook_c_roff(TERM_L_UMBER, "¥¸¥ã¥¤¥¢¥ó¥È");
 #else
-               if (flags3 & RF3_GIANT)    hooked_roff(" giant");
+               if (flags3 & RF3_GIANT)    hook_c_roff(TERM_L_UMBER, " giant");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_TROLL)    hook_c_roff(TERM_BLUE, "¥È¥í¥ë");
 #else
-               if (flags3 & RF3_TROLL)    hooked_roff(" troll");
+               if (flags3 & RF3_TROLL)    hook_c_roff(TERM_BLUE, " troll");
 #endif
 
 #ifdef JP
 if (flags3 & RF3_ORC)      hook_c_roff(TERM_UMBER, "¥ª¡¼¥¯");
 #else
-               if (flags3 & RF3_ORC)      hooked_roff(" orc");
+               if (flags3 & RF3_ORC)      hook_c_roff(TERM_UMBER, " orc");
 #endif
 
 #ifdef JP
 if (flags2 & RF2_HUMAN) hook_c_roff(TERM_L_WHITE, "¿Í´Ö");
 #else
-               if (flags2 & RF2_HUMAN) hooked_roff(" Human");
+               if (flags2 & RF2_HUMAN) hook_c_roff(TERM_L_WHITE, " Human");
 #endif
 
 #ifdef JP
 if (flags2 & RF2_QUANTUM)  hook_c_roff(TERM_VIOLET, "ÎÌ»ÒÀ¸Êª");
 #else
-               if (flags2 & RF2_QUANTUM)  hooked_roff(" quantum creature");
+               if (flags2 & RF2_QUANTUM)  hook_c_roff(TERM_VIOLET, " quantum creature");
 #endif
 
        }
@@ -863,7 +863,7 @@ else                            hooked_roff("
 #ifdef JP
 hook_c_roff(TERM_VIOLET, format("%^s¤Ï±ê¤Èɹ¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by flames and electricity.  ", wd_he[msex]));
+               hook_c_roff(TERM_VIOLET, format("%^s is surrounded by flames and electricity.  ", wd_he[msex]));
 #endif
 
        }
@@ -872,7 +872,7 @@ hook_c_roff(TERM_VIOLET, format("%^s
 #ifdef JP
 hook_c_roff(TERM_L_RED, format("%^s¤Ï±ê¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by flames and electricity.  ", wd_he[msex]));
+               hook_c_roff(TERM_L_RED, format("%^s is surrounded by flames and electricity.  ", wd_he[msex]));
 #endif
 
        }
@@ -881,7 +881,7 @@ hook_c_roff(TERM_L_RED, format("%^s
 #ifdef JP
 hook_c_roff(TERM_BLUE, format("%^s¤Ï±ê¤Èɹ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by flames and electricity.  ", wd_he[msex]));
+               hook_c_roff(TERM_BLUE, format("%^s is surrounded by flames and electricity.  ", wd_he[msex]));
 #endif
 
        }
@@ -890,7 +890,7 @@ hook_c_roff(TERM_BLUE, format("%^s
 #ifdef JP
 hook_c_roff(TERM_L_GREEN, format("%^s¤Ïɹ¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by ice and electricity.  ", wd_he[msex]));
+               hook_c_roff(TERM_L_GREEN, format("%^s is surrounded by ice and electricity.  ", wd_he[msex]));
 #endif
 
        }
@@ -899,7 +899,7 @@ hook_c_roff(TERM_L_GREEN, format("%^s
 #ifdef JP
 hook_c_roff(TERM_RED, format("%^s¤Ï±ê¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by flames.  ", wd_he[msex]));
+               hook_c_roff(TERM_RED, format("%^s is surrounded by flames.  ", wd_he[msex]));
 #endif
 
        }
@@ -908,7 +908,7 @@ hook_c_roff(TERM_RED, format("%^s
 #ifdef JP
 hook_c_roff(TERM_BLUE, format("%^s¤Ïɹ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by ice.  ", wd_he[msex]));
+               hook_c_roff(TERM_BLUE, format("%^s is surrounded by ice.  ", wd_he[msex]));
 #endif
 
        }
@@ -917,7 +917,7 @@ hook_c_roff(TERM_BLUE, format("%^s
 #ifdef JP
 hook_c_roff(TERM_L_BLUE, format("%^s¤Ï¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
 #else
-               hooked_roff(format("%^s is surrounded by electricity.  ", wd_he[msex]));
+               hook_c_roff(TERM_L_BLUE, format("%^s is surrounded by electricity.  ", wd_he[msex]));
 #endif
 
        }
@@ -1011,7 +1011,7 @@ hooked_roff(format("%^s
                        else hooked_roff(" or ");
 
                        /* Dump */
-                       hooked_roff(vp[n]);
+                       hook_c_roff(color[n], vp[n]);
 #endif
 
                }
@@ -1633,7 +1633,7 @@ if (flags6 & (RF6_S_UNIQUE))        {vp[vn] = "
                hooked_roff(" magical, casting spells");
 
                /* Adverb */
-               if (flags2 & RF2_SMART) hooked_roff(" intelligently");
+               if (flags2 & RF2_SMART) hook_c_roff(TERM_YELLOW, " intelligently");
 #endif