summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-03 12:21:09 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-03 12:21:09 +0000
commit0383d17808a555f6de2129d16be6f774fa349ad6 (patch)
treed781b0395976906bcbea04c9a248094726a9ea1e
parent8f902194a4bc1089489de6ab3af2caa1bab1c50c (diff)
downloadcrawl-ref-0383d17808a555f6de2129d16be6f774fa349ad6.tar.gz
crawl-ref-0383d17808a555f6de2129d16be6f774fa349ad6.zip
Apply trunk r7099 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7100 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/religion.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index e7e324cffa..0e7c1cdaaa 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2569,7 +2569,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
switch (you.religion)
{
case GOD_SHINING_ONE:
- case GOD_OKAWARU:
case GOD_MAKHLEB:
simple_god_message(" accepts your collateral kill.");
ret = true;