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

wb: more robust side_actions_container::get_turn

Browse source 
the assumption

(turn_beginnings_[num] == it) => (get_turn(it) == num)

might be wrong in case that we have a turn with no actions, in which
case turn_beginnings_ contains duplicates and we actually want the upper
bound of (x <= it) in turn_beginnings_
This commit is contained in:
gfgtdf 2018-04-30 18:24:43 +02:00
parent edb4d2cf04
commit 1f2f46b27a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/whiteboard/side_actions.cpp
View file

@ -84,10 +84,8 @@ size_t side_actions_container::get_turn_impl(size_t begin, size_t end, const_ite
size_t mid = (begin+end) / 2;
if(it < turn_beginnings_[mid]) {
return get_turn_impl(begin, mid, it);
} else if(it > turn_beginnings_[mid]) {
return get_turn_impl(mid, end, it);
} else {
return mid;
return get_turn_impl(mid, end, it);
}
}