From e2d9e01e8407f7f612967f7afdf7aaf33e463f26 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Wed, 12 Mar 2003 18:26:17 +0000
Subject: [PATCH] rndcolor()

> "A cloud of sangria gas billows from the chest.
> You stagger and your vision blurs."
> When I see the gas billowing from the chest, I'm not yet
> hallucinating. Shouldn't the gas have a normal colour, then?
> Only after my vision blurs should the gas assume a fake colour, I
> think.
>
---
 doc/fixes34.2 | 1 +
 src/do_name.c | 9 +++++++++
 src/trap.c    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 1ed2b2a6d..cbdf90209 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -16,6 +16,7 @@ include statue contents in end of game inventory disclosure
 treat handlessness as a major problem when deciding prayer outcome
 perform artifact touch checks when putting on accessories
 missing noun in message when horns pierce through your helmet
+don't use hcolor() for trapped chest gases when you aren't hallucinating
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/do_name.c b/src/do_name.c
index 9c6ded0e4..0b276bb87 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1002,6 +1002,15 @@ const char *colorpref;
 		hcolors[rn2(SIZE(hcolors))] : colorpref;
 }
 
+/* return a random real color unless hallucinating */
+const char *
+rndcolor()
+{
+	int k = rn2(CLR_MAX);
+	return Hallucination ? hcolor((char *)0) : (k == NO_COLOR) ?
+		"colorless" : c_obj_colors[k];
+}
+
 /* Aliases for road-runner nemesis
  */
 static const char * const coynames[] = {
diff --git a/src/trap.c b/src/trap.c
index c9f71b5c3..0f9580143 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -3586,7 +3586,7 @@ boolean disarm;
 		case 0:
 			pline("A cloud of %s gas billows from %s.",
 				Blind ? blindgas[rn2(SIZE(blindgas))] :
-				hcolor((char *)0), the(xname(obj)));
+				rndcolor(), the(xname(obj)));
 			if(!Stunned) {
 			    if (Hallucination)
 				pline("What a groovy feeling!");