[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, 6 insertions, 5 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 4b61bbc9b8..dd52521d4c 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -31,11 +31,11 @@
 struct tile_flavour
 {
     // The floor tile to use.
-    unsigned char floor;
+    unsigned short floor;
     // The wall tile to use.
-    unsigned char wall;
+    unsigned short wall;
     // Used as a random value or for special cases e.g. (bazaars, gates).
-    unsigned char special;
+    unsigned short special;
 };
 
 // A glorified unsigned int that assists with ref-counting the mcache.
@@ -1621,12 +1621,13 @@ public:
 
 #ifdef USE_TILE
     // indexed by grid coords
-    FixedArray<tile_fg_store, GXM, GYM> tile_bk_fg; // tile fg
-    FixedArray<unsigned int, GXM, GYM> tile_bk_bg; // tile bg
+    FixedArray<tile_fg_store, GXM, GYM> tile_bk_fg;
+    FixedArray<unsigned int, GXM, GYM> tile_bk_bg;
     FixedArray<tile_flavour, GXM, GYM> tile_flv;
     // indexed by (show-1) coords
     FixedArray<unsigned int,ENV_SHOW_DIAMETER-2,ENV_SHOW_DIAMETER-2> tile_fg;
     FixedArray<unsigned int,ENV_SHOW_DIAMETER-2,ENV_SHOW_DIAMETER-2> tile_bg;
+    tile_flavour tile_default;
 #endif
 
     FixedVector< cloud_struct, MAX_CLOUDS >  cloud; // cloud list