diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-12 14:48:27 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-12 14:48:27 +0000 |
commit | b77d175f750cbcc9cd886718386524640a30b4ce (patch) | |
tree | 77999e98b15b9dc006938d7cf3740f39c206766d /crawl-ref/source/religion.h | |
parent | e8e7c9ee54157097b03cf40bce5c4860b411f91a (diff) | |
download | crawl-ref-b77d175f750cbcc9cd886718386524640a30b4ce.tar.gz crawl-ref-b77d175f750cbcc9cd886718386524640a30b4ce.zip |
Tweak DID_KILL_HOLY handling to allow for killing hostile angels
without being put under penance by the good gods. Also add a
flag MF_WAS_NEUTRAL, so that previously neutral monsters can be
handled differently from always hostile ones.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3432 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.h')
-rw-r--r-- | crawl-ref/source/religion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 76eae4ae65..147022b21b 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -40,7 +40,7 @@ void dec_penance(int val); void dec_penance(god_type god, int val); bool did_god_conduct(conduct_type thing_done, int pgain, bool known = true, - const actor *victim = NULL); + const monsters *victim = NULL); void excommunication(void); void gain_piety(int pgn); |