From 361357a251c757412efb07b9bc5efa9150d2f803 Mon Sep 17 00:00:00 2001 From: Alexander van Gessel Date: Fri, 10 Oct 2008 09:13:12 +0100 Subject: [PATCH] Revert "* Work around bug #12428." --- src/actions.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/actions.cpp b/src/actions.cpp index 82458425083..bee7cf22c37 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -279,10 +279,8 @@ battle_context::battle_context(const gamemap& map, const std::vector& team attacker_weapon = 0; if (attacker_weapon == -1) { - // Following lines are currently commented out because they trigger when - //the attack is removed in attack_end. (FIXME: bug #12428) - //VALIDATE(defender_weapon == -1, - // _("An invalid weapon is send, possibly due to the Python AI.")); + VALIDATE(defender_weapon == -1, + _("An invalid weapon is send, possibly due to the Python AI.")); attacker_weapon = choose_attacker_weapon(attacker, defender, map, teams, units, status, attacker_loc, defender_loc,