Kentaro Shirakata
argra****@users*****
2005年 6月 22日 (水) 02:53:09 JST
ForkIndex: jnethack/src/eat.c
diff -u jnethack/src/eat.c:1.40 jnethack/src/eat.c:1.41
--- jnethack/src/eat.c:1.40 Sat Jun 11 07:02:04 2005
+++ jnethack/src/eat.c Wed Jun 22 02:53:09 2005
@@ -1603,7 +1603,7 @@
!type_is_pname(&mons[mnum]) ? "the " : "",
s_suffix(mons[mnum].mname));
#else
- Sprintf(buf, "腐った%sを食べ食中毒", corpse_xname(otmp,TRUE));
+ Sprintf(buf, "腐った%s", corpse_xname(otmp,TRUE));
make_sick(sick_time, buf, TRUE, SICK_VOMITABLE);
#endif
}
Index: jnethack/src/mhitu.c
diff -u jnethack/src/mhitu.c:1.40 jnethack/src/mhitu.c:1.41
--- jnethack/src/mhitu.c:1.40 Tue Apr 26 04:21:43 2005
+++ jnethack/src/mhitu.c Wed Jun 22 02:53:09 2005
@@ -1031,12 +1031,8 @@
make_sick(Sick ? Sick/3L + 1L : (long)rn1(ACURR(A_CON), 20),
mdat->mname, TRUE, SICK_NONVOMITABLE);
#else
- static char jbuf[BUFSZ];
-
- Strcpy(jbuf, jtrns_mon(mdat->mname));
- Strcat(jbuf, "によって");
make_sick(Sick ? Sick/3L + 1L : (long)rn1(ACURR(A_CON), 20),
- jbuf, TRUE, SICK_NONVOMITABLE);
+ jtrns_mon(mdat->mname), TRUE, SICK_NONVOMITABLE);
#endif
return TRUE;
}
Index: jnethack/src/timeout.c
diff -u jnethack/src/timeout.c:1.25 jnethack/src/timeout.c:1.26
--- jnethack/src/timeout.c:1.25 Fri Jun 10 15:55:15 2005
+++ jnethack/src/timeout.c Wed Jun 22 02:53:09 2005
@@ -221,7 +221,9 @@
{
register struct prop *upp;
int sleeptime;
+#if 0 /*JP*/
int m_idx;
+#endif
int baseluck = (flags.moonphase == FULL_MOON) ? 1 : 0;
if (flags.friday13) baseluck -= 1;
@@ -330,6 +332,7 @@
You("die from your illness.");
*/
You("病気で死んだ．");
+#if 0 /*JP*/
killer_format = KILLED_BY_AN;
killer = u.usick_cause;
if ((m_idx = name_to_mon(killer)) >= LOW_PM) {
@@ -341,6 +344,19 @@
killer_format = KILLED_BY;
}
}
+#else
+ {
+ static char jbuf[BUFSZ];
+ Strcpy(jbuf, u.usick_cause);
+ if (u.usick_type & SICK_VOMITABLE) {
+ Strcat(jbuf, "による食あたりで死んだ");
+ } else {
+ Strcat(jbuf, "によって病死した");
+ }
+ killer_format = NO_KILLER_PREFIX;
+ killer = jbuf;
+ }
+#endif
u.usick_type = 0;
done(POISONING);
break;