0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug which made attack function produce invalid results

Browse source
This commit is contained in:
Bartek Waresiak 2008-03-24 19:53:49 +00:00
parent 694af45d03
commit 0ed88a7733
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/formula_ai.cpp
View file

@ -95,7 +95,7 @@ public:
private:
variant execute(const formula_callable& variables) const {
const gamemap::location& loc = convert_variant<location_callable>(args()[0]->evaluate(variables))->loc();
const gamemap::location loc = convert_variant<location_callable>(args()[0]->evaluate(variables))->loc();
int best = 1000000;
const std::vector<gamemap::location>& villages = ai_.get_info().map.villages();
const std::set<gamemap::location>& my_villages = ai_.current_team().villages();
@ -303,9 +303,9 @@ public:
{}
private:
variant execute(const formula_callable& variables) const {
const gamemap::location& move_from = convert_variant<location_callable>(args()[0]->evaluate(variables))->loc();
const gamemap::location& src = convert_variant<location_callable>(args()[1]->evaluate(variables))->loc();
const gamemap::location& dst = convert_variant<location_callable>(args()[2]->evaluate(variables))->loc();
const gamemap::location move_from = convert_variant<location_callable>(args()[0]->evaluate(variables))->loc();
const gamemap::location src = convert_variant<location_callable>(args()[1]->evaluate(variables))->loc();
const gamemap::location dst = convert_variant<location_callable>(args()[2]->evaluate(variables))->loc();
const int weapon = args().size() == 4 ? args()[3]->evaluate(variables).as_int() : -1;
if(ai_.get_info().units.count(move_from) == 0 || ai_.get_info().units.count(dst) == 0) {
std::cerr << "AI ERROR: Formula produced illegal attack: " << move_from << " -> " << src << " -> " << dst << "\n";