From: nethack.allison <nethack.allison>
Date: Sat, 26 Jan 2002 15:16:06 +0000 (+0000)
Subject: touchstone ugly check didn't take GOLDOBJ into consideration.
X-Git-Tag: MOVE2GIT~3341
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1454fb5e71ced9672ba927e3373fd4ceaf56eda3;p=nethack

touchstone ugly check didn't take GOLDOBJ into consideration.
---

diff --git a/src/invent.c b/src/invent.c
index 514a3e5e9..6d0fe456d 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -708,13 +708,9 @@ register const char *let,*word;
 	register char *bp = buf;
 	xchar allowcnt = 0;	/* 0, 1 or 2 */
 #ifndef GOLDOBJ
-	boolean allowgold = FALSE, usegold = FALSE;
-		/* 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;
+	boolean allowgold = FALSE;	/* can't use gold because they don't have any */
 #endif
+	boolean usegold = FALSE;	/* can't use gold because its illegal */
 	boolean allowall = FALSE;
 	boolean allownone = FALSE;
 	xchar foox = 0;
@@ -730,8 +726,14 @@ register const char *let,*word;
 	if(*let == GOLD_CLASS) let++, usegold = TRUE;
 #endif
 	/* 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;
+#else
+		)
+		usegold = TRUE;		
+#endif
 
 	/* Equivalent of an "ugly check" for gold */
 	if (usegold && !strcmp(word, "eat") && !metallivorous(youmonst.data))