diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-01 12:27:26 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-01 12:27:26 +0000 |
| commit | f6ec4c4fbdcfbc223d6490c783142311e9d5021c (patch) | |
| tree | 4a2293191742dc0bf5fd12bb307f8777d05b08d7 /crawl-ref | |
| parent | 80e2e061e3f9c9791daf4e00361bf47092087f07 (diff) | |
| download | crawl-ref-f6ec4c4fbdcfbc223d6490c783142311e9d5021c.tar.gz crawl-ref-f6ec4c4fbdcfbc223d6490c783142311e9d5021c.zip | |
Fixed broken view colours.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1500 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index be3e305bb7..651638be16 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -299,9 +299,10 @@ static void get_symbol( int x, int y, { *ch = Feature[object].symbol; + const int colmask = *colour & CHATTR_COLMASK; // Don't clobber with BLACK, because the colour should be already set. - if (!*colour && Feature[object].colour != BLACK) - *colour = Feature[object].colour; + if (Feature[object].colour != BLACK) + *colour = Feature[object].colour | colmask; // Note anything we see that's notable if (Feature[object].notable) |