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

Some minor fixes

Browse source
This commit is contained in:
Bartek Waresiak 2009-07-17 09:39:36 +00:00
parent f9fc80cca7
commit ca677f34ba
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ai/formula/ai.hpp
View file

@ -61,11 +61,12 @@ public:
move_functions()
{}
expression_ptr create_function(const std::string& fn,
const std::vector<expression_ptr>& args) const;
private:
formula_ai& ai_;
std::set<std::string> move_functions;
expression_ptr create_function(const std::string& fn,
const std::vector<expression_ptr>& args) const;
};
}

5
src/ai/formula/candidates.cpp
View file

@ -269,12 +269,13 @@ void attack_candidate_action::evaluate(formula_ai* ai, unit_map& units)
}
enemy_units_flt.push_back(u_callable);
}
game_logic::map_formula_callable callable(static_cast<const formula_callable*>(ai));
for( size_t my_unit = 0 ; my_unit < my_units_flt.size() ; ++my_unit){
const unit_callable* my_unit_callalbe = my_units_flt[my_unit];
for( size_t enemy_unit = 0 ; enemy_unit < enemy_units_flt.size() ; ++enemy_unit){
if( ai->can_reach_unit( my_unit_callalbe->get_location(), enemy_units_flt[enemy_unit]->get_location() )) {
callable.clear();
game_logic::map_formula_callable callable(static_cast<const formula_callable*>(ai));
callable.add_ref();
callable.add("me", filtered_my_units[my_unit]);
callable.add("target", filtered_enemy_units[enemy_unit]);