upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-09 13:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid copying a singular iterator.

Browse Source 
Gabba, tschitz please review whether the code is correct. It fixes some
abortions of Wesnoth when using the gcc debug containers due to
undefined behaviour.
This commit is contained in:
Mark de Wever 2011-10-23 17:48:59 +00:00
parent 900c6ca1f1
commit 882dda5e2f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/whiteboard/manager.cpp
View File

@ -240,6 +240,10 @@ bool manager::allow_leader_to_move(unit const& leader) const
return true;
} // end planned unit map scope
if(viewer_actions()->empty()) {
return true;
}
//Look for planned recruits that depend on this leader
foreach(action_const_ptr action, *viewer_actions())
{
@ -268,8 +272,9 @@ void manager::on_init_side()
void manager::on_finish_side_turn(int side)
{
wait_for_side_init_ = true;
if(side == viewer_side())
if(side == viewer_side() && !viewer_actions()->empty()) {
viewer_actions()->synced_turn_shift();
}
highlighter_.reset();
erase_temp_move();
LOG_WB << "on_finish_side_turn()\n";
@ -343,6 +348,10 @@ void manager::on_change_controller(int side, team& t)
bool manager::current_side_has_actions()
{
if(current_side_actions()->empty()) {
return false;
}
side_actions::range_t range = current_side_actions()->iter_turn(0);
return range.first != range.second; //non-empty range
}