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

Resolve bug #20299

Browse source 
Check IDs match before re-using an existing fake_unit. IDs can be different in the situation described by bug #20299, where the user selects the next unit while planning a move.
This commit is contained in:
Wedge009 2015-10-11 01:08:06 +11:00
parent 7e57ab0059
commit 3c4d8f1f67
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/whiteboard/manager.cpp
View file

@ -713,7 +713,9 @@ void manager::create_temp_move()
if(path.size() >= 2)
{
if(!fake_unit)
// Bug #20299 demonstrates a situation where an incorrect fake/ghosted unit can be used.
// So before assuming that a pre-existing fake_unit can be re-used, check that its ID matches the unit being moved.
if(!fake_unit || fake_unit.get_unit_ptr()->id() != temp_moved_unit->id())
{
// Create temp ghost unit
fake_unit = fake_unit_ptr(unit_ptr (new unit(*temp_moved_unit)), resources::fake_units);