diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp
index f58c9c24d..44360cdb9 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp
@@ -1270,11 +1270,11 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_Tooltips:
 		if((GameSettingsA[iPad]->usBitmaskValues&0x8000)!=0)
 		{
-			ui.SetEnableTooltips(iPad,TRUE);
+			ui.SetEnableTooltips(iPad, true);
 		}
 		else
 		{
-			ui.SetEnableTooltips(iPad,FALSE);
+			ui.SetEnableTooltips(iPad, false);
 		}
 		break;
 	case eGameSetting_Clouds:
diff --git a/Minecraft.Client/Platform/Common/UI/IUIController.h b/Minecraft.Client/Platform/Common/UI/IUIController.h
index b6ecc91f2..0dc12cb99 100644
--- a/Minecraft.Client/Platform/Common/UI/IUIController.h
+++ b/Minecraft.Client/Platform/Common/UI/IUIController.h
@@ -27,7 +27,7 @@ public:
 	virtual void CheckMenuDisplayed() = 0;
 
 	virtual void SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID ) = 0;
-	virtual void SetEnableTooltips( unsigned int iPad, BOOL bVal ) = 0;
+	virtual void SetEnableTooltips( unsigned int iPad, bool bVal ) = 0;
 	virtual void ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show ) = 0;
 	virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, bool forceUpdate = false) = 0;
 	virtual void EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable ) = 0;
diff --git a/Minecraft.Client/Platform/Common/UI/UIController.cpp b/Minecraft.Client/Platform/Common/UI/UIController.cpp
index 7bf294d5b..9b5751c0e 100644
--- a/Minecraft.Client/Platform/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIController.cpp
@@ -1883,7 +1883,7 @@ void UIController::SetTooltipText( unsigned int iPad, unsigned int tooltip, int
 	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetTooltipText(tooltip, iTextID);
 }
 
-void UIController::SetEnableTooltips( unsigned int iPad, BOOL bVal )
+void UIController::SetEnableTooltips( unsigned int iPad, bool bVal )
 {
 	EUIGroup group;
 	if( app.GetGameStarted() )
diff --git a/Minecraft.Client/Platform/Common/UI/UIController.h b/Minecraft.Client/Platform/Common/UI/UIController.h
index e37a6e668..84aa15b20 100644
--- a/Minecraft.Client/Platform/Common/UI/UIController.h
+++ b/Minecraft.Client/Platform/Common/UI/UIController.h
@@ -295,7 +295,7 @@ public:
 
 	// TOOLTIPS
 	virtual void SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID );
-	virtual void SetEnableTooltips( unsigned int iPad, BOOL bVal );
+	virtual void SetEnableTooltips( unsigned int iPad, bool bVal );
 	virtual void ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show );
 	virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, bool forceUpdate = false);
 	virtual void EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable );
diff --git a/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp
index e7eb1fa5b..ac15e4580 100644
--- a/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp
+++ b/Minecraft.Client/Platform/Xbox/Xbox_UIController.cpp
@@ -106,9 +106,9 @@ void ConsoleUIController::SetTooltipText( unsigned int iPad, unsigned int toolti
 	CXuiSceneBase::SetTooltipText(iPad,tooltip,iTextID);
 }
 
-void ConsoleUIController::SetEnableTooltips( unsigned int iPad, BOOL bVal )
+void ConsoleUIController::SetEnableTooltips( unsigned int iPad, bool bVal )
 {
-	CXuiSceneBase::SetEnableTooltips(iPad,bVal);
+	CXuiSceneBase::SetEnableTooltips(iPad, bVal ? TRUE : FALSE);
 }
 
 void ConsoleUIController::ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show )
diff --git a/Minecraft.Client/Platform/Xbox/Xbox_UIController.h b/Minecraft.Client/Platform/Xbox/Xbox_UIController.h
index 7487a3d8d..3f7503513 100644
--- a/Minecraft.Client/Platform/Xbox/Xbox_UIController.h
+++ b/Minecraft.Client/Platform/Xbox/Xbox_UIController.h
@@ -28,7 +28,7 @@ public:
 	virtual void AnimateKeyPress(int iPad, int dwKeyCode);
 
 	virtual void SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID );
-	virtual void SetEnableTooltips( unsigned int iPad, BOOL bVal );
+	virtual void SetEnableTooltips( unsigned int iPad, bool bVal );
 	virtual void ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show );
 	virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, bool forceUpdate = false);
 	virtual void EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable );