Simplify.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index c9bb6ed80d..0246944da6 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2743,30 +2743,30 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
     return (ret);
 }
 
-void set_attack_conducts(god_conduct_trigger conduct[4], const monsters *mon,
+void set_attack_conducts(god_conduct_trigger conduct[3], const monsters *mon,
                          bool known)
 {
     if (mons_friendly(mon))
         conduct[0].set(DID_ATTACK_FRIEND, 5, known, mon);
     else if (mons_neutral(mon))
-        conduct[1].set(DID_ATTACK_NEUTRAL, 5, known, mon);
+        conduct[0].set(DID_ATTACK_NEUTRAL, 5, known, mon);
 
     if (is_unchivalric_attack(&you, mon, mon))
-        conduct[2].set(DID_UNCHIVALRIC_ATTACK, 4, known, mon);
+        conduct[1].set(DID_UNCHIVALRIC_ATTACK, 4, known, mon);
 
     if (mons_is_holy(mon))
-        conduct[3].set(DID_ATTACK_HOLY, mon->hit_dice, known, mon);
+        conduct[2].set(DID_ATTACK_HOLY, mon->hit_dice, known, mon);
 }
 
-void enable_attack_conducts(god_conduct_trigger conduct[4])
+void enable_attack_conducts(god_conduct_trigger conduct[3])
 {
-    for (int i = 0; i < 4; ++i)
+    for (int i = 0; i < 3; ++i)
         conduct[i].enabled = true;
 }
 
-void disable_attack_conducts(god_conduct_trigger conduct[4])
+void disable_attack_conducts(god_conduct_trigger conduct[3])
 {
-    for (int i = 0; i < 4; ++i)
+    for (int i = 0; i < 3; ++i)
         conduct[i].enabled = false;
 }