summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dungeon.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-05 07:31:05 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-05 07:31:05 +0000
commitde17c107d4d02757ac9a1660469e47fd9fd827d7 (patch)
tree3092dcc5425f72855d17b5e72997ac7a74198042 /crawl-ref/source/dungeon.cc
parent16bfc009e44684b7c3f0dc29febdfbb54ae7a2f3 (diff)
downloadcrawl-ref-de17c107d4d02757ac9a1660469e47fd9fd827d7.tar.gz
crawl-ref-de17c107d4d02757ac9a1660469e47fd9fd827d7.zip
init_pandemonium() needs to re-do dgn_set_colours_from_monsters(),
since it is called after level generation is complete. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2330 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
-rw-r--r--crawl-ref/source/dungeon.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 66a8cf0795..3464174fa7 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -946,7 +946,8 @@ void dgn_set_colours_from_monsters()
if (env.mons_alloc[9] < 0 || env.mons_alloc[9] == MONS_PROGRAM_BUG
|| env.mons_alloc[9] >= NUM_MONSTERS)
{
- env.floor_colour = LIGHTGREY;
+ if (env.floor_colour == BLACK)
+ env.floor_colour = LIGHTGREY;
}
else
env.floor_colour = fix_black_colour(mcolour[env.mons_alloc[9]]);
@@ -955,7 +956,8 @@ void dgn_set_colours_from_monsters()
if (env.mons_alloc[8] < 0 || env.mons_alloc[8] == MONS_PROGRAM_BUG
|| env.mons_alloc[8] >= NUM_MONSTERS)
{
- env.rock_colour = BROWN;
+ if (env.rock_colour == BLACK)
+ env.rock_colour = BROWN;
}
else
env.rock_colour = fix_black_colour(mcolour[env.mons_alloc[8]]);