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

fix #H4047 - dipping inconsistency

Browse Source 
Dip the scroll labeled LEP GEX VEN ZEA into the fountain?
Your scroll called light fades.

The first prompt deliberately avoided 'called', 'named', and other
attributes to keep it short, but the discrepancy here is blatant, so
increase the verbosity in order to have the reminder that's included
in the prompt be the same as object name in the followup message.

Bonus fix, noticed while testing it:  water_damage() was reporting
the "{blank,unlabeled} scroll fades" even though blank scrolls are
already as faded as they can get.  Likewise for blank spellbook.
This commit is contained in:
PatR
2015-12-12 19:41:35 -08:00
parent 637f4a4bd6
commit 807afa22b3
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/trap.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1448492213 2015/11/25 22:56:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.249 $ */
/* NetHack 3.6 trap.c $NHDT-Date: 1449977947 2015/12/13 03:39:07 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.250 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3345,10 +3345,11 @@ boolean force;
*/
return ER_NOTHING;
} else if (obj->oclass == SCROLL_CLASS) {
if (obj->otyp == SCR_BLANK_PAPER
#ifdef MAIL
if (obj->otyp == SCR_MAIL)
return 0;
|| obj->otyp == SCR_MAIL
#endif
) return 0;
if (carried(obj))
pline("Your %s %s.", ostr, vtense(ostr, "fade"));
@@ -3362,8 +3363,9 @@ boolean force;
if (obj->otyp == SPE_BOOK_OF_THE_DEAD) {
pline("Steam rises from %s.", the(xname(obj)));
return 0;
} else if (obj->otyp == SPE_BLANK_PAPER) {
return 0;
}
if (carried(obj))
pline("Your %s %s.", ostr, vtense(ostr, "fade"));