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, 3 insertions, 12 deletions

diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index ab31941d55..3319e307ad 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -549,18 +549,9 @@ static void sdump_religion(const std::string &, std::string & text)
 
         if (!player_under_penance())
         {
-            if (you.religion != GOD_XOM)
-            {                   // Xom doesn't care
-                text += god_name(you.religion);
-                text += " is ";
-                text += ((you.piety <= 5) ? "displeased" :
-                         (you.piety <= 20) ? "noncommittal" :
-                         (you.piety <= 40) ? "pleased with you" :
-                         (you.piety <= 70) ? "most pleased with you" :
-                         (you.piety <= 100) ? "greatly pleased with you" :
-                         (you.piety <= 130) ? "extremely pleased with you"
-                         : "exalted by your worship");
-                text += ".";
+            if (you.religion != GOD_XOM) // Xom doesn't care
+            {
+                text += god_prayer_reaction();
                 text += "\n";
             }
         }