summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-24 01:36:33 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-24 01:36:33 +0000
commitf1c97c5dd9697e0dfe594655b202e9a1f4919966 (patch)
tree1cc875687d034496d3e87e85c52499cb069ee0a1
parent2330c22e9b90eebff3beceec3384545348c95148 (diff)
downloadcrawl-ref-f1c97c5dd9697e0dfe594655b202e9a1f4919966.tar.gz
crawl-ref-f1c97c5dd9697e0dfe594655b202e9a1f4919966.zip
Fix display of TSO's fading halo message when placed under penance.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3845 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/religion.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 22691d92d5..85dc1abae9 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -464,7 +464,8 @@ void inc_penance(god_type god, int val)
// nor does TSO's halo or divine shield
else if (god == GOD_SHINING_ONE)
{
- mpr("Your divine halo starts to fade.");
+ if (you.piety >= piety_breakpoint(0))
+ mpr("Your divine halo starts to fade.");
if (you.duration[DUR_DIVINE_SHIELD])
{
@@ -3643,7 +3644,7 @@ void excommunication(god_type new_god)
{
const god_type old_god = you.religion;
ASSERT(old_god != new_god);
-
+
god_acting gdact(old_god, true);
take_note(Note(NOTE_LOSE_GOD, old_god));
@@ -3758,7 +3759,7 @@ void excommunication(god_type new_god)
remove_sanctuary();
inc_penance( old_god, 25 );
break;
-
+
case GOD_ELYVILON:
inc_penance( old_god, 30 );
break;