summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index b3b106ab1c..00cd805673 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1895,10 +1895,14 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
case DID_UNCHIVALRIC_ATTACK:
case DID_POISON:
- if (you.religion == GOD_SHINING_ONE
- && (thing_done != DID_UNCHIVALRIC_ATTACK
- || tso_unchivalric_attack_safe_monster(victim)))
+ if (you.religion == GOD_SHINING_ONE)
{
+ if (thing_done == DID_UNCHIVALRIC_ATTACK
+ && tso_unchivalric_attack_safe_monster(victim))
+ {
+ break;
+ }
+
ret = true;
piety_change = -level;
penance = level * 2;