Fix attack conduct handling to register more than one conduct for an

attack again.  For example, if you make an unchivalric attack on a 
neutral monster, both the "unchivalric attack" and "attack neutral" 
conducts will be handled again, instead of just the former (big oops).

Passing a constant-sized array of god_conduct_triggers and adding 
wrapper functions to enable and disable them all is not the most elegant 
solution, but I don't quite have the time or the understanding right now 
to rewrite the god_conduct_trigger class to handle more than one conduct 
at once, and this does work in the meantime.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5914 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 1 deletions

diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 60b3fbd094..6c2a0e9a0c 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -70,8 +70,10 @@ void dec_penance(god_type god, int val);
 
 bool did_god_conduct(conduct_type thing_done, int pgain, bool known = true,
                      const monsters *victim = NULL);
-void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct,
+void set_attack_conducts(god_conduct_trigger conduct[4], const monsters *mon,
                          bool known = true);
+void enable_attack_conducts(god_conduct_trigger conduct[4]);
+void disable_attack_conducts(god_conduct_trigger conduct[4]);
 
 void excommunication(god_type new_god = GOD_NO_GOD);
 void gain_piety(int pgn);