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

Fix longstanding bug...

Browse source 
...where we accessed .back() of empty vector if unit cannot move at all
This commit is contained in:
Rusty Russell 2006-05-31 11:27:11 +00:00
parent 5b91e70fb1
commit 2ff7de0adc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/actions.cpp
View file

@ -1869,9 +1869,6 @@ size_t move_unit(display* disp, const game_data& gamedata,
wassert(steps.size() <= route.size());
if (next_unit != NULL)
*next_unit = steps.back();
//if we can't get all the way there and have to set a go-to.
if(steps.size() != route.size() && discovered_unit == false) {
if(seen_units.empty() == false) {
@ -1887,6 +1884,9 @@ size_t move_unit(display* disp, const game_data& gamedata,
return 0;
}
if (next_unit != NULL)
*next_unit = steps.back();
//move the unit on the screen. Hide the unit in its current location, but don't actually
//remove it until the move is done, so that while the unit is moving status etc will
//still display the correct number of units.