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

Fixed bug 5456

Browse source
This commit is contained in:
Dave White 2003-09-21 04:42:12 +00:00
parent 0bb126c559
commit caacb6f2a9
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/playturn.cpp
View file

@ -67,17 +67,24 @@ void play_turn(game_data& gameinfo, game_state& state_of_game,
undo_list undo_stack, redo_stack;
//execute gotos
//execute gotos - first collect gotos in a list
std::vector<gamemap::location> gotos;
for(unit_map::iterator ui = units.begin(); ui != units.end(); ++ui) {
if(ui->second.get_goto() == ui->first)
ui->second.set_goto(gamemap::location());
if(ui->second.side() != team_num ||
map.on_board(ui->second.get_goto()) == false)
continue;
if(ui->second.side() == team_num && map.on_board(ui->second.get_goto()))
gotos.push_back(ui->first);
}
for(std::vector<gamemap::location>::const_iterator g = gotos.begin();
g != gotos.end(); ++g) {
const unit_map::iterator ui = units.find(*g);
assert(ui != units.end());
log_scope("doing goto...");
unit u = ui->second;
const shortest_path_calculator calc(u,current_team,units,map);
const bool can_teleport = u.type().teleports() &&