fix #42332

diff --git a/src/mon.c b/src/mon.c
index ab76fc4..22f5fa5 100644 (file)
--- a/src/mon.c
+++ b/src/mon.c
@@ -2517,9 +2517,9 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
         u.uconduct.killer++;
 
     if (!nomsg) {
-#if 0 /*JP*/
         boolean namedpet = has_mname(mtmp) && !Hallucination;
 
+#if 0 /*JP*/
         You("%s %s!",
             nonliving(mtmp->data) ? "destroy" : "kill",
             !(wasinside || canspotmon(mtmp)) ? "it"
@@ -2527,10 +2527,11 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
                 : x_monnam(mtmp, namedpet ? ARTICLE_NONE : ARTICLE_THE,
                            "poor", namedpet ? SUPPRESS_SADDLE : 0, FALSE));
 #else
-        You("%s%s\82ð\93|\82µ\82½\81I",
-            !(wasinside || canspotmon(mtmp)) ? "\82»\82ê"
-              : mtmp->mtame ? "\82©\82í\82¢\82»\82¤\82È" : "",
-                mon_nam(mtmp));
+        You("%s\82ð\93|\82µ\82½\81I",
+            !(wasinside || canspotmon(mtmp)) ? "\89½\8eÒ\82©"
+              : !mtmp->mtame ? mon_nam(mtmp)
+                : x_monnam(mtmp, namedpet ? ARTICLE_NONE : ARTICLE_THE,
+                           "\82©\82í\82¢\82»\82¤\82È", namedpet ? SUPPRESS_SADDLE : 0, FALSE));
 #endif
     }
 

diff --git a/src/mthrowu.c b/src/mthrowu.c
index b03cc95..86453d5 100644 (file)
--- a/src/mthrowu.c
+++ b/src/mthrowu.c
@@ -330,9 +330,10 @@ struct obj *otmp, *mwep;
               m_shot.s ? "shoots" : "throws", onm,
               mtarg ? " at " : "", trgbuf);
 #else
-        pline("%s\82Í%s\82ð%s\82É%s\81I", Monnam(mtmp),
+        pline("%s\82Í%s\82ð%s%s%s\81I", Monnam(mtmp),
               onm,
               trgbuf,
+              mtarg ? "\82É" : "",
               m_shot.s ? "\8c\82\82Á\82½" : "\93\8a\82°\82½");
 #endif
         m_shot.o = otmp->otyp;