ignore_unviewの対象として, モンスター同士が戦って発生する "何かが聞こ

えた" メッセージ, 友好的なモンスターが敵に回るメッセージを追加.

diff --git a/src/dungeon.c b/src/dungeon.c
index fb203b4..89b4f26 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4021,7 +4021,7 @@ msg_print("
                        do_cmd_save_game(TRUE);
        }
 
-       if (mon_fight)
+       if (mon_fight && !ignore_unview)
        {
 #ifdef JP
                msg_print("²¿¤«¤¬Ê¹¤³¤¨¤¿¡£");

diff --git a/src/melee2.c b/src/melee2.c
index 051f323..14fe9b7 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -2548,13 +2548,16 @@ static void process_monster(int m_idx)
 
        if (gets_angry)
        {
-               char m_name[80];
-               monster_desc(m_name, m_ptr, 0);
+               if (is_pet(m_ptr) || see_m)
+               {
+                       char m_name[80];
+                       monster_desc(m_name, m_ptr, is_pet(m_ptr) ? MD_ASSUME_VISIBLE : 0);
 #ifdef JP
-msg_format("%^s¤ÏÆÍÁ³Å¨¤Ë¤Þ¤ï¤Ã¤¿¡ª", m_name);
+                       msg_format("%^s¤ÏÆÍÁ³Å¨¤Ë¤Þ¤ï¤Ã¤¿¡ª", m_name);
 #else
-               msg_format("%^s suddenly becomes hostile!", m_name);
+                       msg_format("%^s suddenly becomes hostile!", m_name);
 #endif
+               }
 
                set_hostile(m_ptr);
        }