summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/libgui.cc
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-12 23:58:38 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-12 23:58:38 +0000
commitda564513af06fdb6720039ab7c4a51afcdfdf789 (patch)
tree9d4d9ae621841ebd49c7c71b4120c756fd6976fc /crawl-ref/source/libgui.cc
parent432aa54add7c08c682f57508c8e995b0e214f5d4 (diff)
downloadcrawl-ref-da564513af06fdb6720039ab7c4a51afcdfdf789.tar.gz
crawl-ref-da564513af06fdb6720039ab7c4a51afcdfdf789.zip
[1982177] Fix issue where the minimap wasn't coloring out-of-sight neutral or friendly monsters correctly.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5769 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/libgui.cc')
-rw-r--r--crawl-ref/source/libgui.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index a5171b3906..13c0b7e3f2 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -373,14 +373,11 @@ void GmapUpdate(int x, int y, int what, bool upd_tile)
if (c == Options.tile_monster_col && mgrd[x][y] != NON_MONSTER)
{
const int grid = mgrd[x][y];
- if (mons_friendly(&menv[grid]) && upd_tile)
+ if (mons_friendly(&menv[grid]))
c = Options.tile_friendly_col; // colour friendly monsters
- else if (mons_neutral(&menv[grid]) && upd_tile
- && Options.tile_neutral_col != Options.tile_monster_col)
- {
+ else if (mons_neutral(&menv[grid]))
c = Options.tile_neutral_col; // colour neutral monsters
- }
- else if (mons_class_flag( menv[grid].type, M_NO_EXP_GAIN ))
+ else if (mons_class_flag(menv[grid].type, M_NO_EXP_GAIN))
c = Options.tile_plant_col; // colour zero xp monsters
}