diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-03-03 02:27:15 -0500 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-03-29 23:50:09 -0400 |
| commit | f57b90b356425e982ac999b0bf2c52cd827675b3 (patch) | |
| tree | ceb32a6c99a3fd69fe4a7fcad4474cff34a744f3 /crawl-ref/source/colour.cc | |
| parent | 7a9dbbb8cd0f2796dd8a1cb7ef544a3e205210af (diff) | |
| download | crawl-ref-f57b90b356425e982ac999b0bf2c52cd827675b3.tar.gz crawl-ref-f57b90b356425e982ac999b0bf2c52cd827675b3.zip | |
Restore Swamp tree colours; remove ETC_MANGROVE
Diffstat (limited to 'crawl-ref/source/colour.cc')
| -rw-r--r-- | crawl-ref/source/colour.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index b6b1b56f19..f775d1ef82 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -241,17 +241,8 @@ static int _etc_tree(int, const coord_def& loc) h += loc.y; h+=h<<10; h^=h>>6; h+=h<<3; h^=h>>11; h+=h<<15; - return (h>>30) ? GREEN : LIGHTGREEN; -} - -static int _etc_mangrove(int, const coord_def& loc) -{ - uint32_t h = loc.x; - h+=h<<10; h^=h>>6; - h += loc.y; - h+=h<<10; h^=h>>6; - h+=h<<3; h^=h>>11; h+=h<<15; - return (h>>30) ? GREEN : BROWN; + return (h>>30) ? GREEN : + you.where_are_you == BRANCH_SWAMP ? BROWN : LIGHTGREEN; // Swamp trees are mangroves. } bool get_tornado_phase(const coord_def& loc) @@ -615,9 +606,6 @@ void init_element_colours() ETC_TREE, "tree", _etc_tree )); add_element_colour(new element_colour_calc( - ETC_MANGROVE, "mangrove", _etc_mangrove - )); - add_element_colour(new element_colour_calc( ETC_TORNADO, "tornado", _etc_tornado )); add_element_colour(new element_colour_calc( |