summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-11 19:13:09 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-11 19:13:09 +0000
commit125505507696c4afb147e8975dbeb96c764c78d0 (patch)
tree6abe325d5a005edcec9fa22d02795f1ba55c7178 /crawl-ref/source/religion.cc
parentcafe082722864dec9ca62a9cf2409e6b4c2859e9 (diff)
downloadcrawl-ref-125505507696c4afb147e8975dbeb96c764c78d0.tar.gz
crawl-ref-125505507696c4afb147e8975dbeb96c764c78d0.zip
Revert previous change (oops). The first part is redundant, given the
handling of holy beings, and the second part is inconsistent with it. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5003 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 89d0f2c409..7bd712cd33 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4212,8 +4212,6 @@ void good_god_holy_attitude_change(monsters *holy)
// on, it won't count as a good kill
holy->flags |= MF_WAS_NEUTRAL;
- holy->flags |= MF_GOD_GIFT;
-
// to avoid immobile "followers"
behaviour_event(holy, ME_ALERT, MHITNOT);
}
@@ -4394,10 +4392,8 @@ void excommunication(god_type new_god)
you.redraw_armour_class = true;
}
- if (is_evil_god(new_god))
+ if (!is_good_god(new_god))
_make_god_gifts_hostile(false);
- else if (!is_good_god(new_god))
- _make_god_gifts_neutral(false);
else
_make_god_gifts_good_neutral(false);