From d7c6fd9aec5ddd130a171adfaede50666f31a326 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 31 Oct 2009 09:12:59 -0500 Subject: Ensure that ugly things' colors are always low, just in case, and use random_colour() for ETC_RANDOM. --- crawl-ref/source/colour.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/colour.cc') diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index cbdd536886..5f09388af8 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -258,12 +258,12 @@ int element_colour( int element, bool no_random ) case ETC_UGLY: case ETC_VERY_UGLY: ret = ugly_thing_random_colour(); - if (element == ETC_VERY_UGLY) - ret = make_high_colour(ret); + ret = (element == ETC_VERY_UGLY) ? make_high_colour(ret) + : make_low_colour(ret); break; case ETC_RANDOM: - ret = 1 + random2(15); // always random + ret = random_colour(); // always random break; case ETC_FLOOR: // should already be handled -- cgit v1.2.3-54-g00ecf