Simplify.

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

2 files changed, 3 insertions, 7 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 13a14b16c4..aa41e1c14e 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1766,8 +1766,7 @@ void pray()
     }
     else if (!_god_accepts_prayer(you.religion))
     {
-        std::string msg = god_name(you.religion) + " ignores you.";
-        god_speaks(you.religion, msg.c_str());
+        simple_god_message(" ignores you.");
         return;
     }
 
@@ -5334,7 +5333,7 @@ void handle_god_time()
             // something interesting happening.
             if (you.gift_timeout == 1)
             {
-                god_speaks(you.religion, "Xom is getting BORED.");
+                simple_god_message(" is getting BORED.");
                 you.gift_timeout = 0;
             }
             else if (you.gift_timeout > 1)
@@ -5419,9 +5418,6 @@ void handle_god_time()
 // yet another wrapper for mpr() {dlb}:
 void simple_god_message(const char *event, god_type which_deity)
 {
-    if (which_deity == GOD_NO_GOD)
-        which_deity = you.religion;
-
     std::string msg = god_name(which_deity);
     msg += event;
     god_speaks( which_deity, msg.c_str() );
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 95702d343b..cee25226e7 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -55,7 +55,7 @@ bool is_evil_god(god_type god);
 bool is_good_god(god_type god);
 bool is_chaotic_god(god_type god);
 bool is_priest_god(god_type god);
-void simple_god_message( const char *event, god_type which_deity = GOD_NO_GOD );
+void simple_god_message(const char *event, god_type which_deity = you.religion);
 int piety_breakpoint(int i);
 std::string god_name(god_type which_god, bool long_name = false);
 void dec_penance(int val);