Fixing Pan assertion.

Fixing Pan coloring issue.
Adding new dungeon tiles from Denzi.
Fixing lack of initialization of tiles when going up stairs to a new level.
Allowing for different flavors of lava and water.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 9ed114b54e..56b758b886 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1626,6 +1626,13 @@ void finalize_tile(short unsigned int *tile, unsigned char wflag,
     {
         (*tile) = get_wall_tile_idx() + wall_flv;
     }
+    else if (orig == TILE_DNGN_SHALLOW_WATER ||
+        orig == TILE_DNGN_DEEP_WATER ||
+        orig == TILE_DNGN_LAVA)
+    {
+        // These types always have four flavors...
+        (*tile) = orig + (floor_flv % 4);
+    }
 
     (*tile) |= flag;
 }