nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2018-07-28 08:49:18 -04:00
parent 81a96ee609 13ef59a24b
commit 2fe6c4876a
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/eat.c
View File

@@ -1395,7 +1395,16 @@ const char *mesg;
u.uconduct.food++; /* don't need vegetarian checks for spinach */
if (!tin->cursed)
pline("This makes you feel like %s!",
Hallucination ? "Swee'pea" : "Popeye");
/* "Swee'pea" is a character from the Popeye cartoons */
Hallucination ? "Swee'pea"
/* "feel like Popeye" unless sustain ability suppresses
any attribute change; this slightly oversimplifies
things: we want "Popeye" if no strength increase
occurs due to already being at maximum, but we won't
get it if at-maximum and fixed-abil both apply */
: !Fixed_abil ? "Popeye"
/* no gain, feel like another character from Popeye */
: (flags.female ? "Olive Oyl" : "Bluto"));
gainstr(tin, 0, FALSE);
tin = costly_tin(COST_OPEN);

4
src/pager.c
View File

@@ -187,6 +187,10 @@ struct obj **obj_p;
otmp->spe = context.current_fruit; /* give it a type */
if (mtmp && has_mcorpsenm(mtmp)) /* mimic as corpse/statue */
otmp->corpsenm = MCORPSENM(mtmp);
else if (otmp->otyp == CORPSE && glyph_is_body(glyph))
otmp->corpsenm = glyph - GLYPH_BODY_OFF;
else if (otmp->otyp == STATUE && glyph_is_statue(glyph))
otmp->corpsenm = glyph - GLYPH_STATUE_OFF;
}
/* if located at adjacent spot, mark it as having been seen up close
(corpse type will be known even if dknown is 0, so we don't need a