summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-25 21:56:12 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-25 21:56:12 +0000
commit9703c86777b2d8acabc5a25f407c9ee0d045b0e1 (patch)
tree169ac249b0b30d0a65cedfd46d5ea6c39a59f274 /crawl-ref/source/religion.cc
parent358edd6228b76ca77afa2c77e024bef6f2bc4295 (diff)
downloadcrawl-ref-9703c86777b2d8acabc5a25f407c9ee0d045b0e1.tar.gz
crawl-ref-9703c86777b2d8acabc5a25f407c9ee0d045b0e1.zip
Add miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6992 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 2d35d8938e..0530683596 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2203,8 +2203,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
break;
}
piety_change = -level;
- if (known || DID_ATTACK_HOLY && victim->attitude != ATT_HOSTILE)
+ if (known || thing_done == DID_ATTACK_HOLY
+ && victim->attitude != ATT_HOSTILE)
+ {
penance = level * ((you.religion == GOD_SHINING_ONE) ? 2 : 1);
+ }
ret = true;
break;
default: