From 2695ca47b4444bf6eaccc68e2d7ffba8190f5afc Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Mon, 19 Aug 2002 00:00:52 +0000 Subject: [PATCH] gas colors while blind on Sunday, August 18, 2002 at 15:28:18 > comments: player is blind, and not hallucinating (initially). On #loot: > > You trigger a trap! > A cloud of ultraviolet gas billows from the large box. > You stagger and get dizzy... --- doc/fixes34.1 | 2 +- src/trap.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index 78f4ebd54..468a13703 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -208,6 +208,7 @@ zero entries in DUNGEON, MONSTERS, et al, of config file are now treated enlightenment: don't misreport polymorphed lycanthrope as "in beast form" remove TIMED_DELAY from the features checked for version compatibility rolling boulder hitting monster stuck in pit should stop even when mon survives +don't see chest trap gas colors while Blind Platform- and/or Interface-Specific Fixes @@ -229,7 +230,6 @@ win32gui: A caret bug was fixed win32gui: fix bug that caused two lines too many to be drawn on each paint win32gui: last line no longer highlighted win32gui: reduce the number of popups and support for !popup -win32gui: support for not having popup windows win32tty: honour the use_inverse option and default to ATR_BOLD if disabled win32tty: respond only to mouse clicks not mouse movement win32tty: allow ^C to abort the game at the "Who are you?" prompt diff --git a/src/trap.c b/src/trap.c index 250380d63..526e7bd68 100644 --- a/src/trap.c +++ b/src/trap.c @@ -34,6 +34,7 @@ STATIC_VAR const char *A_Your[2]; STATIC_VAR const char *the_your[2]; STATIC_VAR const char tower_of_flame[]; STATIC_VAR const char *A_gush_of_water_hits; +STATIC_VAR const char * const blindgas[6]; #else @@ -42,6 +43,8 @@ STATIC_VAR const char *A_Your[2] = { "A", "Your" }; STATIC_VAR const char *the_your[2] = { "the", "your" }; STATIC_VAR const char tower_of_flame[] = "tower of flame"; STATIC_VAR const char *A_gush_of_water_hits = "A gush of water hits"; +STATIC_VAR const char * const blindgas[6] = + {"humid", "odorless", "pungent", "chilling", "acrid", "biting"}; #endif /* OVLB */ @@ -3497,8 +3500,8 @@ boolean disarm; case 1: case 0: pline("A cloud of %s gas billows from %s.", - hcolor((char *)0), - the(xname(obj))); + Blind ? blindgas[rn2(SIZE(blindgas))] : + hcolor((char *)0), the(xname(obj))); if(!Stunned) { if (Hallucination) pline("What a groovy feeling!");