current_fruit (trunk only)

I almost abandoned this when Michael beat me to it, but besides
handling the fruit rename bug it also moves `current_fruit' into the
context structure to eliminate separate save/restore for that.
This commit is contained in:
nethack.rankin
2008-07-21 00:03:41 +00:00
parent 60b7b2c0f0
commit 35493a3545
11 changed files with 22 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)eat.c 3.5 2008/05/26 */
/* SCCS Id: @(#)eat.c 3.5 2008/07/20 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1747,8 +1747,8 @@ struct obj *otmp;
}
/* Fall through otherwise */
default:
if (otmp->otyp==SLIME_MOLD && !otmp->cursed
&& otmp->spe == current_fruit)
if (otmp->otyp == SLIME_MOLD && !otmp->cursed &&
otmp->spe == context.current_fruit)
pline("My, that was a %s %s!",
Hallucination ? "primo" : "yummy",
singular(otmp, xname));