From e69082321e94dd857068ef9d1502eb1e47d13a0c Mon Sep 17 00:00:00 2001 From: SHIRAKATA Kentaro Date: Sat, 22 Sep 2018 22:21:03 +0900 Subject: [PATCH] fix #38620 --- ChangeLog.j | 1 + src/apply.c | 3 --- src/eat.c | 17 +++++------------ src/pray.c | 3 --- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/ChangeLog.j b/ChangeLog.j index d7c3b37..c9b736e 100644 --- a/ChangeLog.j +++ b/ChangeLog.j @@ -5,6 +5,7 @@ * ‰ö•¨/ƒAƒCƒeƒ€ƒf[ƒ^‚ª3.6.1‚ɍXV‚³‚ê‚Ä‚¢‚È‚¢ (#38576) * ƒEƒBƒU[ƒhƒ‚[ƒh‚Å–‚–@‚Ì㩂ðŠè‚¦‚È‚¢ (#38584) * ƒ^ƒCƒ‹ì¬Žž‚ÉŒx‚ªo‚é (#38608) + * Õ’d•ù‚°ƒƒjƒ…[‚ŐH‚ו¨‚â–‚œ‚¯‚ªƒtƒBƒ‹ƒ^‚³‚ê‚Ä‚¢‚È‚¢ (#38620) * –|–ó’ljÁC³ Thu Jun 21 2018 Kentaro Shirakata diff --git a/src/apply.c b/src/apply.c index 802906b..380209c 100644 --- a/src/apply.c +++ b/src/apply.c @@ -2474,10 +2474,7 @@ struct obj *obj; pline("ŠÊ‹l‚ðì‚邽‚ß‚ÌŠÊ‚ªØ‚ꂽ‚悤‚¾D"); return; } -/*JP if (!(corpse = floorfood("tin", 2))) -*/ - if (!(corpse = floorfood("ŠÊ‹l‚ß‚É‚·‚é", 2))) return; if (corpse->oeaten) { /*JP diff --git a/src/eat.c b/src/eat.c index 02caf5d..a76cb14 100644 --- a/src/eat.c +++ b/src/eat.c @@ -3046,10 +3046,7 @@ doeat() pline("‘§‚à‚Å‚«‚È‚¢‚̂ɁC‚Ç‚¤‚â‚Á‚ĐH‚ׂ½‚ç‚¢‚¢‚ñ‚¾‚¢H"); return 0; } -/*JP if (!(otmp = floorfood("eat", 0))) -*/ - if (!(otmp = floorfood("H‚ׂé", 0))) return 0; if (check_capacity((char *) 0)) return 0; @@ -3806,10 +3803,11 @@ boolean incr; /* Returns an object representing food. * Object may be either on floor or in inventory. */ -/*JP CHECK: 3.4.3 ‚ł̌Ăяo‚µŒ³ -apply.c:1959: if (!(corpse = floorfood("ŠÊ‹l‚ß‚É‚·‚é", 2))) return; -eat.c:2404: if (!(otmp = floorfood("H‚ׂé", 0))) return 0; -pray.c:1478: if (!(otmp = floorfood("•ù‚°‚é", 1))) return 0; +/*JP CHECK: 3.6.1 ‚ł̌Ăяo‚µŒ³ +apply.c:2478: if (!(corpse = floorfood("tin", 2))) +eat.c:3050: if (!(otmp = floorfood("eat", 0))) +pray.c:1659: otmp = floorfood("sacrifice", 1); + ‚±‚̊֐”‚͉pŒê–¼‚̂܂܌Ăяo‚·‚±‚ƁB */ struct obj * floorfood(verb, corpsecheck) @@ -3819,13 +3817,8 @@ int corpsecheck; /* 0, no check, 1, corpses, 2, tinnable corpses */ register struct obj *otmp; char qbuf[QBUFSZ]; char c; -#if 0 /*JP*/ boolean feeding = !strcmp(verb, "eat"), /* corpsecheck==0 */ offering = !strcmp(verb, "sacrifice"); /* corpsecheck==1 */ -#else - boolean feeding = !strcmp(verb, "H‚ׂé"), /* corpsecheck==0 */ - offering = !strcmp(verb, "•ù‚°‚é"); /* corpsecheck==1 */ -#endif #if 1 /*JP*/ const char *jverb = trans_verb(verb)->jp; diff --git a/src/pray.c b/src/pray.c index 2550a4d..d4e95a9 100644 --- a/src/pray.c +++ b/src/pray.c @@ -1655,10 +1655,7 @@ dosacrifice() highaltar = ((Is_astralevel(&u.uz) || Is_sanctum(&u.uz)) && (levl[u.ux][u.uy].altarmask & AM_SHRINE)); -/*JP otmp = floorfood("sacrifice", 1); -*/ - otmp = floorfood("•ù‚°‚é", 1); if (!otmp) return 0; /* -- 2.11.0