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

Whiteboard: correctly set back the whiteboard to disabled stat...

Browse source 
...e if turn ends between pressing and releasing the ctrl key.
This commit is contained in:
Gabriel Morin 2010-07-28 19:45:50 +00:00
parent a636eb236c
commit 4899d313d9
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/whiteboard/manager.cpp
View file

@ -53,6 +53,7 @@ manager::manager():
manager::~manager()
{
LOG_WB << "Manager destroyed.\n";
}
static void print_to_chat(const std::string& title, const std::string& message)
@ -107,35 +108,40 @@ void manager::set_active(bool active)
void manager::set_invert_behavior(bool invert)
{
bool block_whiteboard_activation = false;
if(wait_for_side_init_
|| executing_actions_
|| is_observer())
return;
static bool print_once = true;
if (print_once)
{
print_once = false;
print_to_chat("whiteboard", std::string("Hold the ctrl key to temporarily toggle the whiteboard.")
+ " (Activate and then) Deactivate the whiteboard with the :wb command to erase all actions.");
print_help();
block_whiteboard_activation = true;
}
log_scope("set_invert_behavior");
if (invert)
{
if (!inverted_behavior_)
{
inverted_behavior_ = true;
if (active_)
{
DBG_WB << "Whiteboard deactivated temporarily.\n";
inverted_behavior_ = true;
set_active(false);
}
else // active_ == false
else if (!block_whiteboard_activation)
{
DBG_WB << "Whiteboard activated temporarily.\n";
inverted_behavior_ = true;
set_active(true);
static bool print_once = true;
if (print_once)
{
print_once = false;
print_to_chat("whiteboard", std::string("Hold the ctrl key to temporarily toggle the whiteboard.")
+ " (Activate and then) Deactivate the whiteboard with the :wb command to erase all actions.");
print_help();
}
}
}
}
@ -143,15 +149,16 @@ void manager::set_invert_behavior(bool invert)
{
if (inverted_behavior_)
{
inverted_behavior_ = false;
if (active_)
{
DBG_WB << "Whiteboard set back to deactivated status.\n";
inverted_behavior_ = false;
set_active(false);
}
else // active_ == false
else if (!block_whiteboard_activation)
{
DBG_WB << "Whiteboard set back to activated status.\n";
inverted_behavior_ = false;
set_active(true);
}
}