1 files changed, 14 insertions, 0 deletions
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index b7e1cc3c38..c30efe3706 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -140,6 +140,10 @@ static bool _is_noteworthy( const Note& note )
         return (false);
     }
 
+    // Xom effects are only noteworthy if the option is true.
+    if (note.type == NOTE_XOM_EFFECT)
+        return (Options.note_xom_effects);
+
     // God powers might be noteworthy if it's an actual power.
     if (note.type == NOTE_GOD_POWER
         && _real_god_power(note.first, note.second) == -1)
@@ -374,6 +378,16 @@ std::string Note::describe( bool when, bool where, bool what ) const
         case NOTE_SEEN_FEAT:
             result << "Found " << name;
             break;
+        case NOTE_XOM_EFFECT:
+            result << "XOM: " << name;
+#if defined(DEBUG_XOM) || defined(NOTE_DEBUG_XOM)
+            // If debugging, also take note of piety and tension.
+            result << " (piety: " << first;
+            if (second >= 0)
+                result << ", tension: " << second;
+            result << ")";
+#endif
+            break;
         default:
             result << "Buggy note description: unknown note type";
             break;