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

fixed bug #5621

Browse source
This commit is contained in:
Dave White 2003-09-29 21:46:17 +00:00
parent 3e11ce2ccc
commit cc6d450340
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/playturn.cpp
View file

@ -301,9 +301,10 @@ void play_turn(game_data& gameinfo, game_state& state_of_game,
//otherwise we're trying to move to a hex
else if(selected_hex.valid() && selected_hex != hex &&
units.count(selected_hex) &&
enemy == units.end() && !current_route.steps.empty() &&
current_route.steps.front() == selected_hex) {
assert(units.count(selected_hex));
const size_t moves = move_unit(&gui,map,units,teams,
current_route.steps,&recorder,&undo_stack);
redo_stack.clear();
@ -848,11 +849,22 @@ void play_turn(game_data& gameinfo, game_state& state_of_game,
gui.set_paths(NULL);
current_paths = paths();
selected_hex = gamemap::location();
current_route.steps.clear();
gui.set_route(NULL);
recorder.undo();
}
if(command == HOTKEY_REDO && !redo_stack.empty()) {
//clear routes, selected hex, etc
gui.set_paths(NULL);
current_paths = paths();
selected_hex = gamemap::location();
current_route.steps.clear();
gui.set_route(NULL);
const int starting_moves = redo_stack.back().starting_moves;
std::vector<gamemap::location> route = redo_stack.back().route;
const unit_map::iterator u = units.find(route.front());