Author: ai0867
Date: Fri Oct 10 10:13:12 2008
New Revision: 30005
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30005&view=rev
Log:
Revert "* Work around bug #12428."
This reverts commit e14d6c419ea280ff93a707b15110d248f22e50f6. (29998)
Modified:
trunk/src/actions.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=30005&r1=30004&r2=30005&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Fri Oct 10 10:13:12 2008
@@ -279,10 +279,8 @@
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,
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
