Fixing tile caching bug (resulting in temporarily disappearing items/monsters.)

Added sanctuary art.

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

1 files changed, 10 insertions, 7 deletions

diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 468230529a..dfebea3178 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1712,8 +1712,6 @@ int tileidx_item_throw(const item_def &item, int dx, int dy)
 
 int tileidx_feature(int object)
 {
-    int ch = TILE_ERROR;
-
     switch (object)
     {
     case DNGN_UNSEEN:
@@ -3879,17 +3877,22 @@ void tile_finish_dngn(unsigned int *tileb, int cx, int cy)
             finalize_tile(&tileb[count+1], is_special,
                 wall_flv, floor_flv, special_flv);
 
+            const coord_def gc(gx, gy);
+            if (is_excluded(gc))
+            {
+                tileb[count+1] |= TILE_FLAG_TRAVEL_EX;
+            }
+
             if (in_bounds)
             {
-                const coord_def gc(gx, gy);
-                if (is_excluded(gc))
+                if (is_bloodcovered(gx, gy))
                 {
-                    tileb[count+1] |= TILE_FLAG_TRAVEL_EX;
+                    tileb[count+1] |= TILE_FLAG_BLOOD;
                 }
 
-                if (is_bloodcovered(gx, gy))
+                if (is_sanctuary(gx, gy))
                 {
-                    tileb[count+1] |= TILE_FLAG_BLOOD;
+                    tileb[count+1] |= TILE_FLAG_SANCTUARY;
                 }
             }