fix tpt.selectedl sometimes being incorrect

This commit is contained in:
jacob1
2013-05-16 21:59:40 -04:00
parent 7b6ded50dc
commit 9cd84eccde

View File

@@ -947,14 +947,15 @@ void GameController::SetActiveMenu(int menuID)
{ {
gameModel->SetActiveMenu(menuID); gameModel->SetActiveMenu(menuID);
vector<Menu*> menuList = gameModel->GetMenuList(); vector<Menu*> menuList = gameModel->GetMenuList();
bool set = false;
if(menuID == SC_DECO) if(menuID == SC_DECO)
{
gameModel->SetColourSelectorVisibility(true); gameModel->SetColourSelectorVisibility(true);
set = true; else
} {
if(!set)
gameModel->SetColourSelectorVisibility(false); gameModel->SetColourSelectorVisibility(false);
ActiveToolChanged(0, gameModel->GetActiveTool(0));
ActiveToolChanged(1, gameModel->GetActiveTool(1));
ActiveToolChanged(2, gameModel->GetActiveTool(2));
}
} }
std::vector<Menu*> GameController::GetMenuList() std::vector<Menu*> GameController::GetMenuList()