summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-23 17:14:08 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-23 17:14:08 +0000
commit0dea06178954c37e51dba153f8abd2ccf5d98b32 (patch)
tree1d8b6fe36006e53e173a27b40bc5d634ff4ecde8 /crawl-ref
parentf5d7c7439109ee2d0e5d96f493ca01c7e2657610 (diff)
downloadcrawl-ref-0dea06178954c37e51dba153f8abd2ccf5d98b32.tar.gz
crawl-ref-0dea06178954c37e51dba153f8abd2ccf5d98b32.zip
more cleanups of penance-related messages: don't hardcode the Shining
One's name when his smiting is averted, and use simple_god_message() for Beogh's message when he makes your followers abandon you git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2899 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/religion.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index af80e32a5f..d47c95aaea 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2126,9 +2126,9 @@ static bool tso_retribution()
{
if (!player_under_penance() && you.piety > random2(400))
{
- god_speaks(you.religion,
- "Mortal, I have averted the wrath of "
- "the Shining One... this time.");
+ snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
+ "of %s... this time.", god_name(god));
+ god_speaks(you.religion, info);
}
else
{
@@ -2398,7 +2398,7 @@ static bool beogh_retribution()
if (!player_under_penance() && you.piety > random2(400))
{
snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
- "of %s... this time.", god_name(god));
+ "of %s... this time.", god_name(god));
god_speaks(you.religion, info);
}
else
@@ -2781,9 +2781,8 @@ bool followers_abandon_you()
if (reconvert) // maybe all of them invisible
{
- std::string mesg = god_name(GOD_BEOGH);
- mesg += " booms out: \"Who do you think you are?\"";
- god_speaks(GOD_BEOGH, mesg.c_str());
+ simple_god_message("'s voice booms out, \"Who do you think you "
+ "are?\"", GOD_BEOGH);
if (num_reconvert > 0)
{