From e97fe7dfe84286001cb002a3d1d4636843f50827 Mon Sep 17 00:00:00 2001 From: ennewalker Date: Sat, 4 Oct 2008 15:04:11 +0000 Subject: Fixing issue where some tile types (lava) weren't using any variations. (Now all tiles will automatically use variations from the tiledef file.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7124 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/tilepick.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/tilepick.cc') diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 9acb11bf28..af79d5f69d 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2447,18 +2447,15 @@ static inline void _finalize_tile(unsigned int *tile, bool is_special, { (*tile) = wall_flv; } - else if (orig == TILE_DNGN_SHALLOW_WATER - || orig == TILE_DNGN_DEEP_WATER - || orig == TILE_DNGN_LAVA - || orig == TILE_DNGN_STONE_WALL) - { - (*tile) = orig + (special_flv % tile_dngn_count(orig)); - } else if (orig == TILE_DNGN_CLOSED_DOOR || orig == TILE_DNGN_OPEN_DOOR) { ASSERT(special_flv <= 3); (*tile) = orig + special_flv; } + else if (orig < TILE_DNGN_MAX) + { + (*tile) = orig + (special_flv % tile_dngn_count(orig)); + } (*tile) |= flag; } @@ -3925,7 +3922,7 @@ void tile_init_flavor() } else { - env.tile_flv[x][y].special = 0; + env.tile_flv[x][y].special = random2(256); } } -- cgit v1.2.3-54-g00ecf