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

touchstone ugly check didn't take GOLDOBJ into consideration.

Browse Source
This commit is contained in:
nethack.allison
2002-01-26 15:16:06 +00:00
parent 69ce21fe0b
commit 1454fb5e71
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/invent.c
View File

@@ -708,13 +708,9 @@ register const char *let,*word;
register char *bp = buf; register char *bp = buf;
xchar allowcnt = 0; /* 0, 1 or 2 */ xchar allowcnt = 0; /* 0, 1 or 2 */
#ifndef GOLDOBJ #ifndef GOLDOBJ
boolean allowgold = FALSE, usegold = FALSE; boolean allowgold = FALSE; /* can't use gold because they don't have any */
/* Two possibilities: they can't use gold because it's illegal,
* or they can't use gold because they don't have any.
*/
#else
boolean usegold = FALSE;
#endif #endif
boolean usegold = FALSE; /* can't use gold because its illegal */
boolean allowall = FALSE; boolean allowall = FALSE;
boolean allownone = FALSE; boolean allownone = FALSE;
xchar foox = 0; xchar foox = 0;
@@ -730,8 +726,14 @@ register const char *let,*word;
if(*let == GOLD_CLASS) let++, usegold = TRUE; if(*let == GOLD_CLASS) let++, usegold = TRUE;
#endif #endif
/* Ugly check for touchstone */ /* Ugly check for touchstone */
if (!strncmp(word, "rub on", 6) && u.ugold) if (!strncmp(word, "rub on", 6)
#ifndef GOLDOBJ
&& u.ugold)
allowgold = usegold = TRUE; allowgold = usegold = TRUE;
#else
)
usegold = TRUE;
#endif
/* Equivalent of an "ugly check" for gold */ /* Equivalent of an "ugly check" for gold */
if (usegold && !strcmp(word, "eat") && !metallivorous(youmonst.data)) if (usegold && !strcmp(word, "eat") && !metallivorous(youmonst.data))