summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-03 21:15:27 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-03 21:15:27 +0000
commit8e9b229d34ff6e4b9b3b4a911dd47f49edfe040a (patch)
tree28fef6eab5f420b6a89fa95560d51bc814064cc5 /crawl-ref/source
parent537041db917da5d1ba30dd7c39283e0e8d8e2854 (diff)
downloadcrawl-ref-8e9b229d34ff6e4b9b3b4a911dd47f49edfe040a.tar.gz
crawl-ref-8e9b229d34ff6e4b9b3b4a911dd47f49edfe040a.zip
Simplify one more time.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7374 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-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 257fc99e70..c67caa4b37 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -5059,14 +5059,15 @@ bool tso_holy_revenge()
god_acting gdact(GOD_SHINING_ONE, true);
// TSO watches evil god worshippers more closely.
- if ((is_evil_god(you.religion) && one_chance_in(3))
- || (!is_good_god(you.religion) && one_chance_in(4)))
+ if (!is_good_god(you.religion)
+ && ((is_evil_god(you.religion) && one_chance_in(3))
+ || one_chance_in(4)))
{
const char *revenge;
if (is_evil_god(you.religion))
revenge = _get_tso_speech("holy evil").c_str();
- else if (!is_good_god(you.religion))
+ else
revenge = _get_tso_speech("holy other").c_str();
tso_blasts_cleansing_flame(revenge);