Apply patch by zebez to add variants for a number of tiles (mostly

mirrored) as well as some nicer tiles for disturbance in water and the
entrance to Pan. Thanks!

Also, update commandline options help to use of species/job.


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

1 files changed, 7 insertions, 5 deletions

diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 28158b4a97..c1351c525f 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -267,11 +267,11 @@ void DungeonRegion::pack_background(unsigned int bg, int x, int y)
     }
     m_buf_dngn.add(bg_idx, x, y);
 
-    if (bg & TILE_FLAG_WAS_SECRET)
-        m_buf_dngn.add(TILE_DNGN_DETECTED_SECRET_DOOR, x, y);
-
     if (bg_idx > TILE_DNGN_UNSEEN)
     {
+        if (bg & TILE_FLAG_WAS_SECRET)
+            m_buf_dngn.add(TILE_DNGN_DETECTED_SECRET_DOOR, x, y);
+        
         if (bg & TILE_FLAG_BLOOD)
         {
             tile_flavour &flv = env.tile_flv[x + m_cx_to_gx][y + m_cy_to_gy];
@@ -860,9 +860,11 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int
     {
         if (tile_dngn_equal(TILE_DNGN_LAVA, bg_idx))
             m_buf_main.add(TILE_MASK_LAVA, x, y);
-        else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx))
+        else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx) ||
+             tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_DISTURBANCE, bg_idx))
             m_buf_main.add(TILE_MASK_SHALLOW_WATER, x, y);
-        else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx))
+        else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx) ||
+             tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY_DISTURBANCE, bg_idx))
             m_buf_main.add(TILE_MASK_SHALLOW_WATER_MURKY, x, y);
         else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER, bg_idx))
             m_buf_main.add(TILE_MASK_DEEP_WATER, x, y);