From 864fb1e2031e4b6ccc7c1df5ce6bc231010de79e Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 10 Jul 2015 15:46:58 +0300
Subject: [PATCH] Fix nocolor messing with dark_room on levelchange

As reported by Pat:
> After leaving a level and then returning, I'm seeing lit
> room squares as blank
> Options all have their default settings

OPTIONS=nocolor is the default; we should probably change this
sometime, because nearly everyone plays with color.
---
 src/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/options.c b/src/options.c
index 0cf54a2a5..9a77e3827 100644
--- a/src/options.c
+++ b/src/options.c
@@ -525,7 +525,7 @@ reglyph_darkroom()
         for (y = 0; y < ROWNO; y++) {
             struct rm *lev = &levl[x][y];
 
-            if (!flags.dark_room || Is_rogue_level(&u.uz)) {
+            if (!flags.dark_room || !iflags.use_color || Is_rogue_level(&u.uz)) {
                 if (lev->glyph == cmap_to_glyph(S_darkroom))
                     lev->glyph = lev->waslit ? cmap_to_glyph(S_room)
                                              : cmap_to_glyph(S_stone);