[2054793] Partial implementation of the request to have COLOUR tags affect tile choice. Vaults can now override the default tileset (walls and floors) for an entire level. This has been pushed to vaults where it makes sense (sewers, ice caves, ziggurats, bazaars, Shoals:5, Zot).

ROCKTILE and FLOORTILE can be used when authoring vaults to set these values, both of which take a single tile name as a string.  These values are ignored in console builds.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7700 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 2 deletions

diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 9d632c4b8e..27c3948a99 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -1250,8 +1250,9 @@ void InventoryRegion::pack_verts()
 
             if (item.flag & TILEI_FLAG_FLOOR)
             {
-                add_quad(TEX_DUNGEON, get_floor_tile_idx()
-                         + m_flavour[i] % get_num_floor_flavours(), x, y);
+                int num_floor = tile_dngn_count(env.tile_default.floor);
+                add_quad(TEX_DUNGEON, env.tile_default.floor
+                         + m_flavour[i] % num_floor, x, y);
             }
             else
                 add_quad(TEX_DUNGEON, TILE_ITEM_SLOT, x, y);