Merge trunk back into 0.2 for 0.2.2.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1227 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 7542bb1428..9e1c719c5f 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -450,6 +450,9 @@ unsigned short dos_brand( unsigned short colour,
 screen_buffer_t colour_code_map( int x, int y, bool item_colour, 
                                  bool travel_colour )
 {
+    if (!is_terrain_known(x + 1, y + 1))
+        return (BLACK);
+    
     // XXX: Yes, the map array and the grid array are off by one. -- bwr
     const unsigned short map_flags = env.map[x][y];
     const int grid_value = grd[x + 1][y + 1];
@@ -697,6 +700,11 @@ bool check_awaken(int mons_aw)
     struct monsters *monster = &menv[mons_aw];
     const int mon_holy = mons_holiness(monster);
 
+    // Monsters put to sleep by ensorcelled hibernation will sleep
+    // at least one turn.
+    if (monster->has_ench(ENCH_SLEEPY))
+        return (false);
+
     // berserkers aren't really concerned about stealth
     if (you.berserker)
         return (true);