upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 18:59:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fix to unit formulas,

Browse Source 
...and making move_unit work correctly for formulas which attempt to
move unit to a place where it is already standing
This commit is contained in:
Bartek Waresiak 2008-03-21 19:36:03 +00:00
parent fe758a265a
commit 1040df9492
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/formula_ai.cpp
View File

@ -537,17 +537,27 @@ void formula_ai::play_turn()
move_formula_ = game_logic::formula::create_optional_formula(current_team().ai_parameters()["move"], &function_table);
//execute units formulas first
std::vector<gamemap::location> formula_unit_loc;
for(unit_map::const_iterator i = units_.begin(); i != units_.end(); ++i) {
if( (i->second.side() == get_info().team_num) && i->second.has_formula())
if( (i->second.side() == get_info().team_num) && i->second.has_formula() )
{
game_logic::const_formula_ptr formula(new game_logic::formula(i->second.get_formula(), &function_table));
game_logic::map_formula_callable callable(this);
callable.add_ref();
callable.add("me", variant(new unit_callable(*i, current_team(), get_info().team_num)));
make_move(formula, callable);
formula_unit_loc.push_back(i->first);
}
}
for(std::vector<gamemap::location>::const_iterator i = formula_unit_loc.begin() ; i != formula_unit_loc.end() ; ++i)
{
unit_map::const_iterator unit_it = units_.find(*i);
if ( unit_it != units_.end() )
{
game_logic::const_formula_ptr formula(new game_logic::formula(unit_it->second.get_formula(), &function_table));
game_logic::map_formula_callable callable(this);
callable.add_ref();
callable.add("me", variant(new unit_callable(*unit_it, current_team(), get_info().team_num)));
make_move(formula, callable);
}
}
game_logic::map_formula_callable callable(this);
callable.add_ref();
while(make_move(move_formula_,callable)) {
@ -650,7 +660,8 @@ bool formula_ai::make_move(game_logic::const_formula_ptr formula_, const game_lo
prepare_move();
if(move) {
std::cerr << "moving " << move->src().x << "," << move->src().y << " -> " << move->dst().x << "," << move->dst().y << "\n";
if(possible_moves_.count(move->src()) > 0) {
unit_map::iterator i = units_.find(move->src());
if( (possible_moves_.count(move->src()) > 0) && (i->second.movement_left() != 0) ) {
move_unit(move->src(), move->dst(), possible_moves_);
made_move = true;
}