Author: crab
Date: Thu Apr 2 01:42:51 2009
New Revision: 34383
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34383&view=rev
Log:
backported r34378 from trunk - fixed bug #13295 - enemy_units formula now
ignores incapacitated units such as statues in the 'Caves of The Basilisk'
Modified:
branches/1.6/changelog
branches/1.6/src/formula_ai.cpp
Modified: branches/1.6/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/changelog?rev=34383&r1=34382&r2=34383&view=diff
==============================================================================
--- branches/1.6/changelog (original)
+++ branches/1.6/changelog Thu Apr 2 01:42:51 2009
@@ -2,6 +2,8 @@
* AI:
* Fixed incorrect handling of poisoning attacks when suggesting best attack
in user interface
+ * Fixed bug #13295: made enemy_units formula return only those units which
+ are not incapacitated (for example, it now ignores stoned units )
* Editor2:
* New feature: exporting of selection coordinates to system clipboard
* Graphics:
Modified: branches/1.6/src/formula_ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/formula_ai.cpp?rev=34383&r1=34382&r2=34383&view=diff
==============================================================================
--- branches/1.6/src/formula_ai.cpp (original)
+++ branches/1.6/src/formula_ai.cpp Thu Apr 2 01:42:51 2009
@@ -2281,7 +2281,9 @@
std::vector<variant> vars;
for(unit_map::const_iterator i = get_info().units.begin(); i !=
get_info().units.end(); ++i) {
if(current_team().is_enemy(i->second.side())) {
- vars.push_back(variant(new unit_callable(*i)));
+ if (!i->second.incapacitated()) {
+ vars.push_back(variant(new
unit_callable(*i)));
+ }
}
}
return variant(&vars);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
