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

wb: dont resend 'bump_later' commands

Browse source 
these caused 'illegal whiteboard data' messages from the mp server.
This commit is contained in:
gfgtdf 2018-05-21 03:29:58 +02:00
parent 93eb0337c7
commit 619704923c
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/whiteboard/side_actions.cpp
View file

@ -489,7 +489,7 @@ namespace
}
//move action toward front of queue
side_actions::iterator side_actions::bump_earlier(side_actions::iterator position)
side_actions::iterator side_actions::bump_earlier(side_actions::iterator position, bool send_to_net)
{
if(resources::whiteboard->has_planned_unit_map()) {
ERR_WB << "Modifying action queue while temp modifiers are applied!!!" << std::endl;
@ -529,8 +529,9 @@ side_actions::iterator side_actions::bump_earlier(side_actions::iterator positio
<< ", bumping action #" << action_number << "/" << last_position
<< " to position #" << action_number - 1 << "/" << last_position << ".\n";
resources::whiteboard->queue_net_cmd(team_index_, make_net_cmd_bump_later(position - 1));
if (send_to_net) {
resources::whiteboard->queue_net_cmd(team_index_, make_net_cmd_bump_later(position - 1));
}
actions_.bump_earlier(position);
LOG_WB << "After bumping earlier, " << *this << "\n";
@ -538,7 +539,7 @@ side_actions::iterator side_actions::bump_earlier(side_actions::iterator positio
}
//move action toward back of queue
side_actions::iterator side_actions::bump_later(side_actions::iterator position)
side_actions::iterator side_actions::bump_later(iterator position, bool send_to_net)
{
assert(position < end());
@ -546,7 +547,7 @@ side_actions::iterator side_actions::bump_later(side_actions::iterator position)
if(position == end()) {
return end();
}
position = bump_earlier(position);
position = bump_earlier(position, send_to_net);
if(position == end()) {
return end();
}
@ -841,7 +842,7 @@ void side_actions::execute_net_cmd(const net_cmd& cmd)
action_ptr first_action = *itor;
action_ptr second_action = itor[1];
bump_later(itor);
bump_later(itor, false);
LOG_WB << "Command received: action bumped later from turn #" << turn << ", position #" << pos << "\n";

4
src/whiteboard/side_actions.hpp
View file

@ -378,14 +378,14 @@ public:
* i.e. at the front of the queue by one position.
* @return The action's new position.
*/
iterator bump_earlier(iterator position);
iterator bump_earlier(iterator position, bool send_to_net = true);
/**
* Moves an action later in the execution order.
* i.e. at the back of the queue by one position.
* @return The action's new position.
*/
iterator bump_later(iterator position);
iterator bump_later(iterator position, bool send_to_net = true);
/**
* Deletes the action at the specified position.