• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubybathyscaphegamepythonphpguiwindowsc翻訳omegattwitterframeworkbtronarduinovb.net計画中(planning stage)directxpreviewertestゲームエンジンdom

patch投げ用


Commit MetaInfo

Revision1ac09e0d266750c55db570f602bf0ac4962b0811 (tree)
Zeit2016-08-30 04:30:13
AutorSHIRAKATA Kentaro <argrath@ub32...>
CommiterSHIRAKATA Kentaro

Log Message

fix #36579

Ändern Zusammenfassung

Diff

--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -1,3 +1,5 @@
1+ * 一部の死因で「死んだ」が表示されない問題を修正 (#36579)
2+
13 Sun Jun 11 2016 Kentaro Shirakata <argrath@ub32.org>
24
35 * JNetHack-3.6.0-0.6リリース
--- 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 */
599599 pline("Ingesting that is fatal.");
600600 */
601601 pline("取り込んだらすぐに死んでしまった.");
602-/*JP
602+#if 0 /*JP*/
603603 Sprintf(killer.name, "unwisely ate the brain of %s", pd->mname);
604-*/
605- Sprintf(killer.name, "愚かにも%sの体を食べて", pd->mname);
606604 killer.format = NO_KILLER_PREFIX;
605+#else
606+ Sprintf(killer.name, "愚かにも%sの体を食べて", pd->mname);
607+ killer.format = KILLED_BY;
608+#endif
607609 done(DIED);
608610 /* life-saving needed to reach here */
609611 exercise(A_WIS, FALSE);
--- a/src/hack.c
+++ b/src/hack.c
@@ -702,7 +702,11 @@ dosinkfall()
702702 */
703703 You("床に叩きつけられた!");
704704 dmg = rn1(8, 25 - (int) ACURR(A_CON));
705+#if 0 /*JP*/
705706 losehp(Maybe_Half_Phys(dmg), fell_on_sink, NO_KILLER_PREFIX);
707+#else
708+ losehp(Maybe_Half_Phys(dmg), fell_on_sink, KILLED_BY);
709+#endif
706710 exercise(A_DEX, FALSE);
707711 /*JP
708712 selftouch("Falling, you");
--- a/src/music.c
+++ b/src/music.c
@@ -472,7 +472,7 @@ int force;
472472 "fell into a chasm", NO_KILLER_PREFIX);
473473 #else
474474 losehp(Maybe_Half_Phys(rnd(6)),
475- "地割れに落ちて", NO_KILLER_PREFIX);
475+ "地割れに落ちて", KILLED_BY);
476476 #endif
477477 /*JP
478478 selftouch("Falling, you");
@@ -494,7 +494,7 @@ int force;
494494 "hurt in a chasm", NO_KILLER_PREFIX);
495495 #else
496496 losehp(Maybe_Half_Phys(rnd(keepfooting ? 2 : 4)),
497- "地割れで傷ついて", NO_KILLER_PREFIX);
497+ "地割れで傷ついて", KILLED_BY);
498498 #endif
499499 if (keepfooting)
500500 exercise(A_DEX, TRUE);
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -1248,11 +1248,13 @@ rehumanize()
12481248 {
12491249 /* You can't revert back while unchanging */
12501250 if (Unchanging && (u.mh < 1)) {
1251+#if 0 /*JP*/
12511252 killer.format = NO_KILLER_PREFIX;
1252-/*JP
12531253 Strcpy(killer.name, "killed while stuck in creature form");
1254-*/
1254+#else
1255+ killer.format = KILLED_BY;
12551256 Strcpy(killer.name, "元の姿へ戻れずに");
1257+#endif
12561258 done(DIED);
12571259 }
12581260
--- a/src/spell.c
+++ b/src/spell.c
@@ -1269,10 +1269,11 @@ boolean atme;
12691269 #if 0 /*JP*/
12701270 Sprintf(buf, "zapped %sself with a spell",
12711271 uhim());
1272+ losehp(damage, buf, NO_KILLER_PREFIX);
12721273 #else
12731274 Strcpy(buf, "自分自身の魔法を浴びて");
1275+ losehp(damage, buf, KILLED_BY);
12741276 #endif
1275- losehp(damage, buf, NO_KILLER_PREFIX);
12761277 }
12771278 } else {
12781279 explode(u.dx, u.dy,
@@ -1344,7 +1345,11 @@ boolean atme;
13441345 Strcpy(buf, "自分自身の魔法を浴びて");
13451346 if (physical_damage)
13461347 damage = Maybe_Half_Phys(damage);
1348+#if 0 /*JP*/
13471349 losehp(damage, buf, NO_KILLER_PREFIX);
1350+#else
1351+ losehp(damage, buf, KILLED_BY);
1352+#endif
13481353 }
13491354 } else
13501355 weffects(pseudo);
--- a/src/steed.c
+++ b/src/steed.c
@@ -431,7 +431,11 @@ boolean force; /* Quietly force this animal */
431431 SUPPRESS_IT | SUPPRESS_INVISIBLE
432432 | SUPPRESS_HALLUCINATION,
433433 TRUE));
434+#if 0 /*JP*/
434435 losehp(Maybe_Half_Phys(rn1(5, 10)), buf, NO_KILLER_PREFIX);
436+#else
437+ losehp(Maybe_Half_Phys(rn1(5, 10)), buf, KILLED_BY);
438+#endif
435439 return (FALSE);
436440 }
437441
--- a/src/trap.c
+++ b/src/trap.c
@@ -1559,7 +1559,7 @@ unsigned trflags;
15591559 ? "わざわざトゲだらけの落し穴に突入して"
15601560 : adj_pit ? "トゲだらけの落し穴に踏み込んで"
15611561 : "トゲだらけの落し穴に落ちて",
1562- NO_KILLER_PREFIX);
1562+ KILLED_BY);
15631563 #endif
15641564 if (!rn2(6))
15651565 #if 0 /*JP*/
@@ -1590,7 +1590,7 @@ unsigned trflags;
15901590 losehp(Maybe_Half_Phys(rnd(6)),
15911591 plunged ? "わざわざ落し穴に突入して"
15921592 : "落し穴に落ちて",
1593- NO_KILLER_PREFIX);
1593+ KILLED_BY);
15941594 #endif
15951595 }
15961596 if (Punished && !carried(uball)) {
--- a/src/zap.c
+++ b/src/zap.c
@@ -2283,7 +2283,7 @@ dozap()
22832283 Sprintf(buf, "zapped %sself with a wand", uhim());
22842284 losehp(Maybe_Half_Phys(damage), buf, NO_KILLER_PREFIX);
22852285 #else
2286- losehp(Maybe_Half_Phys(damage), "自分自身の杖の力を浴びて", NO_KILLER_PREFIX);
2286+ losehp(Maybe_Half_Phys(damage), "自分自身の杖の力を浴びて", KILLED_BY);
22872287 #endif
22882288 }
22892289 } else {
@@ -2552,11 +2552,13 @@ boolean ordinary;
25522552 break;
25532553 }
25542554 learn_it = TRUE;
2555-/*JP
2555+#if 0 /*JP*/
25562556 Sprintf(killer.name, "shot %sself with a death ray", uhim());
2557-*/
2558- Strcpy(killer.name, "自分が撃った死の光線によって");
25592557 killer.format = NO_KILLER_PREFIX;
2558+#else
2559+ Strcpy(killer.name, "自分が撃った死の光線によって");
2560+ killer.format = KILLED_BY;
2561+#endif
25602562 /*JP
25612563 You("irradiate yourself with pure energy!");
25622564 */
@@ -2732,7 +2734,11 @@ int amt; /* pseudo-damage used to determine blindness duration */
27322734 Sprintf(buf, "%s %sself with %s", ordinary ? "zapped" : "blasted",
27332735 uhim(), how);
27342736 /* might rehumanize(); could be fatal, but only for Unchanging */
2737+#if 0 /*JP*/
27352738 losehp(Maybe_Half_Phys(dmg), buf, NO_KILLER_PREFIX);
2739+#else
2740+ losehp(Maybe_Half_Phys(dmg), buf, KILLED_BY);
2741+#endif
27362742 }
27372743 return dmg;
27382744 }