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

wb: cleanups & add debug message

Browse source
This commit is contained in:
gfgtdf 2018-05-02 21:00:22 +02:00 • committed by Charles Dang
parent 4f161d889c
commit 6cfe64e4da
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/whiteboard/manager.cpp
View file

@ -394,7 +394,7 @@ void manager::on_change_controller(int side, const team& t)
if(t.is_local_human()) // we own this side now
{
//tell everyone to clear this side's actions -- we're starting anew
resources::whiteboard->queue_net_cmd(sa.team_index(),sa.make_net_cmd_clear());
queue_net_cmd(sa.team_index(),sa.make_net_cmd_clear());
sa.clear();
//refresh the hidden_ attribute of every team's side_actions
update_plan_hiding();
@ -412,7 +412,7 @@ void manager::on_change_controller(int side, const team& t)
{
team& local_team = resources::gameboard->teams().at(i);
if(local_team.is_local_human() && !local_team.is_enemy(side))
resources::whiteboard->queue_net_cmd(i,local_team.get_side_actions()->make_net_cmd_refresh());
queue_net_cmd(i,local_team.get_side_actions()->make_net_cmd_refresh());
}
}
}
@ -954,6 +954,10 @@ bool manager::allow_end_turn()
bool manager::execute_all_actions()
{
if (has_planned_unit_map())
{
ERR_WB << "Modifying action queue while temp modifiers are applied1!!!" << std::endl;
}
//exception-safety: finalizers set variables to false on destruction
//i.e. when method exits naturally or exception is thrown
variable_finalizer<bool> finalize_executing_actions(executing_actions_, false);
@ -980,7 +984,7 @@ bool manager::execute_all_actions()
side_actions_ptr sa = viewer_actions();
if (resources::whiteboard->has_planned_unit_map())
if (has_planned_unit_map())
{
ERR_WB << "Modifying action queue while temp modifiers are applied!!!" << std::endl;
}