fix #36579

diff --git a/ChangeLog.j b/ChangeLog.j
index 01d657d..e0623bb 100644 (file)
--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -1,3 +1,5 @@
+       * \88ê\95\94\82Ì\8e\80\88ö\82Å\81u\8e\80\82ñ\82¾\81v\82ª\95\\8e¦\82³\82ê\82È\82¢\96â\91è\82ð\8fC\90³ (#36579)
+
 Sun Jun 11 2016  Kentaro Shirakata  <argrath@ub32.org>
 
        * JNetHack-3.6.0-0.6\83\8a\83\8a\81[\83X

diff --git a/src/eat.c b/src/eat.c
index 477d96f..eb9ef7a 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -599,11 +599,13 @@ int *dmg_p; /* for dishing out extra damage in lieu of Int loss */
             pline("Ingesting that is fatal.");
 */
             pline("\8eæ\82è\8d\9e\82ñ\82¾\82ç\82·\82®\82É\8e\80\82ñ\82Å\82µ\82Ü\82Á\82½\81D");
-/*JP
+#if 0 /*JP*/
             Sprintf(killer.name, "unwisely ate the brain of %s", pd->mname);
-*/
-            Sprintf(killer.name, "\8bð\82©\82É\82à%s\82Ì\91Ì\82ð\90H\82×\82Ä", pd->mname);
             killer.format = NO_KILLER_PREFIX;
+#else
+            Sprintf(killer.name, "\8bð\82©\82É\82à%s\82Ì\91Ì\82ð\90H\82×\82Ä", pd->mname);
+            killer.format = KILLED_BY;
+#endif
             done(DIED);
             /* life-saving needed to reach here */
             exercise(A_WIS, FALSE);

diff --git a/src/hack.c b/src/hack.c
index 115e303..b0a8ea5 100644 (file)
--- a/src/hack.c
+++ b/src/hack.c
@@ -702,7 +702,11 @@ dosinkfall()
 */
         You("\8f°\82É\92@\82«\82Â\82¯\82ç\82ê\82½\81I");
         dmg = rn1(8, 25 - (int) ACURR(A_CON));
+#if 0 /*JP*/
         losehp(Maybe_Half_Phys(dmg), fell_on_sink, NO_KILLER_PREFIX);
+#else
+        losehp(Maybe_Half_Phys(dmg), fell_on_sink, KILLED_BY);
+#endif
         exercise(A_DEX, FALSE);
 /*JP
         selftouch("Falling, you");

diff --git a/src/music.c b/src/music.c
index 75c1114..a5d9f24 100644 (file)
--- a/src/music.c
+++ b/src/music.c
@@ -472,7 +472,7 @@ int force;
                                    "fell into a chasm", NO_KILLER_PREFIX);
 #else
                             losehp(Maybe_Half_Phys(rnd(6)),
-                                   "\92n\8a\84\82ê\82É\97\8e\82¿\82Ä", NO_KILLER_PREFIX);
+                                   "\92n\8a\84\82ê\82É\97\8e\82¿\82Ä", KILLED_BY);
 #endif
 /*JP
                             selftouch("Falling, you");
@@ -494,7 +494,7 @@ int force;
                                    "hurt in a chasm", NO_KILLER_PREFIX);
 #else
                             losehp(Maybe_Half_Phys(rnd(keepfooting ? 2 : 4)),
-                                   "\92n\8a\84\82ê\82Å\8f\9d\82Â\82¢\82Ä", NO_KILLER_PREFIX);
+                                   "\92n\8a\84\82ê\82Å\8f\9d\82Â\82¢\82Ä", KILLED_BY);
 #endif
                             if (keepfooting)
                                 exercise(A_DEX, TRUE);

diff --git a/src/polyself.c b/src/polyself.c
index 83c8ac2..bde3521 100644 (file)
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -1248,11 +1248,13 @@ rehumanize()
 {
     /* You can't revert back while unchanging */
     if (Unchanging && (u.mh < 1)) {
+#if 0 /*JP*/
         killer.format = NO_KILLER_PREFIX;
-/*JP
         Strcpy(killer.name, "killed while stuck in creature form");
-*/
+#else
+        killer.format = KILLED_BY;
         Strcpy(killer.name, "\8c³\82Ì\8ep\82Ö\96ß\82ê\82¸\82É");
+#endif
         done(DIED);
     }
 

diff --git a/src/spell.c b/src/spell.c
index c7ea47c..752c26d 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -1269,10 +1269,11 @@ boolean atme;
 #if 0 /*JP*/
                             Sprintf(buf, "zapped %sself with a spell",
                                     uhim());
+                            losehp(damage, buf, NO_KILLER_PREFIX);
 #else
                             Strcpy(buf, "\8e©\95ª\8e©\90g\82Ì\96\82\96@\82ð\97\81\82Ñ\82Ä");
+                            losehp(damage, buf, KILLED_BY);
 #endif
-                            losehp(damage, buf, NO_KILLER_PREFIX);
                         }
                     } else {
                         explode(u.dx, u.dy,
@@ -1344,7 +1345,11 @@ boolean atme;
                     Strcpy(buf, "\8e©\95ª\8e©\90g\82Ì\96\82\96@\82ð\97\81\82Ñ\82Ä");
                     if (physical_damage)
                         damage = Maybe_Half_Phys(damage);
+#if 0 /*JP*/
                     losehp(damage, buf, NO_KILLER_PREFIX);
+#else
+                    losehp(damage, buf, KILLED_BY);
+#endif
                 }
             } else
                 weffects(pseudo);

diff --git a/src/steed.c b/src/steed.c
index 08ff70d..d724d0f 100644 (file)
--- a/src/steed.c
+++ b/src/steed.c
@@ -431,7 +431,11 @@ boolean force;      /* Quietly force this animal */
                          SUPPRESS_IT | SUPPRESS_INVISIBLE
                              | SUPPRESS_HALLUCINATION,
                          TRUE));
+#if 0 /*JP*/
         losehp(Maybe_Half_Phys(rn1(5, 10)), buf, NO_KILLER_PREFIX);
+#else
+        losehp(Maybe_Half_Phys(rn1(5, 10)), buf, KILLED_BY);
+#endif
         return (FALSE);
     }
 

diff --git a/src/trap.c b/src/trap.c
index 349a867..0ec8de2 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -1559,7 +1559,7 @@ unsigned trflags;
                            ? "\82í\82´\82í\82´\83g\83Q\82¾\82ç\82¯\82Ì\97\8e\82µ\8c\8a\82É\93Ë\93ü\82µ\82Ä"
                            : adj_pit ? "\83g\83Q\82¾\82ç\82¯\82Ì\97\8e\82µ\8c\8a\82É\93¥\82Ý\8d\9e\82ñ\82Å"
                                      : "\83g\83Q\82¾\82ç\82¯\82Ì\97\8e\82µ\8c\8a\82É\97\8e\82¿\82Ä",
-                       NO_KILLER_PREFIX);
+                       KILLED_BY);
 #endif
                 if (!rn2(6))
 #if 0 /*JP*/
@@ -1590,7 +1590,7 @@ unsigned trflags;
                     losehp(Maybe_Half_Phys(rnd(6)),
                            plunged ? "\82í\82´\82í\82´\97\8e\82µ\8c\8a\82É\93Ë\93ü\82µ\82Ä"
                                    : "\97\8e\82µ\8c\8a\82É\97\8e\82¿\82Ä",
-                           NO_KILLER_PREFIX);
+                           KILLED_BY);
 #endif
             }
             if (Punished && !carried(uball)) {

diff --git a/src/zap.c b/src/zap.c
index d29ee54..b3a97b1 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -2283,7 +2283,7 @@ dozap()
             Sprintf(buf, "zapped %sself with a wand", uhim());
             losehp(Maybe_Half_Phys(damage), buf, NO_KILLER_PREFIX);
 #else
-            losehp(Maybe_Half_Phys(damage), "\8e©\95ª\8e©\90g\82Ì\8fñ\82Ì\97Í\82ð\97\81\82Ñ\82Ä", NO_KILLER_PREFIX);
+            losehp(Maybe_Half_Phys(damage), "\8e©\95ª\8e©\90g\82Ì\8fñ\82Ì\97Í\82ð\97\81\82Ñ\82Ä", KILLED_BY);
 #endif
         }
     } else {
@@ -2552,11 +2552,13 @@ boolean ordinary;
             break;
         }
         learn_it = TRUE;
-/*JP
+#if 0 /*JP*/
         Sprintf(killer.name, "shot %sself with a death ray", uhim());
-*/
-        Strcpy(killer.name, "\8e©\95ª\82ª\8c\82\82Á\82½\8e\80\82Ì\8cõ\90ü\82É\82æ\82Á\82Ä");
         killer.format = NO_KILLER_PREFIX;
+#else
+        Strcpy(killer.name, "\8e©\95ª\82ª\8c\82\82Á\82½\8e\80\82Ì\8cõ\90ü\82É\82æ\82Á\82Ä");
+        killer.format = KILLED_BY;
+#endif
 /*JP
         You("irradiate yourself with pure energy!");
 */
@@ -2732,7 +2734,11 @@ int amt;          /* pseudo-damage used to determine blindness duration */
         Sprintf(buf, "%s %sself with %s", ordinary ? "zapped" : "blasted",
                 uhim(), how);
         /* might rehumanize(); could be fatal, but only for Unchanging */
+#if 0 /*JP*/
         losehp(Maybe_Half_Phys(dmg), buf, NO_KILLER_PREFIX);
+#else
+        losehp(Maybe_Half_Phys(dmg), buf, KILLED_BY);
+#endif
     }
     return dmg;
 }