diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 18:38:27 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 18:38:27 -0600 |
| commit | e64350b0f7fc7837bb13abd5cba7f140a21e60de (patch) | |
| tree | c0a380682f26794ee55085f9e7c9bf4628f40293 /crawl-ref/source/colour.cc | |
| parent | 4d171843747825f44981fbd9b719455254c4033b (diff) | |
| download | crawl-ref-e64350b0f7fc7837bb13abd5cba7f140a21e60de.tar.gz crawl-ref-e64350b0f7fc7837bb13abd5cba7f140a21e60de.zip | |
Remove the ETC_UGLY and ETC_VERY_UGLY colors, as they're now unused.
Diffstat (limited to 'crawl-ref/source/colour.cc')
| -rw-r--r-- | crawl-ref/source/colour.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index 9bca86e7de..01c92c66fc 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -3,7 +3,6 @@ #include "colour.h" #include "env.h" -#include "mon-util.h" #include "options.h" #include "player.h" #include "random.h" @@ -224,13 +223,6 @@ int element_colour( int element, bool no_random ) LIGHTRED, MAGENTA, -1); break; - case ETC_UGLY: - case ETC_VERY_UGLY: - ret = ugly_thing_random_colour(); - ret = (element == ETC_VERY_UGLY) ? make_high_colour(ret) - : make_low_colour(ret); - break; - case ETC_STONE: if (player_in_branch(BRANCH_HALL_OF_ZOT)) ret = env.rock_colour; @@ -345,9 +337,9 @@ int str_to_colour( const std::string &str, int default_colour, "magic", "mutagenic", "warp", "enchant", "heal", "holy", "dark", "death", "necro", "unholy", "vehumet", "beogh", "crystal", "blood", "smoke", "slime", "jewel", "elven", "dwarven", - "orcish", "gila", "kraken", "ugly", "very_ugly", "floor", - "rock", "stone", "mist", "shimmer_blue", "decay", "silver", - "gold", "iron", "bone", "random" + "orcish", "gila", "kraken", "floor", "rock", "stone", "mist", + "shimmer_blue", "decay", "silver", "gold", "iron", "bone", + "random" }; ASSERT(ARRAYSZ(element_cols) == (ETC_RANDOM - ETC_FIRE) + 1); |