Preliminary integration of Zooko's Xom patch (untested).

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

1 files changed, 10 insertions, 5 deletions

diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index 9fe1b9e0b3..3ea3d44edc 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -255,16 +255,20 @@ std::string Note::describe( bool when, bool where, bool what ) const
                    << spell_title(static_cast<spell_type>(first));
             break;
         case NOTE_GET_GOD:
-            result << "Became a worshipper of " << god_name(first, true);
+            result << "Became a worshipper of "
+                   << god_name(static_cast<god_type>(first), true);
             break;
         case NOTE_LOSE_GOD:
-            result << "Fell from the grace of " << god_name(first);
+            result << "Fell from the grace of "
+                   << god_name(static_cast<god_type>(first));
             break;
         case NOTE_MOLLIFY_GOD:
-            result << "Was forgiven by " << god_name(first);
+            result << "Was forgiven by "
+                   << god_name(static_cast<god_type>(first));
             break;
         case NOTE_GOD_GIFT:
-            result << "Received a gift from " << god_name(first);
+            result << "Received a gift from "
+                   << god_name(static_cast<god_type>(first));
             break;
         case NOTE_ID_ITEM:
             result << "Identified " << name;
@@ -288,7 +292,8 @@ std::string Note::describe( bool when, bool where, bool what ) const
             result << name << " changed form";
             break;
         case NOTE_GOD_POWER:
-            result << "Acquired " << god_name(first) << "'s "
+            result << "Acquired "
+                   << god_name(static_cast<god_type>(first)) << "'s "
                    << number_to_ordinal(real_god_power(first, second)+1)
                    << " power";
             break;