diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-03 18:47:36 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-03 18:47:36 +0000 |
commit | 51f25d2d403aa80c5d6e5ae221992b0ddc546866 (patch) | |
tree | 1c1034fbc55ab8b6b8608f1ff2d8c8714de39cd2 /crawl-ref/source/religion.cc | |
parent | 98d093c37196be2d58fc2d846fd7d573c2b9fe92 (diff) | |
download | crawl-ref-51f25d2d403aa80c5d6e5ae221992b0ddc546866.tar.gz crawl-ref-51f25d2d403aa80c5d6e5ae221992b0ddc546866.zip |
Add more conduct handling fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7364 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r-- | crawl-ref/source/religion.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index a275fef8a8..2d693329c7 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2841,8 +2841,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; case DID_DESTROY_ORCISH_IDOL: - beogh_idol_revenge(); - if (you.religion == GOD_BEOGH) { piety_change = -level * 2; @@ -2894,6 +2892,14 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } #endif + if (thing_done == DID_DESTROY_ORCISH_IDOL) + beogh_idol_revenge(); + else if (thing_done == DID_KILL_HOLY + || thing_done == DID_HOLY_KILLED_BY_SERVANT) + { + tso_holy_revenge(); + } + return (ret); } |