Simplify.

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

6 files changed, 17 insertions, 17 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 703ab87661..d63d6d8cfd 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4374,7 +4374,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
         if (submerged)
             return (0);
 
-        god_conduct_trigger conducts[4];
+        god_conduct_trigger conducts[3];
         disable_attack_conducts(conducts);
 
         // Nasty enchantments will annoy the monster, and are considered
@@ -4557,7 +4557,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
     // fire elementals on their side - the elementals won't give a sh*t,
     // after all).
 
-    god_conduct_trigger conducts[4];
+    god_conduct_trigger conducts[3];
     disable_attack_conducts(conducts);
 
     if (_nasty_beam(mon, beam))
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 8ca5e7f113..5e980de450 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -608,7 +608,7 @@ bool melee_attack::attack()
     check_autoberserk();
     check_special_wield_effects();
 
-    god_conduct_trigger conducts[4];
+    god_conduct_trigger conducts[3];
     disable_attack_conducts(conducts);
 
     if (attacker->atype() == ACT_PLAYER)
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;
 }
 
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 6c2a0e9a0c..75dbfa5f1f 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -70,10 +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(god_conduct_trigger conduct[4], const monsters *mon,
+void set_attack_conducts(god_conduct_trigger conduct[3], 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 enable_attack_conducts(god_conduct_trigger conduct[3]);
+void disable_attack_conducts(god_conduct_trigger conduct[3]);
 
 void excommunication(god_type new_god = GOD_NO_GOD);
 void gain_piety(int pgn);
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index c7e7d49a07..ef7c62c23b 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -910,7 +910,7 @@ char burn_freeze(int pow, beam_type flavour)
 
     monsters *monster = &menv[mgr];
 
-    god_conduct_trigger conducts[4];
+    god_conduct_trigger conducts[3];
     disable_attack_conducts(conducts);
 
     bool success = !stop_attack_prompt(monster, false, false);
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index af3b06794b..8f4f3199f1 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -205,7 +205,7 @@ int cast_smiting(int power, dist &beam)
     {
         monsters *monster = &menv[mgrd[beam.tx][beam.ty]];
 
-        god_conduct_trigger conducts[4];
+        god_conduct_trigger conducts[3];
         disable_attack_conducts(conducts);
 
         success = !stop_attack_prompt(monster, false, false);
@@ -250,7 +250,7 @@ int airstrike(int power, dist &beam)
     {
         monsters *monster = &menv[mgrd[beam.tx][beam.ty]];
 
-        god_conduct_trigger conducts[4];
+        god_conduct_trigger conducts[3];
         disable_attack_conducts(conducts);
 
         success = !stop_attack_prompt(monster, false, false);