Multiple labyrinth entrances are separately noteworthy.

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

1 files changed, 12 insertions, 5 deletions

diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index a3a9d40c10..50221376aa 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -161,17 +161,24 @@ static bool is_noteworthy( const Note& note ) {
 
     /* skills are noteworthy if in the skill value list or if
        it's a new maximal skill (depending on options) */
-    if ( note.type == NOTE_GAIN_SKILL ) {
+    if ( note.type == NOTE_GAIN_SKILL )
+    {
 	if ( is_noteworthy_skill_level(note.second) )
 	    return true;
 	if ( Options.note_skill_max && is_highest_skill(note.first) )
 	    return true;
 	return false;
     }
-    
-    if ( note.type == NOTE_DUNGEON_LEVEL_CHANGE &&
-	 !is_noteworthy_dlevel(note.packed_place) )
-	return false;
+
+    if ( note.type == NOTE_DUNGEON_LEVEL_CHANGE )
+    {
+        if ( !is_noteworthy_dlevel(note.packed_place) )            
+            return false;
+        // labyrinths are always interesting
+        if ( (note.packed_place & 0xFF) == 0xFF &&
+             (note.packed_place >> 8) == LEVEL_LABYRINTH )
+            return true;
+    }
     
     /* Learning a spell is always noteworthy if note_all_spells is set */
     if ( note.type == NOTE_LEARN_SPELL && Options.note_all_spells )