Replace paths and windows APIs, cleanup source tree

CMakeLists.txt

@@ -6,6 +6,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+add_subdirectory(src/miles)
+
 file(GLOB_RECURSE WORLD_SOURCES ${PROJECT_SOURCE_DIR}/src/world/*.cpp)
 add_library(world STATIC ${WORLD_SOURCES})
 
@@ -14,4 +16,6 @@ target_include_directories(world PUBLIC
     ${PROJECT_SOURCE_DIR}/src/world/x64headers
     ${PROJECT_SOURCE_DIR}/src/client
     ${PROJECT_SOURCE_DIR}/include
-)
+    ${PROJECT_SOURCE_DIR}/src/miles/mss
+)
+target_link_libraries(world PUBLIC milesstub)

src/client/ArchiveFile.cpp

@@ -163,7 +163,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
 					NULL
 					);
 
-				if(bSuccess==FALSE)
+				if(bSuccess==false)
 				{
 					app.FatalLoadError();
 				}

src/client/ClientConnection.cpp

@@ -60,7 +60,7 @@
 ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port)
 {
 	// 4J Stu - No longer used as we use the socket version below.
-	assert(FALSE);
+	assert(false);
 #if 0
 	// 4J - added initiliasers
 	random = new Random();
@@ -1141,7 +1141,7 @@ void ClientConnection::handleDisconnect(shared_ptr<DisconnectPacket> packet)
 	pMinecraft->connectionDisconnected( m_userIndex , packet->reason );
 	app.SetDisconnectReason( packet->reason );
 
-	app.SetAction(m_userIndex,eAppAction_ExitWorld,(void *)TRUE);
+	app.SetAction(m_userIndex,eAppAction_ExitWorld,(void *)true);
     //minecraft->setLevel(NULL);
    //minecraft->setScreen(new DisconnectedScreen(L"disconnect.disconnected", L"disconnect.genericReason", &packet->reason));
 
@@ -1169,7 +1169,7 @@ void ClientConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason,
 	}
 	else
 	{
-		app.SetAction(m_userIndex,eAppAction_ExitWorld,(void *)TRUE);
+		app.SetAction(m_userIndex,eAppAction_ExitWorld,(void *)true);
 	}
 
     //minecraft->setLevel(NULL);
@@ -1610,11 +1610,11 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 //	printf("Client: handlePreLogin\n");
 #if 1
 	// 4J - Check that we can play with all the players already in the game who have Friends-Only UGC set
-	BOOL canPlay = TRUE;
-	BOOL canPlayLocal = TRUE;
+	BOOL canPlay = true;
+	BOOL canPlayLocal = true;
 	BOOL isAtLeastOneFriend = g_NetworkManager.IsHost();
-	BOOL isFriendsWithHost = TRUE;
-	BOOL cantPlayContentRestricted = FALSE;
+	BOOL isFriendsWithHost = true;
+	BOOL cantPlayContentRestricted = false;
 	
 	if(!g_NetworkManager.IsHost())
 	{
@@ -1637,8 +1637,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 			{
 				if(ProfileManager.IsSignedIn(m_userIndex) && ProfileManager.IsGuest(idx))
 				{
-					canPlay = FALSE;
-					isFriendsWithHost = FALSE;
+					canPlay = false;
+					isFriendsWithHost = false;
 				}
 				else
 				{
@@ -1653,10 +1653,10 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 						BOOL result;
 						DWORD error;
 						error = XUserAreUsersFriends(idx,&packet->m_playerXuids[packet->m_hostIndex],1,&result,NULL);
-						if(error == ERROR_SUCCESS && result != TRUE)
+						if(error == ERROR_SUCCESS && result != true)
 						{
-							canPlay = FALSE;
-							isFriendsWithHost = FALSE;
+							canPlay = false;
+							isFriendsWithHost = false;
 						}
 					}
 				}
@@ -1667,8 +1667,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		{
 			if(ProfileManager.IsSignedIn(m_userIndex) && ProfileManager.IsGuest(m_userIndex))
 			{
-				canPlay = FALSE;
-				isFriendsWithHost = FALSE;
+				canPlay = false;
+				isFriendsWithHost = false;
 			}
 			else
 			{
@@ -1683,10 +1683,10 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 					BOOL result;
 					DWORD error;
 					error = XUserAreUsersFriends(m_userIndex,&packet->m_playerXuids[packet->m_hostIndex],1,&result,NULL);
-					if(error == ERROR_SUCCESS && result != TRUE)
+					if(error == ERROR_SUCCESS && result != true)
 					{
-						canPlay = FALSE;
-						isFriendsWithHost = FALSE;
+						canPlay = false;
+						isFriendsWithHost = false;
 					}
 				}
 			}
@@ -1726,7 +1726,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 
 					// 4J Stu - Everyone joining needs to have at least one friend in the game
 					// Local players are implied friends
-					if( isAtLeastOneFriend != TRUE )
+					if( isAtLeastOneFriend != true )
 					{
 						BOOL result;
 						DWORD error;
@@ -1735,7 +1735,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 							if( ProfileManager.IsSignedIn(idx) && !ProfileManager.IsGuest(idx) )
 							{
 								error = XUserAreUsersFriends(idx,&packet->m_playerXuids[i],1,&result,NULL);
-								if(error == ERROR_SUCCESS && result == TRUE) isAtLeastOneFriend = TRUE;
+								if(error == ERROR_SUCCESS && result == true) isAtLeastOneFriend = true;
 							}
 						}
 					}
@@ -1774,10 +1774,10 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	}
 #else
 	// TODO - handle this kind of things for non-360 platforms
-	canPlay = TRUE;
-	canPlayLocal = TRUE;
-	isAtLeastOneFriend = TRUE;
-	cantPlayContentRestricted= FALSE;
+	canPlay = true;
+	canPlayLocal = true;
+	isAtLeastOneFriend = true;
+	cantPlayContentRestricted= false;
 
 #if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
 
@@ -1857,8 +1857,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 
 			if( !isFriend )
 			{
-				canPlay = FALSE;
-				isFriendsWithHost = FALSE;
+				canPlay = false;
+				isFriendsWithHost = false;
 			}
 		}
 	}
@@ -1940,8 +1940,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 
 			if( !isFriend )
 			{
-				canPlay = FALSE;
-				isFriendsWithHost = FALSE;
+				canPlay = false;
+				isFriendsWithHost = false;
 			}
 
 			app.DebugPrintf("ClientConnection::handlePreLogin: User is friends with the host? %s\n", isFriendsWithHost ? "Yes" : "No");
@@ -1969,7 +1969,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 
 			app.DebugPrintf("Exiting world on handling Pre-Login packet due UGC privileges: %d\n", reason);
 			app.SetDisconnectReason( reason );
-			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
+			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)true);
 		}
 		else
 		{						
@@ -2049,7 +2049,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		}
 		BOOL allAllowed, friendsAllowed;
 		ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed);
-		send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE), 
+		send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=true && friendsAllowed==true), 
 			packet->m_ugcPlayersVersion, app.GetPlayerSkinId(m_userIndex), app.GetPlayerCapeId(m_userIndex), ProfileManager.IsGuest( m_userIndex ))));
 
 		if(!g_NetworkManager.IsHost() )
@@ -3162,7 +3162,7 @@ void ClientConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> custo
 			HXUICLASS thisClass = XuiFindClass( L"CXuiSceneTrading" );
 			HXUICLASS objClass = XuiGetObjectClass( scene );
 
-			// Also returns TRUE if they are the same (which is what we want)
+			// Also returns true if they are the same (which is what we want)
 			if( XuiClassDerivesFrom( objClass, thisClass ) )
 			{
 				CXuiSceneTrading *screen;

src/client/Common/Audio/Consoles_SoundEngine.h

@@ -19,7 +19,7 @@
 #else // PS4
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT2
-#include "Orbis\Miles\include\mss.h"
+#include "mss.h"
 #endif
 
 typedef struct

src/client/Common/Audio/SoundEngine.cpp

@@ -1,11 +1,11 @@
 #include "stdafx.h"
 
 #include "SoundEngine.h"
-#include "..\Consoles_App.h"
+#include "Consoles_App.h"
 #include "MultiplayerLocalPlayer.h"
 #include "net.minecraft.world.level.h"
-#include "..\leveldata.h"
-#include "..\mth.h"
+#include "leveldata.h"
+#include "mth.h"
 #include "TexturePackRepository.h"
 #include "DLCTexturePack.h"
 #include "Common/DLC/DLCAudioFile.h"
@@ -15,8 +15,8 @@
 #endif
 
 #ifdef _WINDOWS64
-#include "..\Windows64\Windows64_App.h"
-#include "..\Windows64\Miles\include\imssapi.h"
+#include "Windows64/Windows64_App.h"
+#include "Windows64/Miles/include/imssapi.h"
 #endif
 
 #ifdef __ORBIS__

src/client/Common/Audio/SoundEngine.h

@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include "..\SoundTypes.h"
+#include "SoundTypes.h"
 
 enum eMUSICFILES
 {

src/client/Common/ConsoleGameMode.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ConsoleGameMode.h"
-#include "..\Common\Tutorial\Tutorial.h"
+#include "Tutorial/Tutorial.h"
 
 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)

src/client/Common/ConsoleGameMode.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Common\Tutorial\TutorialMode.h"
+#include "Tutorial/TutorialMode.h"
 
 class ConsoleGameMode : public TutorialMode
 {

src/client/Common/Consoles_App.cpp

@@ -1,58 +1,58 @@
 
 #include "stdafx.h"
 
-#include "..\Recipy.h"
-#include "..\Options.h"
-#include "..\AABB.h"
-#include "..\Vec3.h"
-#include "..\MinecraftServer.h"
-#include "..\MultiPlayerLevel.h"
-#include "..\GameRenderer.h"
-#include "..\ProgressRenderer.h"
-#include "..\LevelRenderer.h"
-#include "..\MobSkinMemTextureProcessor.h"
-#include "..\Minecraft.h"
-#include "..\ClientConnection.h"
-#include "..\MultiPlayerLocalPlayer.h"
-#include "..\LocalPlayer.h"
-#include "..\Player.h"
-#include "..\Inventory.h"
-#include "..\Level.h"
-#include "..\FurnaceTileEntity.h"
-#include "..\Container.h"
-#include "..\DispenserTileEntity.h"
-#include "..\SignTileEntity.h"
-#include "..\StatsCounter.h"
-#include "..\GameMode.h"
-#include "..\Xbox\Social\SocialManager.h"
+#include "Recipy.h"
+#include "Options.h"
+#include "AABB.h"
+#include "Vec3.h"
+#include "MinecraftServer.h"
+#include "MultiPlayerLevel.h"
+#include "GameRenderer.h"
+#include "ProgressRenderer.h"
+#include "LevelRenderer.h"
+#include "MobSkinMemTextureProcessor.h"
+#include "Minecraft.h"
+#include "ClientConnection.h"
+#include "MultiPlayerLocalPlayer.h"
+#include "LocalPlayer.h"
+#include "Player.h"
+#include "Inventory.h"
+#include "Level.h"
+#include "FurnaceTileEntity.h"
+#include "Container.h"
+#include "DispenserTileEntity.h"
+#include "SignTileEntity.h"
+#include "StatsCounter.h"
+#include "GameMode.h"
+#include "Xbox\Social\SocialManager.h"
 #include "Tutorial\TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\Xbox\XML\ATGXmlParser.h"
-#include "..\Xbox\XML\xmlFilesCallback.h"
+#include "Xbox\XML\ATGXmlParser.h"
+#include "Xbox\XML\xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "..\PlayerList.h"
-#include "..\ServerPlayer.h"
+#include "PlayerList.h"
+#include "ServerPlayer.h"
 #include "GameRules\ConsoleGameRules.h"
 #include "GameRules\ConsoleSchematicFile.h"
-#include "..\InputOutputStream.h"
-#include "..\LevelSettings.h"
-#include "..\User.h"
-#include "..\LevelData.h"
-#include "..\net.minecraft.world.entity.player.h"
-#include "..\EntityRenderDispatcher.h"
-#include "..\compression.h"
-#include "..\TexturePackRepository.h"
-#include "..\DLCTexturePack.h"
+#include "InputOutputStream.h"
+#include "LevelSettings.h"
+#include "User.h"
+#include "LevelData.h"
+#include "net.minecraft.world.entity.player.h"
+#include "EntityRenderDispatcher.h"
+#include "compression.h"
+#include "TexturePackRepository.h"
+#include "DLCTexturePack.h"
 #include "DLC\DLCPack.h"
-#include "..\StringTable.h"
+#include "StringTable.h"
 #ifndef _XBOX
-#include "..\ArchiveFile.h"
+#include "ArchiveFile.h"
 #endif
-#include "..\Minecraft.h"
+#include "Minecraft.h"
 #ifdef _XBOX
-#include "..\Xbox\GameConfig\Minecraft.spa.h"
-#include "..\Xbox\Network\NetworkPlayerXbox.h"
+#include "Xbox/GameConfig/Minecraft.spa.h"
+#include "Xbox/Network/NetworkPlayerXbox.h"
 #include "XUI\XUI_TextEntry.h"
 #include "XUI\XUI_XZP_Icons.h"
 #include "XUI\XUI_PauseMenu.h"
@@ -67,7 +67,7 @@
 #include <save_data_dialog.h>
 #endif
 
-#include "..\Common\Leaderboards\LeaderboardManager.h"
+#include "Common/Leaderboards/LeaderboardManager.h"
 
 //CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
@@ -1315,11 +1315,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:
@@ -2325,11 +2325,11 @@ void CMinecraftApp::ActionDebugMask(int iPad,bool bSetAllClear)
 		case eDebugSetting_Safearea:
 			if(ulBitmask&(1<<i))
 			{
-				app.ShowSafeArea( TRUE );
+				app.ShowSafeArea( true );
 			}
 			else
 			{
-				app.ShowSafeArea( FALSE );
+				app.ShowSafeArea( false );
 			}
 			break;
 
@@ -2578,8 +2578,8 @@ void CMinecraftApp::HandleXuiActions(void)
 					loadingParams->waitForThreadToDelete = true;
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
+					completionData->bShowBackground=true;
+					completionData->bShowLogo=true;
 					completionData->type = e_ProgressCompletion_NavigateBackToScene;
 					completionData->iPad = ProfileManager.GetPrimaryPad();
 
@@ -2636,8 +2636,8 @@ void CMinecraftApp::HandleXuiActions(void)
 					loadingParams->lpParam = (LPVOID)true;
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
+					completionData->bShowBackground=true;
+					completionData->bShowLogo=true;
 					completionData->type = e_ProgressCompletion_AutosaveNavigateBack;
 					completionData->iPad = ProfileManager.GetPrimaryPad();
 					//completionData->bAutosaveWasMenuDisplayed=ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad());
@@ -3007,10 +3007,10 @@ void CMinecraftApp::HandleXuiActions(void)
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 					// If param is non-null then this is a forced exit by the server, so make sure the player knows why
 					// 4J Stu - Changed - Don't use the FullScreenProgressScreen for action, use a dialog instead
-					completionData->bRequiresUserAction = FALSE;//(param != NULL) ? TRUE : FALSE;
-					completionData->bShowTips = (param != NULL) ? FALSE : TRUE;
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
+					completionData->bRequiresUserAction = false;//(param != NULL) ? true : false;
+					completionData->bShowTips = (param != NULL) ? false : true;
+					completionData->bShowBackground=true;
+					completionData->bShowLogo=true;
 					completionData->type = e_ProgressCompletion_NavigateToHomeMenu;
 					completionData->iPad = DEFAULT_XUI_MENU_USER;
 					loadingParams->completionData = completionData;
@@ -3049,8 +3049,8 @@ void CMinecraftApp::HandleXuiActions(void)
 					loadingParams->lpParam = param;			
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
+					completionData->bShowBackground=true;
+					completionData->bShowLogo=true;
 					completionData->type = e_ProgressCompletion_NavigateToHomeMenu;
 					completionData->iPad = DEFAULT_XUI_MENU_USER;
 					loadingParams->completionData = completionData;
@@ -3108,8 +3108,8 @@ void CMinecraftApp::HandleXuiActions(void)
 						pMinecraft->gameRenderer->EnableUpdateThread();
 
 						//UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-						//completionData->bShowBackground=TRUE;
-						//completionData->bShowLogo=TRUE;
+						//completionData->bShowBackground=true;
+						//completionData->bShowLogo=true;
 						//completionData->type = e_ProgressCompletion_CloseUIScenes;
 						//completionData->iPad = i;
 						//loadingParams->completionData = completionData;
@@ -3231,7 +3231,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 									// Fix for #12530 - TCR 001 BAS Game Stability: Title will crash if the player disconnects while starting a new world and then opts to play the tutorial once they have been returned to the Main Menu.
 									// 4J Stu - Leave the session
-									g_NetworkManager.LeaveGame(FALSE);
+									g_NetworkManager.LeaveGame(false);
 
 									// need to clear the player stats - can't assume it'll be done in setlevel - we may not be in the game
 									StatsCounter* pStats = Minecraft::GetInstance()->stats[ i ];
@@ -3311,8 +3311,8 @@ void CMinecraftApp::HandleXuiActions(void)
 						loadingParams->func = &CMinecraftApp::SignoutExitWorldThreadProc;		
 
 						UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-						completionData->bShowBackground=TRUE;
-						completionData->bShowLogo=TRUE;
+						completionData->bShowBackground=true;
+						completionData->bShowLogo=true;
 						completionData->iPad=DEFAULT_XUI_MENU_USER;
 						completionData->type = e_ProgressCompletion_NavigateToHomeMenu;
 						loadingParams->completionData = completionData;
@@ -3509,8 +3509,8 @@ void CMinecraftApp::HandleXuiActions(void)
 					loadingParams->lpParam = (LPVOID)&m_InviteData;			
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
+					completionData->bShowBackground=true;
+					completionData->bShowLogo=true;
 					completionData->iPad=DEFAULT_XUI_MENU_USER;
 					completionData->type = e_ProgressCompletion_NoAction;
 					loadingParams->completionData = completionData;
@@ -3608,12 +3608,12 @@ void CMinecraftApp::HandleXuiActions(void)
 
 							UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 #ifdef __PS3__
-							completionData->bRequiresUserAction=FALSE;
+							completionData->bRequiresUserAction=false;
 #else
-							completionData->bRequiresUserAction=TRUE;
+							completionData->bRequiresUserAction=true;
 #endif
-							completionData->bShowBackground=TRUE;
-							completionData->bShowLogo=TRUE;
+							completionData->bShowBackground=true;
+							completionData->bShowLogo=true;
 							completionData->iPad=DEFAULT_XUI_MENU_USER;
 							if( ui.IsSceneInStack( ProfileManager.GetPrimaryPad(), eUIScene_EndPoem ) )
 							{
@@ -3688,9 +3688,9 @@ void CMinecraftApp::HandleXuiActions(void)
 					loadingParams->lpParam = NULL;			
 
 					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-					completionData->bRequiresUserAction=FALSE;
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
+					completionData->bRequiresUserAction=false;
+					completionData->bShowBackground=true;
+					completionData->bShowLogo=true;
 					completionData->iPad=DEFAULT_XUI_MENU_USER;
 					if( ui.IsSceneInStack( ProfileManager.GetPrimaryPad(), eUIScene_EndPoem ) )
 					{
@@ -4278,7 +4278,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
 		saveStats = false;
 
 		// 4J Stu - Leave the session once the disconnect packet has been sent
-		g_NetworkManager.LeaveGame(FALSE);
+		g_NetworkManager.LeaveGame(false);
 	}
 	else
 	{
@@ -5339,7 +5339,7 @@ bool CMinecraftApp::isXuidNotch(PlayerUID xuid)
 {
 	if(m_xuidNotch != INVALID_XUID && xuid != INVALID_XUID)
 	{
-		return ProfileManager.AreXUIDSEqual(xuid, m_xuidNotch) == TRUE;
+		return ProfileManager.AreXUIDSEqual(xuid, m_xuidNotch) == true;
 	}
 	return false;
 }
@@ -7002,7 +7002,7 @@ void CMinecraftApp::EnterSaveNotificationSection()
 
 		if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)true);
 		}
 	}
 	LeaveCriticalSection(&m_saveNotificationCriticalSection);
@@ -7017,7 +7017,7 @@ void CMinecraftApp::LeaveSaveNotificationSection()
 
 		if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)false);
 		}
 	}
 	LeaveCriticalSection(&m_saveNotificationCriticalSection);

src/client/Common/Consoles_App.h

@@ -5,23 +5,23 @@ using namespace std;
 #include "Audio/Consoles_SoundEngine.h"
 
 #include <xuiapp.h>
-#include "..\Common\Tutorial\TutorialEnum.h"
+#include "Tutorial/TutorialEnum.h"
 
 #ifdef _XBOX
-#include "..\Common\XUI\XUI_Helper.h"
-#include "..\Common\XUI\XUI_HelpCredits.h"
+#include "Common/XUI/XUI_Helper.h"
+#include "Common/XUI/XUI_HelpCredits.h"
 #endif
-#include "UI\UIStructs.h"
+#include "Common/UI/UIStructs.h"
 
-#include "..\DisconnectPacket.h"
+#include "DisconnectPacket.h"
 #include <xsocialpost.h>
 
-#include "..\StringTable.h"
-#include "..\Common\DLC\DLCManager.h"
-#include "..\Common\GameRules\ConsoleGameRulesConstants.h"
-#include "..\Common\GameRules\GameRuleManager.h"
-#include "..\SkinBox.h"
-#include "..\ArchiveFile.h"
+#include "StringTable.h"
+#include "Common/DLC/DLCManager.h"
+#include "Common/GameRules/ConsoleGameRulesConstants.h"
+#include "Common/GameRules/GameRuleManager.h"
+#include "SkinBox.h"
+#include "ArchiveFile.h"
 
 typedef struct _JoinFromInviteData
 {

src/client/Common/DLC/DLCGameRules.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCFile.h"
-#include "..\GameRules\LevelGenerationOptions.h"
+#include "GameRules/LevelGenerationOptions.h"
 
 class DLCGameRules : public DLCFile
 {

src/client/Common/DLC/DLCGameRulesHeader.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCGameRules.h"
-#include "..\GameRules\LevelGenerationOptions.h"
+#include "GameRules/LevelGenerationOptions.h"
 
 class DLCGameRulesHeader : public DLCGameRules, public JustGrSource
 {

src/client/Common/DLC/DLCManager.cpp

@@ -345,7 +345,7 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL
 	DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
 	PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
 	BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
-	if(bSuccess==FALSE)
+	if(bSuccess==false)
 	{
 		// need to treat the file as corrupt, and flag it, so can't call fatal error
 		//app.FatalLoadError();
@@ -354,7 +354,7 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL
 	{
 		CloseHandle(file);
 	}
-	if(bSuccess==FALSE)
+	if(bSuccess==false)
 	{
 		// Corrupt or some other error. In any case treat as corrupt
 		app.DebugPrintf("Failed to read %s from DLC content package\n", path.c_str());
@@ -548,7 +548,7 @@ DWORD DLCManager::retrievePackIDFromDLCDataFile(const string &path, DLCPack *pac
 	DWORD bytesRead,dwFileSize = GetFileSize(file,NULL);
 	PBYTE pbData =  (PBYTE) new BYTE[dwFileSize];
 	BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
-	if(bSuccess==FALSE)
+	if(bSuccess==false)
 	{
 		// need to treat the file as corrupt, and flag it, so can't call fatal error
 		//app.FatalLoadError();
@@ -557,7 +557,7 @@ DWORD DLCManager::retrievePackIDFromDLCDataFile(const string &path, DLCPack *pac
 	{
 		CloseHandle(file);
 	}
-	if(bSuccess==FALSE)
+	if(bSuccess==false)
 	{
 		// Corrupt or some other error. In any case treat as corrupt
 		app.DebugPrintf("Failed to read %s from DLC content package\n", path.c_str());

src/client/Common/GameRules/GameRuleManager.cpp

@@ -3,11 +3,11 @@
 #include "StringHelpers.h"
 #include "File.h"
 #include "compression.h"
-#include "..\DLC\DLCPack.h"
-#include "..\DLC\DLCLocalisationFile.h"
-#include "..\DLC\DLCGameRulesFile.h"
-#include "..\DLC\DLCGameRules.h"
-#include "..\DLC\DLCGameRulesHeader.h"
+#include "DLC/DLCPack.h"
+#include "DLC/DLCLocalisationFile.h"
+#include "DLC/DLCGameRulesFile.h"
+#include "DLC/DLCGameRules.h"
+#include "DLC/DLCGameRulesHeader.h"
 #include "StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"

src/client/Common/GameRules/LevelGenerationOptions.cpp

@@ -189,7 +189,7 @@ void LevelGenerationOptions::addAttribute(const wstring &attributeName, const ws
 	else if(attributeName.compare(L"flatworld") == 0)
 	{
 		if(attributeValue.compare(L"true") == 0) m_useFlatWorld = true;
-		app.DebugPrintf("LevelGenerationOptions: Adding parameter flatworld=%s\n",m_useFlatWorld?"TRUE":"FALSE");
+		app.DebugPrintf("LevelGenerationOptions: Adding parameter flatworld=%s\n",m_useFlatWorld?"true":"false");
 	}
 	else if(attributeName.compare(L"saveName") == 0)
 	{
@@ -221,7 +221,7 @@ void LevelGenerationOptions::addAttribute(const wstring &attributeName, const ws
 	else if(attributeName.compare(L"isTutorial") == 0)
 	{
 		if(attributeValue.compare(L"true") == 0) setSrc(eSrc_tutorial);
-		app.DebugPrintf("LevelGenerationOptions: Adding parameter isTutorial=%s\n",isTutorial()?"TRUE":"FALSE");
+		app.DebugPrintf("LevelGenerationOptions: Adding parameter isTutorial=%s\n",isTutorial()?"true":"false");
 	}
 	else if(attributeName.compare(L"baseSaveName") == 0)
 	{

src/client/Common/GameRules/UseTileRuleDefinition.cpp

@@ -38,7 +38,7 @@ void UseTileRuleDefinition::addAttribute(const wstring &attributeName, const wst
 	else if(attributeName.compare(L"useCoords") == 0)
 	{
 		m_useCoords = _fromString<bool>(attributeValue);
-		app.DebugPrintf("UseTileRule: Adding parameter useCoords=%s\n",m_useCoords?"TRUE":"FALSE");
+		app.DebugPrintf("UseTileRule: Adding parameter useCoords=%s\n",m_useCoords?"true":"false");
 	}
 	else if(attributeName.compare(L"x") == 0)
 	{
@@ -72,7 +72,7 @@ bool UseTileRuleDefinition::onUseTile(GameRule *rule, int tileId, int x, int y,
 			{
 				statusChanged = true;
 				setComplete(rule,true);
-				app.DebugPrintf("Completed UseTileRule with info - t:%d, coords:%s, x:%d, y:%d, z:%d\n", m_tileId,m_useCoords?"TRUE":"FALSE",m_coordinates.x,m_coordinates.y,m_coordinates.z);
+				app.DebugPrintf("Completed UseTileRule with info - t:%d, coords:%s, x:%d, y:%d, z:%d\n", m_tileId,m_useCoords?"true":"false",m_coordinates.x,m_coordinates.y,m_coordinates.z);
 
 				// Send a packet or some other announcement here
 			}

src/client/Common/GameRules/XboxStructureActionGenerateBox.cpp

@@ -88,7 +88,7 @@ void XboxStructureActionGenerateBox::addAttribute(const wstring &attributeName,
 	else if(attributeName.compare(L"skipAir") == 0)
 	{
 		if(attributeValue.compare(L"true") == 0) m_skipAir = true;
-		app.DebugPrintf("XboxStructureActionGenerateBox: Adding parameter skipAir=%s\n",m_skipAir?"TRUE":"FALSE");
+		app.DebugPrintf("XboxStructureActionGenerateBox: Adding parameter skipAir=%s\n",m_skipAir?"true":"false");
 	}
 	else
 	{

src/client/Common/Network/GameNetworkManager.cpp

@@ -25,7 +25,7 @@
 #include "Gui.h"
 #include "LevelRenderer.h"
 #include "IntCache.h"
-#include "..\GameRules\ConsoleGameRules.h"
+#include "GameRules/ConsoleGameRules.h"
 #include "GameNetworkManager.h"
 
 #ifdef _XBOX
@@ -162,7 +162,7 @@ bool CGameNetworkManager::_RunNetworkGame(LPVOID lpParameter)
 		success = s_pPlatformNetworkManager->_RunNetworkGame();
 		if(!success)
 		{			
-			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
+			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)true);
 			return true;
 		}
 	}
@@ -609,7 +609,7 @@ void CGameNetworkManager::HostGame(int localUsersMask, bool bOnlineGame, bool bI
 
 bool CGameNetworkManager::IsHost()
 {
-	return (s_pPlatformNetworkManager->IsHost() == TRUE);
+	return (s_pPlatformNetworkManager->IsHost() == true);
 }
 
 bool CGameNetworkManager::IsInStatsEnabledSession()
@@ -1092,7 +1092,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 	{
 		Sleep(10);
 	}
-	app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+	app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)true);
 
 	// wait for the server to be in a non-ticking state
 	pServer->m_serverPausedEvent->WaitForSignal(INFINITE);
@@ -1241,7 +1241,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 
 	// Start the game again
 	app.SetGameStarted(true);				
-	app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+	app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)false);
 	app.SetChangingSessionType(false);
 	app.SetReallyChangingSessionType(false);
 
@@ -1285,14 +1285,14 @@ wstring CGameNetworkManager::GatherRTTStats()
 void CGameNetworkManager::StateChange_AnyToHosting()
 {
 	app.DebugPrintf("Disabling Guest Signin\n");
-	XEnableGuestSignin(FALSE);
+	XEnableGuestSignin(false);
 	Minecraft::GetInstance()->clearPendingClientTextureRequests();
 }
 
 void CGameNetworkManager::StateChange_AnyToJoining()
 {
 	app.DebugPrintf("Disabling Guest Signin\n");
-	XEnableGuestSignin(FALSE);
+	XEnableGuestSignin(false);
 	Minecraft::GetInstance()->clearPendingClientTextureRequests();
 		
 	ConnectionProgressParams *param = new ConnectionProgressParams();
@@ -1337,8 +1337,8 @@ void CGameNetworkManager::StateChange_AnyToStarting()
 		loadingParams->lpParam = NULL;
 
 		UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-		completionData->bShowBackground=TRUE;
-		completionData->bShowLogo=TRUE;
+		completionData->bShowBackground=true;
+		completionData->bShowLogo=true;
 		completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
 		completionData->iPad = ProfileManager.GetPrimaryPad();
 		loadingParams->completionData = completionData;
@@ -1372,14 +1372,14 @@ void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying)
 
 		// The host has notified that the game is about to end
 		if(app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None) app.SetDisconnectReason( DisconnectPacket::eDisconnect_Quitting );
-		app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
+		app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)true);
 	}
 }
 
 void CGameNetworkManager::StateChange_AnyToIdle()
 {
 	app.DebugPrintf("Enabling Guest Signin\n");
-	XEnableGuestSignin(TRUE);
+	XEnableGuestSignin(true);
 	// Reset this here so that we can search for games again
 	// 4J Stu - If we are changing session type there is a race between that thread setting the game to local, and this setting it to not local
 	if(!app.GetChangingSessionType()) g_NetworkManager.SetLocalGame( false );
@@ -1526,7 +1526,7 @@ void CGameNetworkManager::PlayerLeaving( INetworkPlayer *pNetworkPlayer )
 void CGameNetworkManager::HostChanged()
 {
 	// Disable host migration
-	app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
+	app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)true);
 }
 
 void CGameNetworkManager::WriteStats( INetworkPlayer *pNetworkPlayer )
@@ -1659,8 +1659,8 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
 	// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 	bool noUGC = false;
 	bool bContentRestricted=false;
-	BOOL pccAllowed = TRUE;
-	BOOL pccFriendsAllowed = TRUE;
+	BOOL pccAllowed = true;
+	BOOL pccFriendsAllowed = true;
 #if defined(__PS3__) || defined(__PSVITA__)
 	ProfileManager.GetChatAndContentRestrictions(userIndex,false,&noUGC,&bContentRestricted,NULL);
 #else

src/client/Common/Network/Sony/PlatformNetworkManagerSony.cpp

@@ -794,7 +794,7 @@ bool CPlatformNetworkManagerSony::_StartGame()
 {
 #if 0
 	// Set the options that now allow players to join this game
-	BOOL enableJip = TRUE; // Must always be true othewise nobody can join the game while in the PLAY state
+	BOOL enableJip = true; // Must always be true othewise nobody can join the game while in the PLAY state
 	m_pIQNet->SetOpt( QNET_OPTION_JOIN_IN_PROGRESS_ALLOWED, &enableJip, sizeof BOOL );
 	BOOL enableInv = !IsLocalGame();
 	m_pIQNet->SetOpt( QNET_OPTION_INVITES_ALLOWED, &enableInv, sizeof BOOL );
@@ -900,7 +900,7 @@ bool CPlatformNetworkManagerSony::_RunNetworkGame()
 	if(FAILED(hr)) return false;
 
 	// Set the options that now allow players to join this game
-	BOOL enableJip = TRUE; // Must always be true othewise nobody can join the game while in the PLAY state
+	BOOL enableJip = true; // Must always be true othewise nobody can join the game while in the PLAY state
 	m_pIQNet->SetOpt( QNET_OPTION_JOIN_IN_PROGRESS_ALLOWED, &enableJip, sizeof BOOL );
 	BOOL enableInv = !IsLocalGame();
 	m_pIQNet->SetOpt( QNET_OPTION_INVITES_ALLOWED, &enableInv, sizeof BOOL );

src/client/Common/Network/Sony/SonyCommerce.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce.h"
-#include "..\PS3Extras\ShutdownManager.h"
+#include "PS3Extras/ShutdownManager.h"
 #include <sys/event.h>
 
 

src/client/Common/Telemetry/TelemetryManager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\UI\UIEnums.h"
+#include "Common/UI/UIEnums.h"
 
 class CTelemetryManager
 {

src/client/Common/Trial/TrialMode.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "TrialMode.h"
-#include "..\Tutorial\FullTutorial.h"
+#include "Tutorial/FullTutorial.h"
 
 TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: FullTutorialMode(iPad, minecraft, connection)

src/client/Common/Trial/TrialMode.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Tutorial\FullTutorialMode.h"
+#include "Tutorial/FullTutorialMode.h"
 
 class TrialMode : public FullTutorialMode
 {

src/client/Common/Tutorial/FullTutorial.cpp

@@ -4,7 +4,7 @@
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.phys.h"
 #include "net.minecraft.world.effect.h"
-#include "..\GameRules\ConsoleGameRules.h"
+#include "GameRules/ConsoleGameRules.h"
 #include "DiggerItemHint.h"
 #include "TutorialTasks.h"
 #include "AreaHint.h"

src/client/Common/Tutorial/XuiCraftingTask.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ItemInstance.h"
 #if !(defined _XBOX) && !(defined __PSVITA__)
-#include "..\UI\UI.h"
+#include "UI/UI.h"
 #endif
 #include "Tutorial.h"
 #include "XuiCraftingTask.h"

src/client/Common/UI/IUIScene_AbstractContainerMenu.cpp

@@ -238,12 +238,12 @@ void IUIScene_AbstractContainerMenu::UpdateTooltips()
 	{
 		if ( m_aeToolTipSettings[ i ] == eToolTipNone )
 		{
-			ui.ShowTooltip( focusUser, i, FALSE );
+			ui.ShowTooltip( focusUser, i, false );
 		}
 		else
 		{
 			ui.SetTooltipText( focusUser, i, kaToolTipextIds[ m_aeToolTipSettings[ i ] ] );
-			ui.ShowTooltip( focusUser, i, TRUE );
+			ui.ShowTooltip( focusUser, i, true );
 		}
 	}
 }
@@ -1275,10 +1275,10 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 #endif
 
 	int buttonNum=0; // 0 = LeftMouse, 1 = RightMouse
-	BOOL quickKeyHeld=FALSE; // Represents shift key on PC
+	BOOL quickKeyHeld=false; // Represents shift key on PC
 
-	BOOL validKeyPress = FALSE;
-	//BOOL itemEditorKeyPress = FALSE;
+	BOOL validKeyPress = false;
+	//BOOL itemEditorKeyPress = false;
 
 	// Ignore input from other players
 	//if(pMinecraft->player->GetXboxPad()!=pInputData->UserIndex) return S_OK;
@@ -1288,7 +1288,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 #ifdef _DEBUG_MENUS_ENABLED
 #if TO_BE_IMPLEMENTED
 	case VK_PAD_RTHUMB_PRESS:
-		itemEditorKeyPress = TRUE;
+		itemEditorKeyPress = true;
 		break;
 #endif
 #endif
@@ -1298,22 +1298,22 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 #endif
 		if(!bRepeat)
 		{
-			validKeyPress = TRUE;
+			validKeyPress = true;
 
 			// Standard left click
 			buttonNum = 0;
-			quickKeyHeld = FALSE;
+			quickKeyHeld = false;
 			ui.PlayUISFX(eSFX_Press);
 		}
 		break;
 	case ACTION_MENU_X:
 		if(!bRepeat)
 		{
-			validKeyPress = TRUE;
+			validKeyPress = true;
 
 			// Standard right click
 			buttonNum = 1;
-			quickKeyHeld = FALSE;
+			quickKeyHeld = false;
 			ui.PlayUISFX(eSFX_Press);
 		}
 		break;
@@ -1328,11 +1328,11 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 			// No quick move tooltip is shown if something is carried, so disable the action as well
 			//if(!bIsItemCarried)
 			{
-				validKeyPress = TRUE;
+				validKeyPress = true;
 
 				// Shift and left click
 				buttonNum = 0;
-				quickKeyHeld = TRUE;
+				quickKeyHeld = true;
 				ui.PlayUISFX(eSFX_Press);
 			}
 		}
@@ -1429,12 +1429,12 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 					}
 				}
 			}
-			bHandled = TRUE;
+			bHandled = true;
 		}
 		break;
 	};
 
-	if( validKeyPress == TRUE )
+	if( validKeyPress == true )
 	{
 		if(handleValidKeyPress(iPad,buttonNum,quickKeyHeld))
 		{
@@ -1460,7 +1460,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 				{
 					// over empty space or something else???
 					handleOtherClicked(iPad,m_eCurrSection,buttonNum,quickKeyHeld?true:false);
-					//assert( FALSE );
+					//assert( false );
 				}
 			}
 		}
@@ -1468,7 +1468,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 	}
 #ifdef _DEBUG_MENUS_ENABLED
 #if TO_BE_IMPLEMENTED
-	else if(itemEditorKeyPress == TRUE)
+	else if(itemEditorKeyPress == true)
 	{
 		HXUIOBJ hFocusObject = GetFocus(pInputData->UserIndex);
 		HXUIOBJ hFocusObjectParent;
@@ -1503,7 +1503,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 			HRESULT timerResult = KillTimer( POINTER_INPUT_TIMER_ID );
 			assert( timerResult == S_OK );
 
-			app.NavigateToScene(m_iPad,eUIScene_DebugItemEditor,(void *)initData,false,TRUE);
+			app.NavigateToScene(m_iPad,eUIScene_DebugItemEditor,(void *)initData,false,true);
 		}
 	}
 #endif

src/client/Common/UI/IUIScene_AbstractContainerMenu.h

@@ -181,7 +181,7 @@ protected:
 	// 4J - WESTY  - Added for pointer prototype.
 	void SetPointerOutsideMenu( bool bOutside )		{ m_bPointerOutsideMenu = bOutside; }
 	
-	void Initialize(int m_iPad, AbstractContainerMenu* menu, bool autoDeleteMenu, int startIndex,ESceneSection firstSection,ESceneSection maxSection, bool bNavigateBack=FALSE);
+	void Initialize(int m_iPad, AbstractContainerMenu* menu, bool autoDeleteMenu, int startIndex,ESceneSection firstSection,ESceneSection maxSection, bool bNavigateBack=false);
 	virtual void PlatformInitialize(int iPad, int startIndex) = 0;
 	virtual void InitDataAssociations(int iPad, AbstractContainerMenu *menu, int startIndex = 0) = 0;
 

src/client/Common/UI/IUIScene_CreativeMenu.cpp

@@ -901,7 +901,7 @@ void IUIScene_CreativeMenu::handleSlotListClicked(ESceneSection eSection, int bu
 			{
 				playerInventory->setCarried(ItemInstance::clone(clicked));
 				carried = playerInventory->getCarried();
-				if (quickKeyHeld == TRUE)
+				if (quickKeyHeld == true)
 				{
 					carried->count = carried->getMaxStackSize();
 				}
@@ -925,7 +925,7 @@ void IUIScene_CreativeMenu::handleSlotListClicked(ESceneSection eSection, int bu
 			setSectionSelectedSlot(eSectionInventoryCreativeUsing,m_iCurrSlotX,m_iCurrSlotY);
 			currentIndex = getCurrentIndex(eSectionInventoryCreativeUsing);
 			buttonNum = 0;
-			quickKeyHeld = FALSE;
+			quickKeyHeld = false;
 		}
 		m_menu->clicked(currentIndex, buttonNum, quickKeyHeld?AbstractContainerMenu::CLICK_QUICK_MOVE:AbstractContainerMenu::CLICK_PICKUP, pMinecraft->localplayers[getPad()]);
 		shared_ptr<ItemInstance> newItem = m_menu->getSlot(currentIndex)->getItem();

src/client/Common/UI/IUIScene_PauseMenu.cpp

@@ -524,7 +524,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 		saveStats = false;
 
 		// 4J Stu - Leave the session once the disconnect packet has been sent
-		g_NetworkManager.LeaveGame(FALSE);
+		g_NetworkManager.LeaveGame(false);
 	}
 	else
 	{

src/client/Common/UI/UIBitmapFont.cpp

@@ -197,7 +197,7 @@ IggyGlyphMetrics * UIBitmapFont::GetGlyphMetrics(S32 glyph,IggyGlyphMetrics *met
 rrbool UIBitmapFont::IsGlyphEmpty (S32 glyph)
 {
 	if (m_cFontData->glyphIsWhitespace(glyph))	return true;
-	return false;//app.DebugPrintf("Is glyph %d empty? %s\n",glyph,isEmpty?"TRUE":"FALSE");
+	return false;//app.DebugPrintf("Is glyph %d empty? %s\n",glyph,isEmpty?"true":"false");
 }
 
 //Callback function type for returning the kerning amount for a given pair of glyphs 
@@ -214,7 +214,7 @@ F32 UIBitmapFont::GetKerningForGlyphPair(S32 first_glyph,S32 second_glyph)
 //Callback function type used for reporting whether a bitmap supports a given glyph at the given scale
 rrbool UIBitmapFont::CanProvideBitmap(S32 glyph,F32 pixel_scale)
 {
-	//app.DebugPrintf("Can provide bitmap for glyph %d at scale %f? %s\n",glyph,pixel_scale,canProvideBitmap?"TRUE":"FALSE");
+	//app.DebugPrintf("Can provide bitmap for glyph %d at scale %f? %s\n",glyph,pixel_scale,canProvideBitmap?"true":"false");
 	return true;
 }
 

src/client/Common/UI/UIComponent_TutorialPopup.cpp

@@ -348,7 +348,7 @@ wstring UIComponent_TutorialPopup::_SetImage(wstring &desc)
 		{
 			wstring id = desc.substr(imageStartPos, imageEndPos - imageStartPos);
 			m_image.SetImagePath( id.c_str() );
-			m_image.SetShow( TRUE );
+			m_image.SetShow( true );
 
 			desc.replace(imageTagStartPos, imageEndPos - imageTagStartPos + closeTag.length(), L"");
 		}
@@ -356,7 +356,7 @@ wstring UIComponent_TutorialPopup::_SetImage(wstring &desc)
 	else
 	{
 		// hide the icon slot
-		m_image.SetShow( FALSE );
+		m_image.SetShow( false );
 	}
 	
 	BOOL imageShowAtEnd = m_image.IsShown();

src/client/Common/UI/UIControl_PlayerSkinPreview.cpp

@@ -16,7 +16,7 @@
 UIControl_PlayerSkinPreview::UIControl_PlayerSkinPreview()
 {
 	UIControl::setControlType(UIControl::ePlayerSkinPreview);
-	m_bDirty = FALSE;
+	m_bDirty = false;
 	m_fScale = 1.0f;
 	m_fAlpha = 1.0f;
 

src/client/Common/UI/UIScene_AbstractContainerMenu.cpp

@@ -250,7 +250,7 @@ void UIScene_AbstractContainerMenu::handleInput(int iPad, int key, bool repeat,
 {
 	if(m_bIgnoreInput) return;
 
-	//app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	if(pressed)

src/client/Common/UI/UIScene_ConnectingProgress.cpp

@@ -192,14 +192,14 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id)
 			exitReasonStringId = -1;
 
 			//app.NavigateToHomeMenu();
-			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
+			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)true);
 		}
 	}
 }
 
 void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	
 	if( m_showTooltips )
 	{

src/client/Common/UI/UIScene_ContainerMenu.cpp

@@ -7,9 +7,9 @@
 #include "net.minecraft.stats.h"
 #include "LocalPlayer.h"
 #include "Minecraft.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\Tutorial\TutorialEnum.h"
+#include "Tutorial/Tutorial.h"
+#include "Tutorial/TutorialMode.h"
+#include "Tutorial/TutorialEnum.h"
 
 UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
 {

src/client/Common/UI/UIScene_ControlsMenu.cpp

@@ -146,7 +146,7 @@ void UIScene_ControlsMenu::tick()
 
 void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_CraftingMenu.cpp

@@ -54,8 +54,8 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 		app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);	
 	}
 
-	XuiElementSetShow(m_hGrid,TRUE);
-	XuiElementSetShow(m_hPanel,TRUE);
+	XuiElementSetShow(m_hGrid,true);
+	XuiElementSetShow(m_hPanel,true);
 #endif
 
 	if(m_iContainerType==RECIPE_TYPE_3x3)
@@ -77,7 +77,7 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 
 
 	// display the first group tab 
-	m_hTabGroupA[m_iGroupIndex].SetShow(TRUE);
+	m_hTabGroupA[m_iGroupIndex].SetShow(true);
 
 	// store the slot 0 position
 	m_pHSlotsBrushImageControl[0]->GetPosition(&m_vSlot0Pos);
@@ -93,13 +93,13 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 	// get the position of the slot from the xui, and apply any offset needed
 	for(int i=0;i<m_iCraftablesMaxHSlotC;i++)
 	{
-		m_pHSlotsBrushImageControl[i]->SetShow(FALSE);
+		m_pHSlotsBrushImageControl[i]->SetShow(false);
 	}
 
-	XuiElementSetShow(m_hGridInventory,FALSE);
+	XuiElementSetShow(m_hGridInventory,false);
 
-	m_hScrollBar2.SetShow(FALSE);
-	m_hScrollBar3.SetShow(FALSE);
+	m_hScrollBar2.SetShow(false);
+	m_hScrollBar3.SetShow(false);
 
 #endif
 
@@ -546,7 +546,7 @@ bool UIScene_CraftingMenu::allowRepeat(int key)
 
 void UIScene_CraftingMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_CreateWorldMenu.cpp

@@ -64,15 +64,15 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));	
 	m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
 
-	m_MoreOptionsParams.bGenerateOptions=TRUE;
-	m_MoreOptionsParams.bStructures=TRUE;	
-	m_MoreOptionsParams.bFlatWorld=FALSE;
-	m_MoreOptionsParams.bBonusChest=FALSE;
-	m_MoreOptionsParams.bPVP = TRUE;
-	m_MoreOptionsParams.bTrust = TRUE;
-	m_MoreOptionsParams.bFireSpreads = TRUE;
-	m_MoreOptionsParams.bHostPrivileges = FALSE;
-	m_MoreOptionsParams.bTNT = TRUE;
+	m_MoreOptionsParams.bGenerateOptions=true;
+	m_MoreOptionsParams.bStructures=true;	
+	m_MoreOptionsParams.bFlatWorld=false;
+	m_MoreOptionsParams.bBonusChest=false;
+	m_MoreOptionsParams.bPVP = true;
+	m_MoreOptionsParams.bTrust = true;
+	m_MoreOptionsParams.bFireSpreads = true;
+	m_MoreOptionsParams.bHostPrivileges = false;
+	m_MoreOptionsParams.bTNT = true;
 	m_MoreOptionsParams.iPad = iPad;
 
 	m_bGameModeSurvival=true;
@@ -97,23 +97,23 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 	// Set the text for friends of friends, and default to on
 	if( m_bMultiplayerAllowed )
 	{
-		m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?TRUE:FALSE;
+		m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?true:false;
 		if(bGameSetting_Online)
 		{
-			m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?TRUE:FALSE;
-			m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?TRUE:FALSE;
+			m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?true:false;
+			m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?true:false;
 		}
 		else
 		{
-			m_MoreOptionsParams.bInviteOnly = FALSE;
-			m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+			m_MoreOptionsParams.bInviteOnly = false;
+			m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 		}
 	}
 	else
 	{
-		m_MoreOptionsParams.bOnlineGame = FALSE;
-		m_MoreOptionsParams.bInviteOnly = FALSE;
-		m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+		m_MoreOptionsParams.bOnlineGame = false;
+		m_MoreOptionsParams.bInviteOnly = false;
+		m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 		if(bGameSetting_Online)
 		{
 			// The profile settings say Online, but either the player is offline, or they are not allowed to play online
@@ -665,23 +665,23 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 				if( bMultiplayerAllowed )
 				{
 					bool bGameSetting_Online=(app.GetGameSettings(m_iPad,eGameSetting_Online)!=0);
-					m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?TRUE:FALSE;
+					m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?true:false;
 					if(bGameSetting_Online)
 					{
-						m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?TRUE:FALSE;
-						m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?TRUE:FALSE;
+						m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?true:false;
+						m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?true:false;
 					}
 					else
 					{
-						m_MoreOptionsParams.bInviteOnly = FALSE;
-						m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+						m_MoreOptionsParams.bInviteOnly = false;
+						m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 					}
 				}
 				else
 				{
-					m_MoreOptionsParams.bOnlineGame = FALSE;
-					m_MoreOptionsParams.bInviteOnly = FALSE;
-					m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+					m_MoreOptionsParams.bOnlineGame = false;
+					m_MoreOptionsParams.bInviteOnly = false;
+					m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 				}
 				
 #if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
@@ -721,7 +721,7 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 						PBYTE pbImageData=NULL;
 
 						app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes );
-						ListInfo.fEnabled = TRUE;	
+						ListInfo.fEnabled = true;	
 						ListInfo.iData = m_iConfigA[i];
 						HRESULT hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&ListInfo.hXuiBrush);
 						app.DebugPrintf("Adding texturepack  %d from TPD\n",m_iConfigA[i]);
@@ -915,7 +915,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 	}
 #endif
 
-	if(m_bGameModeSurvival != true || m_MoreOptionsParams.bHostPrivileges == TRUE)
+	if(m_bGameModeSurvival != true || m_MoreOptionsParams.bHostPrivileges == true)
 	{			
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_CONFIRM_OK;
@@ -941,8 +941,8 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 		// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 		//bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && m_MoreOptionsParams.bOnlineGame;
 		bool noUGC = false;
-		BOOL pccAllowed = TRUE;
-		BOOL pccFriendsAllowed = TRUE;
+		BOOL pccAllowed = true;
+		BOOL pccFriendsAllowed = true;
 		bool bContentRestricted = false;
 
 		ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
@@ -1101,7 +1101,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	}
 
 	// start the game
-	bool isFlat = (pClass->m_MoreOptionsParams.bFlatWorld==TRUE);
+	bool isFlat = (pClass->m_MoreOptionsParams.bFlatWorld==true);
 	__int64 seedValue = 0;
 
 	NetworkGameInitData *param = new NetworkGameInitData();
@@ -1220,8 +1220,8 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	app.SetAutosaveTimerTime();
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-	completionData->bShowBackground=TRUE;
-	completionData->bShowLogo=TRUE;
+	completionData->bShowBackground=true;
+	completionData->bShowLogo=true;
 	completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
 	completionData->iPad = DEFAULT_XUI_MENU_USER;
 	loadingParams->completionData = completionData;
@@ -1300,8 +1300,8 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinu
 
 			// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 			bool noUGC = false;
-			BOOL pccAllowed = TRUE;
-			BOOL pccFriendsAllowed = TRUE;
+			BOOL pccAllowed = true;
+			BOOL pccFriendsAllowed = true;
 
 			ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 			if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
@@ -1367,8 +1367,8 @@ int UIScene_CreateWorldMenu::ConfirmCreateReturned(void *pParam,int iPad,C4JStor
 			// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 			bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 			bool noUGC = false;
-			BOOL pccAllowed = TRUE;
-			BOOL pccFriendsAllowed = TRUE;
+			BOOL pccAllowed = true;
+			BOOL pccFriendsAllowed = true;
 
 			ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 			if(!pccAllowed && !pccFriendsAllowed) noUGC = true;

src/client/Common/UI/UIScene_CreativeMenu.cpp

@@ -4,8 +4,8 @@
 
 #include "JavaMath.h"
 #include "LocalPlayer.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
+#include "Tutorial/Tutorial.h"
+#include "Tutorial/TutorialMode.h"
 #include "net.minecraft.world.inventory.h"
 #include "net.minecraft.world.item.h"
 
@@ -198,7 +198,7 @@ void UIScene_CreativeMenu::handleInput(int iPad, int key, bool repeat, bool pres
 	// 4J-PB - going to ignore repeats on this scene
 	if(repeat) return;
 
-	//app.DebugPrintf("UIScene_CreativeMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_CreativeMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	int dir = 1;

src/client/Common/UI/UIScene_Credits.cpp

@@ -614,7 +614,7 @@ void UIScene_Credits::tick()
 
 void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %ls, pressed- %ls, released- %ls\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %ls, pressed- %ls, released- %ls\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 

src/client/Common/UI/UIScene_DLCMainMenu.cpp

@@ -85,7 +85,7 @@ void UIScene_DLCMainMenu::updateTooltips()
 
 void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_DLCOffersMenu.cpp

@@ -139,7 +139,7 @@ void UIScene_DLCOffersMenu::updateTooltips()
 
 void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)
@@ -784,7 +784,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 	}
 
 	// turn off the timer display
-	//m_Timer.SetShow(FALSE);
+	//m_Timer.SetShow(false);
 	if(bNoDLCToDisplay)
 	{
 		// set the default text

src/client/Common/UI/UIScene_DebugOptions.cpp

@@ -51,7 +51,7 @@ wstring UIScene_DebugOptionsMenu::getMoviePath()
 
 void UIScene_DebugOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOptionsMenu handling input for pad %d, key %d, repeat- %s, pressed- %s, released- %s\n", iPad, key, repeat?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOptionsMenu handling input for pad %d, key %d, repeat- %s, pressed- %s, released- %s\n", iPad, key, repeat?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	switch(key)
 	{

src/client/Common/UI/UIScene_EndPoem.cpp

@@ -96,7 +96,7 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer)
 
 #if TO_BE_IMPLEMENTED
 	m_scrollDir = 1;
-	HRESULT hr = XuiHtmlControlSetSmoothScroll(m_htmlControl.m_hObj, XUI_SMOOTHSCROLL_VERTICAL,TRUE,AUTO_SCROLL_SPEED,1.0f,AUTO_SCROLL_SPEED);
+	HRESULT hr = XuiHtmlControlSetSmoothScroll(m_htmlControl.m_hObj, XUI_SMOOTHSCROLL_VERTICAL,true,AUTO_SCROLL_SPEED,1.0f,AUTO_SCROLL_SPEED);
 	XuiHtmlControlVScrollBy(m_htmlControl.m_hObj,m_scrollDir * 1000);
 
 	SetTimer(0,200);

src/client/Common/UI/UIScene_FullscreenProgress.cpp

@@ -171,7 +171,7 @@ void UIScene_FullscreenProgress::tick()
 			else
 			{
 				/*m_threadCompleted = true;
-				m_buttonConfirm.SetShow( TRUE );
+				m_buttonConfirm.SetShow( true );
 				m_buttonConfirm.SetFocus( m_CompletionData->iPad );
 				m_CompletionData->type = e_ProgressCompletion_NavigateToHomeMenu;
 
@@ -195,7 +195,7 @@ void UIScene_FullscreenProgress::tick()
 		}
 		else
 		{
-			if(( m_CompletionData->bRequiresUserAction == TRUE ) && (!m_bWasCancelled))
+			if(( m_CompletionData->bRequiresUserAction == true ) && (!m_bWasCancelled))
 			{				
 				m_threadCompleted = true;
 				m_buttonConfirm.setVisible( true );

src/client/Common/UI/UIScene_HUD.cpp

@@ -414,7 +414,7 @@ void UIScene_HUD::ShowHealth(bool show)
 {
 	if(show != m_showHealth)
 	{
-		app.DebugPrintf("ShowHealth to %s\n", show?"TRUE":"FALSE");
+		app.DebugPrintf("ShowHealth to %s\n", show?"true":"false");
 		m_showHealth = show;
 
 		IggyDataValue result;
@@ -429,7 +429,7 @@ void UIScene_HUD::ShowFood(bool show)
 {
 	if(show != m_showFood)
 	{
-		app.DebugPrintf("ShowFood to %s\n", show?"TRUE":"FALSE");
+		app.DebugPrintf("ShowFood to %s\n", show?"true":"false");
 		m_showFood = show;
 
 		IggyDataValue result;
@@ -444,7 +444,7 @@ void UIScene_HUD::ShowAir(bool show)
 {
 	if(show != m_showAir)
 	{
-		app.DebugPrintf("ShowAir to %s\n", show?"TRUE":"FALSE");
+		app.DebugPrintf("ShowAir to %s\n", show?"true":"false");
 		m_showAir = show;
 
 		IggyDataValue result;
@@ -459,7 +459,7 @@ void UIScene_HUD::ShowArmour(bool show)
 {
 	if(show != m_showArmour)
 	{
-		app.DebugPrintf("ShowArmour to %s\n", show?"TRUE":"FALSE");
+		app.DebugPrintf("ShowArmour to %s\n", show?"true":"false");
 		m_showArmour = show;
 
 		IggyDataValue result;
@@ -474,7 +474,7 @@ void UIScene_HUD::ShowExpBar(bool show)
 {
 	if(show != m_showExpBar)
 	{
-		app.DebugPrintf("ShowExpBar to %s\n", show?"TRUE":"FALSE");
+		app.DebugPrintf("ShowExpBar to %s\n", show?"true":"false");
 		m_showExpBar = show;
 
 		IggyDataValue result;
@@ -489,7 +489,7 @@ void UIScene_HUD::SetRegenerationEffect(bool bEnabled)
 {
 	if(bEnabled != m_lastRegenEffect)
 	{
-		app.DebugPrintf("SetRegenerationEffect to %s\n", bEnabled?"TRUE":"FALSE");
+		app.DebugPrintf("SetRegenerationEffect to %s\n", bEnabled?"true":"false");
 		m_lastRegenEffect = bEnabled;
 
 		IggyDataValue result;
@@ -546,7 +546,7 @@ void UIScene_HUD::ShowDragonHealth(bool show)
 {
 	if(show != m_showDragonHealth)
 	{
-		app.DebugPrintf("ShowDragonHealth to %s\n", show?"TRUE":"FALSE");
+		app.DebugPrintf("ShowDragonHealth to %s\n", show?"true":"false");
 		m_showDragonHealth = show;
 
 		IggyDataValue result;

src/client/Common/UI/UIScene_HelpAndOptionsMenu.cpp

@@ -157,8 +157,8 @@ void UIScene_HelpAndOptionsMenu::handleReload()
 	if(!ProfileManager.IsFullVersion() )//|| ProfileManager.IsGuest(m_iPad))
 	{
 #if TO_BE_IMPLEMENTED
-		m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(FALSE);
-		m_Buttons[BUTTON_HAO_CHANGESKIN].EnableInput(FALSE);
+		m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(false);
+		m_Buttons[BUTTON_HAO_CHANGESKIN].EnableInput(false);
 		// set the focus to the second button
 
 		XuiElementSetUserFocus(m_Buttons[BUTTON_HAO_HOWTOPLAY].m_hObj, m_iPad);
@@ -175,7 +175,7 @@ void UIScene_HelpAndOptionsMenu::handleReload()
 
 void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 

src/client/Common/UI/UIScene_HowToPlayMenu.cpp

@@ -165,7 +165,7 @@ void UIScene_HowToPlayMenu::handleReload()
 
 void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_InGameHostOptionsMenu.cpp

@@ -50,7 +50,7 @@ void UIScene_InGameHostOptionsMenu::updateTooltips()
 
 void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 	switch(key)

src/client/Common/UI/UIScene_InGameInfoMenu.cpp

@@ -75,7 +75,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == true;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -154,7 +154,7 @@ void UIScene_InGameInfoMenu::updateTooltips()
 			{
 				keyA = IDS_TOOLTIPS_PRIVILEGES;
 			}
-			else if(selectedPlayer->IsLocal() != TRUE && selectedPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != TRUE)
+			else if(selectedPlayer->IsLocal() != true && selectedPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != true)
 			{
 				// Only ops will hit this, can kick anyone not local and not local to the host
 				keyA = IDS_TOOLTIPS_KICK;
@@ -249,7 +249,7 @@ void UIScene_InGameInfoMenu::handleReload()
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == true;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -333,7 +333,7 @@ void UIScene_InGameInfoMenu::tick()
 
 void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)
@@ -452,7 +452,7 @@ void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 				pInitData->playerPrivileges = app.GetPlayerPrivileges(m_players[ currentSelection ] );
 				ui.NavigateToScene(m_iPad,eUIScene_InGamePlayerOptionsMenu,pInitData);
 			}
-			else if(selectedPlayer->IsLocal() != TRUE && selectedPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != TRUE)
+			else if(selectedPlayer->IsLocal() != true && selectedPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != true)
 			{
 				// Only ops will hit this, can kick anyone not local and not local to the host
 				BYTE *smallId = new BYTE();

src/client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp

@@ -178,7 +178,7 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu(int iPad, void
 
 
 		// Can only kick people if they are not local, and not local to the host
-		if(editingPlayer->IsLocal() != TRUE && editingPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != TRUE)
+		if(editingPlayer->IsLocal() != true && editingPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != true)
 		{
 			m_buttonKick.init( app.GetString(IDS_KICK_PLAYER), eControl_Kick);
 		}
@@ -250,7 +250,7 @@ void UIScene_InGamePlayerOptionsMenu::handleDestroy()
 
 void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 	switch(key)

src/client/Common/UI/UIScene_InventoryMenu.cpp

@@ -11,9 +11,9 @@
 #include "Options.h"
 #include "EntityRenderDispatcher.h"
 #include "Lighting.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\Tutorial\TutorialEnum.h"
+#include "Tutorial/Tutorial.h"
+#include "Tutorial/TutorialMode.h"
+#include "Tutorial/TutorialEnum.h"
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second

src/client/Common/UI/UIScene_JoinMenu.cpp

@@ -457,8 +457,8 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 
 	// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 	bool noUGC = false;
-	BOOL pccAllowed = TRUE;
-	BOOL pccFriendsAllowed = TRUE;
+	BOOL pccAllowed = true;
+	BOOL pccFriendsAllowed = true;
 
 #if defined(__PS3__) || defined(__PSVITA__)
 	if(isSignedInLive)

src/client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp

@@ -204,7 +204,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat,
 {
 	if(m_bIgnoreInput) return;
 
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_LeaderboardsMenu.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LeaderboardsMenu.h"
-#include "..\Leaderboards\LeaderboardManager.h"
+#include "Leaderboards\LeaderboardManager.h"
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.item.h"
 
@@ -947,7 +947,7 @@ int UIScene_LeaderboardsMenu::SetLeaderboardTitleIcons()
 	{
 		if(TitleIcons[m_currentLeaderboard][i]==0)
 		{
-			//m_pHTitleIconSlots[i]->SetShow(FALSE);
+			//m_pHTitleIconSlots[i]->SetShow(false);
 		}
 		else
 		{

src/client/Common/UI/UIScene_LeaderboardsMenu.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "UIScene.h"
-#include "..\Leaderboards\LeaderboardManager.h"
+#include "Leaderboards\LeaderboardManager.h"
 
 class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener
 {

src/client/Common/UI/UIScene_LoadMenu.cpp

@@ -79,12 +79,12 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));	
 	m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
 
-	m_MoreOptionsParams.bGenerateOptions=FALSE;
-	m_MoreOptionsParams.bPVP = TRUE;
-	m_MoreOptionsParams.bTrust = TRUE;
-	m_MoreOptionsParams.bFireSpreads = TRUE;
-	m_MoreOptionsParams.bHostPrivileges = FALSE;
-	m_MoreOptionsParams.bTNT = TRUE;
+	m_MoreOptionsParams.bGenerateOptions=false;
+	m_MoreOptionsParams.bPVP = true;
+	m_MoreOptionsParams.bTrust = true;
+	m_MoreOptionsParams.bFireSpreads = true;
+	m_MoreOptionsParams.bHostPrivileges = false;
+	m_MoreOptionsParams.bTNT = true;
 	m_MoreOptionsParams.iPad = iPad;
 
 	m_iSaveGameInfoIndex=params->iSaveGameInfoIndex;
@@ -112,23 +112,23 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	// Set the text for friends of friends, and default to on
 	if( m_bMultiplayerAllowed)
 	{
-		m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?TRUE:FALSE;
+		m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?true:false;
 		if(bGameSetting_Online)
 		{
-			m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?TRUE:FALSE;
-			m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?TRUE:FALSE;
+			m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?true:false;
+			m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?true:false;
 		}
 		else
 		{
-			m_MoreOptionsParams.bInviteOnly = FALSE;
-			m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+			m_MoreOptionsParams.bInviteOnly = false;
+			m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 		}
 	}
 	else
 	{
-		m_MoreOptionsParams.bOnlineGame = FALSE;
-		m_MoreOptionsParams.bInviteOnly = FALSE;
-		m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+		m_MoreOptionsParams.bOnlineGame = false;
+		m_MoreOptionsParams.bInviteOnly = false;
+		m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 		if(bGameSetting_Online)
 		{
 			// The profile settings say Online, but either the player is offline, or they are not allowed to play online
@@ -451,12 +451,12 @@ void UIScene_LoadMenu::tick()
 		// Setup all the text and checkboxes to match what the game was saved with on
 		if(bHostOptionsRead)
 		{
-			m_MoreOptionsParams.bPVP = app.GetGameHostOption(uiHostOptions,eGameHostOption_PvP)>0?TRUE:FALSE;
-			m_MoreOptionsParams.bTrust = app.GetGameHostOption(uiHostOptions,eGameHostOption_TrustPlayers)>0?TRUE:FALSE;
-			m_MoreOptionsParams.bFireSpreads = app.GetGameHostOption(uiHostOptions,eGameHostOption_FireSpreads)>0?TRUE:FALSE;
-			m_MoreOptionsParams.bTNT = app.GetGameHostOption(uiHostOptions,eGameHostOption_TNT)>0?TRUE:FALSE;
-			m_MoreOptionsParams.bHostPrivileges = app.GetGameHostOption(uiHostOptions,eGameHostOption_CheatsEnabled)>0?TRUE:FALSE;
-			m_MoreOptionsParams.bDisableSaving = app.GetGameHostOption(uiHostOptions,eGameHostOption_DisableSaving)>0?TRUE:FALSE;
+			m_MoreOptionsParams.bPVP = app.GetGameHostOption(uiHostOptions,eGameHostOption_PvP)>0?true:false;
+			m_MoreOptionsParams.bTrust = app.GetGameHostOption(uiHostOptions,eGameHostOption_TrustPlayers)>0?true:false;
+			m_MoreOptionsParams.bFireSpreads = app.GetGameHostOption(uiHostOptions,eGameHostOption_FireSpreads)>0?true:false;
+			m_MoreOptionsParams.bTNT = app.GetGameHostOption(uiHostOptions,eGameHostOption_TNT)>0?true:false;
+			m_MoreOptionsParams.bHostPrivileges = app.GetGameHostOption(uiHostOptions,eGameHostOption_CheatsEnabled)>0?true:false;
+			m_MoreOptionsParams.bDisableSaving = app.GetGameHostOption(uiHostOptions,eGameHostOption_DisableSaving)>0?true:false;
 
 			// turn off creative mode on the save
 			// #ifdef _DEBUG
@@ -483,7 +483,7 @@ void UIScene_LoadMenu::tick()
 			bool bGameSetting_Online=(app.GetGameSettings(m_iPad,eGameSetting_Online)!=0);
 			if(app.GetGameHostOption(uiHostOptions,eGameHostOption_FriendsOfFriends) && !(m_bMultiplayerAllowed && bGameSetting_Online))
 			{
-				m_MoreOptionsParams.bAllowFriendsOfFriends = TRUE;
+				m_MoreOptionsParams.bAllowFriendsOfFriends = true;
 			}
 		}
 
@@ -828,7 +828,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 #endif
 
 	// Check if they have the Reset Nether flag set, and confirm they want to do this
-	if(m_MoreOptionsParams.bResetNether==TRUE)
+	if(m_MoreOptionsParams.bResetNether==true)
 	{
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_DONT_RESET_NETHER;
@@ -887,23 +887,23 @@ void UIScene_LoadMenu::handleTimerComplete(int id)
 				if( bMultiplayerAllowed )
 				{
 					bool bGameSetting_Online=(app.GetGameSettings(m_iPad,eGameSetting_Online)!=0);
-					m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?TRUE:FALSE;
+					m_MoreOptionsParams.bOnlineGame = bGameSetting_Online?true:false;
 					if(bGameSetting_Online)
 					{
-						m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?TRUE:FALSE;
-						m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?TRUE:FALSE;
+						m_MoreOptionsParams.bInviteOnly = (app.GetGameSettings(m_iPad,eGameSetting_InviteOnly)!=0)?true:false;
+						m_MoreOptionsParams.bAllowFriendsOfFriends = (app.GetGameSettings(m_iPad,eGameSetting_FriendsOfFriends)!=0)?true:false;
 					}
 					else
 					{
-						m_MoreOptionsParams.bInviteOnly = FALSE;
-						m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+						m_MoreOptionsParams.bInviteOnly = false;
+						m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 					}
 				}
 				else
 				{
-					m_MoreOptionsParams.bOnlineGame = FALSE;
-					m_MoreOptionsParams.bInviteOnly = FALSE;
-					m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
+					m_MoreOptionsParams.bOnlineGame = false;
+					m_MoreOptionsParams.bInviteOnly = false;
+					m_MoreOptionsParams.bAllowFriendsOfFriends = false;
 				}
 #if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 				if(getSceneResolution() == eSceneResolution_1080)
@@ -988,7 +988,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 	killTimer(CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID);
 #endif
 
-	if( (m_bGameModeSurvival != true || m_bHasBeenInCreative) || m_MoreOptionsParams.bHostPrivileges == TRUE)
+	if( (m_bGameModeSurvival != true || m_bHasBeenInCreative) || m_MoreOptionsParams.bHostPrivileges == true)
 	{			
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_CONFIRM_OK;
@@ -1094,7 +1094,7 @@ int UIScene_LoadMenu::CheckResetNetherReturned(void *pParam,int iPad,C4JStorage:
 	else if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		// turn off the reset nether and continue
-		pClass->m_MoreOptionsParams.bResetNether=FALSE;
+		pClass->m_MoreOptionsParams.bResetNether=false;
 		pClass->LaunchGame();
 	}
 	else
@@ -1205,8 +1205,8 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 
 		// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 		bool noUGC = false;
-		BOOL pccAllowed = TRUE;
-		BOOL pccFriendsAllowed = TRUE;
+		BOOL pccAllowed = true;
+		BOOL pccFriendsAllowed = true;
 		bool bContentRestricted = false;
 		ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 #if defined(__PS3__) || defined(__PSVITA__)
@@ -1461,7 +1461,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 	app.SetGameHostOption(eGameHostOption_HostCanBeInvisible,pClass->m_MoreOptionsParams.bHostPrivileges );
 
 	// flag if the user wants to reset the Nether to force a Fortress with netherwart etc.
-	app.SetResetNether((pClass->m_MoreOptionsParams.bResetNether==TRUE)?true:false);
+	app.SetResetNether((pClass->m_MoreOptionsParams.bResetNether==true)?true:false);
 	// clear out the app's terrain features list
 	app.ClearTerrainFeaturePosition();
 
@@ -1483,8 +1483,8 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 	app.SetAutosaveTimerTime();
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-	completionData->bShowBackground=TRUE;
-	completionData->bShowLogo=TRUE;
+	completionData->bShowBackground=true;
+	completionData->bShowLogo=true;
 	completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
 	completionData->iPad = DEFAULT_XUI_MENU_USER;
 	loadingParams->completionData = completionData;
@@ -1495,7 +1495,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 void UIScene_LoadMenu::checkStateAndStartGame()
 {
 	// Check if they have the Reset Nether flag set, and confirm they want to do this
-	if(m_MoreOptionsParams.bResetNether==TRUE)
+	if(m_MoreOptionsParams.bResetNether==true)
 	{
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_DONT_RESET_NETHER;
@@ -1525,8 +1525,8 @@ void UIScene_LoadMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 		// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 		bool noUGC = false;
-		BOOL pccAllowed = TRUE;
-		BOOL pccFriendsAllowed = TRUE;
+		BOOL pccAllowed = true;
+		BOOL pccFriendsAllowed = true;
 
 		ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 		if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
@@ -1587,7 +1587,7 @@ void UIScene_LoadMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 	app.SetGameHostOption(eGameHostOption_HostCanBeInvisible,m_MoreOptionsParams.bHostPrivileges );
 
 	// flag if the user wants to reset the Nether to force a Fortress with netherwart etc.
-	app.SetResetNether((m_MoreOptionsParams.bResetNether==TRUE)?true:false);
+	app.SetResetNether((m_MoreOptionsParams.bResetNether==true)?true:false);
 	// clear out the app's terrain features list
 	app.ClearTerrainFeaturePosition();
 
@@ -1607,8 +1607,8 @@ void UIScene_LoadMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 	app.SetAutosaveTimerTime();
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-	completionData->bShowBackground=TRUE;
-	completionData->bShowLogo=TRUE;
+	completionData->bShowBackground=true;
+	completionData->bShowLogo=true;
 	completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
 	completionData->iPad = DEFAULT_XUI_MENU_USER;
 	loadingParams->completionData = completionData;
@@ -1685,8 +1685,8 @@ int UIScene_LoadMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int
 
 			// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 			bool noUGC = false;
-			BOOL pccAllowed = TRUE;
-			BOOL pccFriendsAllowed = TRUE;
+			BOOL pccAllowed = true;
+			BOOL pccFriendsAllowed = true;
 
 			ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
 			if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
@@ -1751,7 +1751,7 @@ void UIScene_LoadMenu::handleGainFocus(bool navBack)
 #if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 		if(getSceneResolution() == eSceneResolution_1080)
 		{
-			m_checkboxOnline.setChecked(m_MoreOptionsParams.bOnlineGame == TRUE);
+			m_checkboxOnline.setChecked(m_MoreOptionsParams.bOnlineGame == true);
 		}
 #endif
 	}

src/client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -13,7 +13,7 @@
 #include "MinecraftServer.h"
 #include "TexturePackRepository.h"
 #include "TexturePack.h"
-#include "..\Network\SessionInfo.h"
+#include "Network\SessionInfo.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 #include "Common/Network\Sony\SonyHttp.h"
 #include "Common/Network\Sony\SonyRemoteStorage.h"
@@ -882,7 +882,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         {
             uiSaveC=0;
             m_controlSavesTimer.setVisible( false );
-            m_SavesList.SetEnable(TRUE);
+            m_SavesList.SetEnable(true);
         }
 #endif
     }
@@ -1581,8 +1581,8 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
     loadingParams->lpParam = (LPVOID)param;
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-    completionData->bShowBackground=TRUE;
-    completionData->bShowLogo=TRUE;
+    completionData->bShowBackground=true;
+    completionData->bShowLogo=true;
     completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
     completionData->iPad = DEFAULT_XUI_MENU_USER;
     loadingParams->completionData = completionData;
@@ -1648,7 +1648,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
 #if TO_BE_IMPLEMENTED
         if( !m_pGamesList->IsEnabled() )
         {
-            m_pGamesList->SetEnable(TRUE);
+            m_pGamesList->SetEnable(true);
             m_pGamesList->SetCurSel( 0 );
         }
 #endif
@@ -1658,7 +1658,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     else
     {
 #if TO_BE_IMPLEMENTED
-        m_pGamesList->SetEnable(FALSE);
+        m_pGamesList->SetEnable(false);
 #endif
         m_controlJoinTimer.setVisible( false );
         m_labelNoGames.setVisible( true );
@@ -1814,8 +1814,8 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
             {
                 if( bMultiplayerAllowed )
                 {
-                    // 					m_CheckboxOnline.SetEnable(TRUE);
-                    // 					m_CheckboxPrivate.SetEnable(TRUE);
+                    // 					m_CheckboxOnline.SetEnable(true);
+                    // 					m_CheckboxPrivate.SetEnable(true);
                 }
                 else
                 {
@@ -1935,8 +1935,8 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
     loadingParams->lpParam = (LPVOID)param;
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-    completionData->bShowBackground=TRUE;
-    completionData->bShowLogo=TRUE;
+    completionData->bShowBackground=true;
+    completionData->bShowLogo=true;
     completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
     completionData->iPad = DEFAULT_XUI_MENU_USER;
     loadingParams->completionData = completionData;
@@ -2000,8 +2000,8 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
     loadingParams->lpParam = (LPVOID)param;
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-    completionData->bShowBackground=TRUE;
-    completionData->bShowLogo=TRUE;
+    completionData->bShowBackground=true;
+    completionData->bShowLogo=true;
     completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
     completionData->iPad = DEFAULT_XUI_MENU_USER;
     loadingParams->completionData = completionData;
@@ -2285,8 +2285,8 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer()
     loadingParams->lpParam = (LPVOID)this;
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-    completionData->bShowBackground=TRUE;
-    completionData->bShowLogo=TRUE;
+    completionData->bShowBackground=true;
+    completionData->bShowLogo=true;
     completionData->type = e_ProgressCompletion_NavigateBackToScene;
     completionData->iPad = DEFAULT_XUI_MENU_USER;
     loadingParams->completionData = completionData;
@@ -2807,8 +2807,8 @@ void UIScene_LoadOrJoinMenu::LaunchSaveUpload()
     loadingParams->lpParam = (LPVOID)this;
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-    completionData->bShowBackground=TRUE;
-    completionData->bShowLogo=TRUE;
+    completionData->bShowBackground=true;
+    completionData->bShowLogo=true;
     completionData->type = e_ProgressCompletion_NavigateBackToScene;
     completionData->iPad = DEFAULT_XUI_MENU_USER;
     loadingParams->completionData = completionData;
@@ -2985,11 +2985,11 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer()
     loadingParams->lpParam = (LPVOID)stateContainer;
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-    completionData->bShowBackground=TRUE;
-    completionData->bShowLogo=TRUE;
+    completionData->bShowBackground=true;
+    completionData->bShowLogo=true;
     completionData->type = e_ProgressCompletion_NavigateBackToScene;
     completionData->iPad = DEFAULT_XUI_MENU_USER;
-    completionData->bRequiresUserAction=TRUE;
+    completionData->bRequiresUserAction=true;
     loadingParams->completionData = completionData;
 
     loadingParams->cancelFunc=&UIScene_LoadOrJoinMenu::CancelSaveTransferCallback;
@@ -3383,8 +3383,8 @@ int UIScene_LoadOrJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStor
 		loadingParams->waitForThreadToDelete = true;
 
 		UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-		completionData->bShowBackground=TRUE;
-		completionData->bShowLogo=TRUE;
+		completionData->bShowBackground=true;
+		completionData->bShowLogo=true;
 		completionData->type = e_ProgressCompletion_NavigateBackToScene;
 		completionData->iPad = DEFAULT_XUI_MENU_USER;
 		loadingParams->completionData = completionData;

src/client/Common/UI/UIScene_MainMenu.cpp

@@ -181,7 +181,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack)
 #if TO_BE_IMPLEMENTED
 	// Fix for #45154 - Frontend: DLC: Content can only be downloaded from the frontend if you have not joined/exited multiplayer
 	XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
-	m_Timer.SetShow(FALSE);
+	m_Timer.SetShow(false);
 #endif
 	m_controlTimer.setVisible( false );
 
@@ -225,7 +225,7 @@ wstring UIScene_MainMenu::getMoviePath()
 
 void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	
 	if(m_bIgnorePress) return;
 
@@ -631,12 +631,12 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,
  			// We want to hide everything in this scene and display a timer until we get a completion for the TMS files
  			for(int i=0;i<BUTTONS_MAX;i++)
  			{
- 				pClass->m_Buttons[i].SetShow(FALSE);
+ 				pClass->m_Buttons[i].SetShow(false);
  			}
  
  			pClass->updateTooltips();
  
- 			pClass->m_Timer.SetShow(TRUE);
+ 			pClass->m_Timer.SetShow(true);
  		}
 #endif
 	}
@@ -769,7 +769,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
 								app.ApplyGameSettingsChanged(ProfileManager.GetPrimaryPad());
 								// check for DLC
 								// start timer to track DLC check finished
-								pClass->m_Timer.SetShow(TRUE);
+								pClass->m_Timer.SetShow(true);
 								XuiSetTimer(pClass->m_hObj,DLC_INSTALLED_TIMER_ID,DLC_INSTALLED_TIMER_TIME);
 								//app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_MultiGameJoinLoad);
 							}
@@ -784,12 +784,12 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
 							// We want to hide everything in this scene and display a timer until we get a completion for the TMS files
 							for(int i=0;i<BUTTONS_MAX;i++)
 							{
-								pClass->m_Buttons[i].SetShow(FALSE);
+								pClass->m_Buttons[i].SetShow(false);
 							}
 
 							updateTooltips();
 
-							pClass->m_Timer.SetShow(TRUE);
+							pClass->m_Timer.SetShow(true);
 						}
 #else
 						Minecraft *pMinecraft=Minecraft::GetInstance();
@@ -1404,7 +1404,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad)
 						app.ApplyGameSettingsChanged(iPad);
 						// check for DLC
 						// start timer to track DLC check finished
-						m_Timer.SetShow(TRUE);
+						m_Timer.SetShow(true);
 						XuiSetTimer(m_hObj,DLC_INSTALLED_TIMER_ID,DLC_INSTALLED_TIMER_TIME);
 						//app.NavigateToScene(iPad,eUIScene_MultiGameJoinLoad);
 					}
@@ -1419,12 +1419,12 @@ void UIScene_MainMenu::RunPlayGame(int iPad)
 					// We want to hide everything in this scene and display a timer until we get a completion for the TMS files
 					for(int i=0;i<BUTTONS_MAX;i++)
 					{
-						m_Buttons[i].SetShow(FALSE);
+						m_Buttons[i].SetShow(false);
 					}
 
 					updateTooltips();
 
-					m_Timer.SetShow(TRUE);
+					m_Timer.SetShow(true);
 				}
 #else
 				pMinecraft->user->name = convStringToWstring( ProfileManager.GetGamertag(ProfileManager.GetPrimaryPad()));
@@ -1680,7 +1680,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 					// We want to hide everything in this scene and display a timer until we get a completion for the TMS files
 // 					for(int i=0;i<BUTTONS_MAX;i++)
 // 					{
-// 						m_Buttons[i].SetShow(FALSE);
+// 						m_Buttons[i].SetShow(false);
 // 					}
 
 					updateTooltips();
@@ -1948,12 +1948,12 @@ void UIScene_MainMenu::RunHelpAndOptions(int iPad)
 			// We want to hide everything in this scene and display a timer until we get a completion for the TMS files
 			for(int i=0;i<BUTTONS_MAX;i++)
 			{
-				m_Buttons[i].SetShow(FALSE);
+				m_Buttons[i].SetShow(false);
 			}
 
 			updateTooltips();
 
-			m_Timer.SetShow(TRUE);
+			m_Timer.SetShow(true);
 		}
 #endif
 	}
@@ -2002,8 +2002,8 @@ void UIScene_MainMenu::LoadTrial(void)
 	loadingParams->lpParam = (LPVOID)param;
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-	completionData->bShowBackground=TRUE;
-	completionData->bShowLogo=TRUE;
+	completionData->bShowBackground=true;
+	completionData->bShowLogo=true;
 	completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
 	completionData->iPad = ProfileManager.GetPrimaryPad();
 	loadingParams->completionData = completionData;

src/client/Common/UI/UIScene_MessageBox.cpp

@@ -92,7 +92,7 @@ void UIScene_MessageBox::handleReload()
 
 void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 	switch(key)
 	{

src/client/Common/UI/UIScene_PauseMenu.cpp

@@ -94,7 +94,7 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 
 	if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)true);
 	}
 
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_PauseMenu, 0);
@@ -342,7 +342,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 		return;
 	}
 
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
 #ifdef _XBOX_ONE
@@ -367,7 +367,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 
 			if( iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 			{
-				app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+				app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)false);
 			}
 
 			ui.PlayUISFX(eSFX_Back);
@@ -402,7 +402,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 
 			StorageManager.SetSaveDevice(&UIScene_PauseMenu::DeviceSelectReturned,this,true);
 		}
-		rfHandled = TRUE;
+		rfHandled = true;
 		break;
 #endif
 
@@ -481,7 +481,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 				}
 				if(bCanScreenshot) app.SetAction(pInputData->UserIndex,eAppAction_SocialPost);
 			}
-			rfHandled = TRUE;
+			rfHandled = true;
 #endif
 #endif // __PS3__
 		}
@@ -495,7 +495,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 			uiIDA[1]=IDS_CONFIRM_OK;
 			ui.RequestMessageBox(IDS_ACTION_BAN_LEVEL_TITLE, IDS_ACTION_BAN_LEVEL_DESCRIPTION, uiIDA, 2, iPad,&UIScene_PauseMenu::BanGameDialogReturned,this, app.GetStringTable(), NULL, 0, false);
 
-			//rfHandled = TRUE;
+			//rfHandled = true;
 		}
 		break;
 #endif
@@ -511,7 +511,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 	case BUTTON_PAUSE_RESUMEGAME:
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)false);
 		}
 		navigateBack();
 		break;

src/client/Common/UI/UIScene_QuadrantSignin.cpp

@@ -103,7 +103,7 @@ void UIScene_QuadrantSignin::tick()
 
 void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	app.DebugPrintf("UIScene_QuadrantSignin handling input for pad %d, key %d, repeat- %s, pressed- %s, released- %s\n", iPad, key, repeat?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	app.DebugPrintf("UIScene_QuadrantSignin handling input for pad %d, key %d, repeat- %s, pressed- %s, released- %s\n", iPad, key, repeat?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	if(!m_bIgnoreInput)
 	{

src/client/Common/UI/UIScene_ReinstallMenu.cpp

@@ -56,7 +56,7 @@ void UIScene_ReinstallMenu::updateComponents()
 
 void UIScene_ReinstallMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 

src/client/Common/UI/UIScene_SettingsAudioMenu.cpp

@@ -64,7 +64,7 @@ void UIScene_SettingsAudioMenu::updateComponents()
 
 void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_SettingsMenu.cpp

@@ -85,7 +85,7 @@ void UIScene_SettingsMenu::updateComponents()
 
 void UIScene_SettingsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_SkinSelectMenu.cpp

@@ -204,7 +204,7 @@ void UIScene_SkinSelectMenu::handleAnimationEnd()
 void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if (m_bIgnoreInput) return;
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 
 	switch(key)
 	{
@@ -744,7 +744,7 @@ void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 
 void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 {
-	BOOL showPrevious = FALSE, showNext = FALSE;
+	BOOL showPrevious = false, showNext = false;
 	DWORD previousIndex = 0, nextIndex = 0;
 	wstring skinName = L"";
 	wstring skinOrigin = L"";
@@ -887,8 +887,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	m_characters[eCharacter_Current].SetTexture(m_selectedSkinPath, backupTexture);
 	m_characters[eCharacter_Current].SetCapeTexture(m_selectedCapePath);
 
-	showNext = TRUE;		
-	showPrevious = TRUE;
+	showNext = true;		
+	showPrevious = true;
 	nextIndex = getNextSkinIndex(m_skinIndex);
 	previousIndex = getPreviousSkinIndex(m_skinIndex);
 

src/client/Common/UI/UIScene_TeleportMenu.cpp

@@ -223,7 +223,7 @@ void UIScene_TeleportMenu::tick()
 
 void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_TradingMenu.cpp

@@ -128,7 +128,7 @@ void UIScene_TradingMenu::tick()
 
 void UIScene_TradingMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 
 	switch(key)

src/client/Common/UI/UIScene_TrialExitUpsell.cpp

@@ -21,7 +21,7 @@ void UIScene_TrialExitUpsell::updateTooltips()
 
 void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
+	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", pressed?"true":"false", released?"true":"false");
 	
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
 

src/client/Common/UI/UIStructs.h

@@ -165,10 +165,10 @@ typedef struct _UIFullscreenProgressCompletionData
 
 	_UIFullscreenProgressCompletionData()
 	{
-		bRequiresUserAction = FALSE;
-		bShowBackground = TRUE;
-		bShowLogo = TRUE;
-		bShowTips = TRUE;
+		bRequiresUserAction = false;
+		bShowBackground = true;
+		bShowLogo = true;
+		bShowTips = true;
 		type = e_ProgressCompletion_NoAction;
 	}
 } UIFullscreenProgressCompletionData;
@@ -266,11 +266,11 @@ typedef struct _LaunchMoreOptionsMenuInitData
 	_LaunchMoreOptionsMenuInitData()
 	{
 		memset(this,0,sizeof(_LaunchMoreOptionsMenuInitData));
-		bOnlineGame = TRUE;
-		bAllowFriendsOfFriends = TRUE;
-		bPVP = TRUE;
-		bFireSpreads = TRUE;
-		bTNT = TRUE;
+		bOnlineGame = true;
+		bAllowFriendsOfFriends = true;
+		bPVP = true;
+		bFireSpreads = true;
+		bTNT = true;
 		iPad = -1;
 		worldSize = 3;
 		seed = L"";

src/client/Common/UI/UITTFFont.cpp

@@ -30,7 +30,7 @@ UITTFFont::UITTFFont(const string &path, S32 fallbackCharacter)
 
 		pbData =  (PBYTE) new BYTE[dwFileSize];
 		BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
-		if(bSuccess==FALSE)
+		if(bSuccess==false)
 		{
 			app.FatalLoadError();
 		}

src/client/Common/XUI/XUI_ConnectingProgress.cpp

@@ -32,8 +32,8 @@ HRESULT CScene_ConnectingProgress::OnInit( XUIMessageInit* pInitData, BOOL& bHan
 		app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad,false);
 	}
 
-	CXuiSceneBase::ShowBackground( m_iPad, TRUE );
-	CXuiSceneBase::ShowLogo( m_iPad, TRUE );
+	CXuiSceneBase::ShowBackground( m_iPad, true );
+	CXuiSceneBase::ShowLogo( m_iPad, true );
 
 	m_showTooltips = param->showTooltips;
 	if( param->showTooltips )
@@ -99,7 +99,7 @@ HRESULT CScene_ConnectingProgress::OnKeyDown(XUIMessageInput* pInputData, BOOL&
 			// Cancel the join
 			Minecraft *pMinecraft = Minecraft::GetInstance();
 			pMinecraft->removeLocalPlayerIdx(m_iPad);
-			rfHandled = TRUE;
+			rfHandled = true;
 		}
 	}
 	return S_OK;
@@ -191,7 +191,7 @@ HRESULT CScene_ConnectingProgress::OnTimer( XUIMessageTimer *pTimer, BOOL& bHand
 
 		if( m_iPad != ProfileManager.GetPrimaryPad() && g_NetworkManager.IsInSession() )
 		{
-			m_buttonConfirm.SetShow(TRUE);
+			m_buttonConfirm.SetShow(true);
 			m_buttonConfirm.SetFocus(m_iPad);
 
 			// Set text
@@ -208,7 +208,7 @@ HRESULT CScene_ConnectingProgress::OnTimer( XUIMessageTimer *pTimer, BOOL& bHand
 			exitReasonStringId = -1;
 
 			//app.NavigateToHomeMenu();
-			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
+			app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)true);
 		}
 	}
 

src/client/Common/XUI/XUI_Control_ComboBox.cpp

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_Control_ComboBox.h"
-#include "..\Xbox_App.h"
+#include "Xbox_App.h"
 
 HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
 {
@@ -35,7 +35,7 @@ HRESULT CXuiControl4JComboBox::OnGetSourceDataText(XUIMessageGetSourceText *pGet
 	{
 		pGetSourceTextData->szText = 
 			m_ListData.pItems[pGetSourceTextData->iItem].pwszText;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	return S_OK;
 }
@@ -43,7 +43,7 @@ HRESULT CXuiControl4JComboBox::OnGetSourceDataText(XUIMessageGetSourceText *pGet
 HRESULT CXuiControl4JComboBox::OnGetItemCountAll(XUIMessageGetItemCount *pGetItemCountData,BOOL& bHandled)
 {
 	pGetItemCountData->cItems = m_ListData.nItems;
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 
@@ -64,7 +64,7 @@ HRESULT CXuiControl4JComboBox::OnGetSourceDataImage(XUIMessageGetSourceImage *pG
 	//		pGetSourceImageData->szPath = 
 	//			m_ListData.pItems[pGetSourceImageData->iItem].pwszImage;
 	//	}
-	//	bHandled = TRUE;
+	//	bHandled = true;
 	//}
 	//return S_OK;
 }
@@ -76,7 +76,7 @@ HRESULT CXuiControl4JComboBox::OnGetItemEnable(XUIMessageGetItemEnable *pGetItem
 		pGetItemEnableData->bEnabled = 
 			m_ListData.pItems[pGetItemEnableData->iItem].fEnabled;
 	}
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 
@@ -90,9 +90,9 @@ HRESULT CXuiControl4JComboBox::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPre
 	
 	if(hObjPressed==GetValueObject())
 	{
-		XuiElementSetShow(GetListObject(),TRUE);
+		XuiElementSetShow(GetListObject(),true);
 		XuiElementSetFocus(GetListObject());
-		rfHandled = TRUE;
+		rfHandled = true;
 	}
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_4JEdit.cpp

@@ -126,7 +126,7 @@ HRESULT CXuiCtrl4JEdit::OnChar(XUIMessageChar* pInputData, BOOL& rfHandled)
 	// Send the XM_CHAR message.
 	XuiSendMessage( hBaseObj, &xuiMsg );
 
- 	rfHandled = TRUE;
+ 	rfHandled = true;
  	SendNotifyValueChanged((int)pInputData->wch);
 
 	return hr;
@@ -151,7 +151,7 @@ HRESULT CXuiCtrl4JEdit::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 	if((((pInputData->dwKeyCode == VK_PAD_A) && (pInputData->wch == 0)) || (pInputData->dwKeyCode == VK_PAD_START)) && !(pInputData->dwFlags & XUI_INPUT_FLAG_REPEAT))
 	{
 		pThis->RequestKeyboard(pInputData->UserIndex);
-		rfHandled = TRUE;
+		rfHandled = true;
 	}
 
 	return hr;

src/client/Common/XUI/XUI_Ctrl_4JIcon.cpp

@@ -17,11 +17,11 @@ HRESULT CXuiCtrl4JIcon::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourc
 	if(m_hBrush)
 	{
 		pGetSourceImageData->hBrush	= m_hBrush;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	else
 	{
-		XuiMessageGetSourceImage(&Message, &MsgGetImage, pGetSourceImageData->iItem, pGetSourceImageData->iData, TRUE);
+		XuiMessageGetSourceImage(&Message, &MsgGetImage, pGetSourceImageData->iItem, pGetSourceImageData->iData, true);
 
 		hr = GetParent(&hObj);
 
@@ -32,7 +32,7 @@ HRESULT CXuiCtrl4JIcon::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourc
 			if (Message.bHandled)
 			{
 				pGetSourceImageData->hBrush	= MsgGetImage.hBrush;
-				bHandled = TRUE;
+				bHandled = true;
 			}
 		}
 	}

src/client/Common/XUI/XUI_Ctrl_4JList.cpp

@@ -309,7 +309,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceT
 		pGetSourceTextData->szText = 
 			GetData(pGetSourceTextData->iItem).pwszText;
 		LeaveCriticalSection(&m_AccessListData);
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	return S_OK;
 }
@@ -317,7 +317,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceT
 HRESULT CXuiCtrl4JList::OnGetItemCountAll(XUIMessageGetItemCount *pGetItemCountData,BOOL& bHandled)
 {
 	pGetItemCountData->cItems = (int)m_vListData.size();
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 
@@ -337,7 +337,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourc
 				GetData(pGetSourceImageData->iItem).pwszImage;
 		}
 		LeaveCriticalSection(&m_AccessListData);
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	return S_OK;
 }
@@ -351,7 +351,7 @@ HRESULT CXuiCtrl4JList::OnGetItemEnable(XUIMessageGetItemEnable *pGetItemEnableD
 			GetData(pGetItemEnableData->iItem).fEnabled;
 		LeaveCriticalSection(&m_AccessListData);
 	}
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 

src/client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp

@@ -40,17 +40,17 @@ HRESULT CXuiCtrlCraftIngredientSlot::OnCustomMessage_GetSlotItem(CustomMessage_G
 		pData->iDataBitField = 0;
 		pData->szPath = L"";
 	}
-	pData->bDirty = m_isDirty ? TRUE : FALSE;
+	pData->bDirty = m_isDirty ? true : false;
 	m_isDirty = false;
 
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 
 HRESULT CXuiCtrlCraftIngredientSlot::OnGetSourceText(XUIMessageGetSourceText *pGetSourceTextData,BOOL& bHandled)
 {	
 	pGetSourceTextData->szText=m_Desc;
-	bHandled = TRUE;
+	bHandled = true;
 	
 	return S_OK;
 }
@@ -118,6 +118,6 @@ void CXuiCtrlCraftIngredientSlot::SetDescription(LPCWSTR Desc)
 	hr=GetVisual(&hObj);
 	XuiElementGetChildById(hObj,L"text_name",&hObjChild);
 	XuiControlSetText(hObjChild,Desc);
-	XuiElementSetShow(hObjChild,Desc==NULL?FALSE:TRUE);
+	XuiElementSetShow(hObjChild,Desc==NULL?false:true);
 	m_Desc=Desc;
 }

src/client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h

@@ -15,8 +15,8 @@ public:
 	CXuiCtrlCraftIngredientSlot();
 	virtual ~CXuiCtrlCraftIngredientSlot() { };
 	void SetRedBox(BOOL bVal);
-	void SetIcon(int iPad, int iId,int iAuxVal, int iCount, int iScale, unsigned int uiAlpha, bool bDecorations, bool isFoil = false, BOOL bShow=TRUE);
-	void SetIcon(int iPad, shared_ptr<ItemInstance> item, int iScale, unsigned int uiAlpha,bool bDecorations, BOOL bShow=TRUE);
+	void SetIcon(int iPad, int iId,int iAuxVal, int iCount, int iScale, unsigned int uiAlpha, bool bDecorations, bool isFoil = false, BOOL bShow=true);
+	void SetIcon(int iPad, shared_ptr<ItemInstance> item, int iScale, unsigned int uiAlpha,bool bDecorations, BOOL bShow=true);
 	void SetDescription(LPCWSTR Desc);
 protected:
 

src/client/Common/XUI/XUI_Ctrl_EnchantButton.cpp

@@ -62,12 +62,12 @@ HRESULT CXuiCtrlEnchantmentButton::OnGetSourceDataText(XUIMessageGetSourceText *
 		if(cost > pMinecraft->localplayers[m_iPad]->experienceLevel && !pMinecraft->localplayers[m_iPad]->abilities.instabuild)
 		{
 			// Dark background
-			SetEnable(FALSE);
+			SetEnable(false);
 		}
 		else
 		{
 			// Light background and focus background
-			SetEnable(TRUE);
+			SetEnable(true);
 		}
 		m_costString = _toString<int>(cost);
 		m_lastCost = cost;
@@ -75,16 +75,16 @@ HRESULT CXuiCtrlEnchantmentButton::OnGetSourceDataText(XUIMessageGetSourceText *
 	if(cost == 0)
 	{
 		// Dark background
-		SetEnable(FALSE);
-		pGetSourceTextData->bDisplay = FALSE;
+		SetEnable(false);
+		pGetSourceTextData->bDisplay = false;
 	}
 	else
 	{		
 		pGetSourceTextData->szText = m_costString.c_str();
-		pGetSourceTextData->bDisplay = TRUE;
+		pGetSourceTextData->bDisplay = true;
 	}
 
-	bHandled = TRUE;
+	bHandled = true;
 
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp

@@ -23,7 +23,7 @@
 
 //-----------------------------------------------------------------------------
 CXuiCtrlEnchantmentBook::CXuiCtrlEnchantmentBook() :
-	m_bDirty(FALSE),
+	m_bDirty(false),
 	m_fScale(1.0f),
 	m_fAlpha(1.0f)
 {
@@ -192,7 +192,7 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
 
 	tickBook();
 
-	bHandled = TRUE;
+	bHandled = true;
 
 #endif
 	return S_OK;
@@ -298,7 +298,7 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
 //
 //	tickBook();
 //
-//	bHandled = TRUE;
+//	bHandled = true;
 //
 //	return S_OK;
 //}

src/client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp

@@ -158,7 +158,7 @@ HRESULT CXuiCtrlEnchantmentButtonText::OnRender(XUIMessageRender *pRenderData, B
 
 	XuiRenderRestoreState(hDC);
 
-	bHandled = TRUE;
+	bHandled = true;
 
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp

@@ -15,7 +15,7 @@
 
 //-----------------------------------------------------------------------------
 CXuiCtrlMinecraftPlayer::CXuiCtrlMinecraftPlayer() :
-	m_bDirty(FALSE),
+	m_bDirty(false),
 	m_fScale(1.0f),
 	m_fAlpha(1.0f)
 {
@@ -180,7 +180,7 @@ HRESULT CXuiCtrlMinecraftPlayer::OnRender(XUIMessageRender *pRenderData, BOOL &b
 
 	XuiRenderRestoreState(hDC);
 
-	bHandled = TRUE;
+	bHandled = true;
 #endif
 	return S_OK;
 

src/client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp

@@ -23,7 +23,7 @@
 
 //-----------------------------------------------------------------------------
 CXuiCtrlMinecraftSkinPreview::CXuiCtrlMinecraftSkinPreview() :
-	m_bDirty(FALSE),
+	m_bDirty(false),
 	m_fScale(1.0f),
 	m_fAlpha(1.0f)
 {
@@ -287,7 +287,7 @@ HRESULT CXuiCtrlMinecraftSkinPreview::OnRender(XUIMessageRender *pRenderData, BO
 
 	XuiRenderRestoreState(hDC);
 
-	bHandled = TRUE;
+	bHandled = true;
 
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp

@@ -41,7 +41,7 @@ LPCWSTR CXuiCtrlMinecraftSlot::xzpIcons[15]=
 //-----------------------------------------------------------------------------
 CXuiCtrlMinecraftSlot::CXuiCtrlMinecraftSlot() :
 	//m_hBrush(NULL),
-	m_bDirty(FALSE),
+	m_bDirty(false),
 		m_iPassThroughDataAssociation(0),
 		m_iPassThroughIdAssociation(0),
 		m_fScale(1.0f),
@@ -149,7 +149,7 @@ HRESULT CXuiCtrlMinecraftSlot::OnGetSourceImage(XUIMessageGetSourceImage* pData,
 			}
 
 
-			rfHandled = TRUE;
+			rfHandled = true;
 			return hr;
 		}
 		else
@@ -159,8 +159,8 @@ HRESULT CXuiCtrlMinecraftSlot::OnGetSourceImage(XUIMessageGetSourceImage* pData,
 	}
 
 	pData->bDirty = m_bDirty;
-	m_bDirty = FALSE;
-	rfHandled = TRUE;
+	m_bDirty = false;
+	rfHandled = true;
 	return S_OK;
 }
 
@@ -180,7 +180,7 @@ HRESULT CXuiCtrlMinecraftSlot::OnRender(XUIMessageRender *pRenderData, BOOL &bHa
 	XUIMessage Message;
 	XUIMessageGetSourceImage MsgGetImage;
 	HRESULT hr;
-	XuiMessageGetSourceImage(&Message, &MsgGetImage, m_iPassThroughIdAssociation, m_iPassThroughDataAssociation, FALSE);
+	XuiMessageGetSourceImage(&Message, &MsgGetImage, m_iPassThroughIdAssociation, m_iPassThroughDataAssociation, false);
 	hr = XuiSendMessage(m_hObj, &Message);
 
 	// We cannot have an Item with id 0
@@ -303,7 +303,7 @@ HRESULT CXuiCtrlMinecraftSlot::OnRender(XUIMessageRender *pRenderData, BOOL &bHa
 
 		XuiRenderRestoreState(hDC);
 
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	return S_OK;
 }
@@ -351,6 +351,6 @@ void CXuiCtrlMinecraftSlot::SetIcon(int iPad, shared_ptr<ItemInstance> item, int
 	m_fScale = (float)(iScale)/10.0f;
 	m_fAlpha =((float)(uiAlpha)) / 31;
 	m_bDecorations = bDecorations;
-	m_bDirty = TRUE;
+	m_bDirty = true;
 	XuiElementSetShow(m_hObj,bShow);
 }

src/client/Common/XUI/XUI_Ctrl_MinecraftSlot.h

@@ -23,7 +23,7 @@ public:
 	void renderGuiItem(Font *font, Textures *textures,ItemInstance *item, int x, int y);
 	void RenderItem();
 	void SetIcon(int iPad, int iId,int iAuxVal, int iCount, int iScale, unsigned int uiAlpha,bool bDecorations,BOOL bShow, bool isFoil);
-	void SetIcon(int iPad, shared_ptr<ItemInstance> item, int iScale, unsigned int uiAlpha,bool bDecorations, BOOL bShow=TRUE);
+	void SetIcon(int iPad, shared_ptr<ItemInstance> item, int iScale, unsigned int uiAlpha,bool bDecorations, BOOL bShow=true);
 
 protected:
 

src/client/Common/XUI/XUI_Ctrl_MobEffect.cpp

@@ -36,21 +36,21 @@ HRESULT CXuiCtrlMobEffect::OnGetSourceDataText(XUIMessageGetSourceText *pGetSour
 	if( pGetSourceTextData->iData == 1 )
 	{
 		pGetSourceTextData->szText = m_name.c_str();
-		pGetSourceTextData->bDisplay = TRUE;
+		pGetSourceTextData->bDisplay = true;
 
 		if(FAILED(PlayVisualRange(iconFrameNames[m_icon],NULL,iconFrameNames[m_icon])))
 		{
 			PlayVisualRange(L"Normal",NULL,L"Normal");
 		}
 
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	else if( pGetSourceTextData->iData == 2 )
 	{
 		pGetSourceTextData->szText = m_duration.c_str();
-		pGetSourceTextData->bDisplay = TRUE;
+		pGetSourceTextData->bDisplay = true;
 
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_PassThroughList.cpp

@@ -23,7 +23,7 @@ HRESULT CXuiCtrlPassThroughList::OnKeyDown(XUIMessageInput* pInputData, BOOL& bH
 
 		if (message.bHandled)
 		{
-			bHandled = TRUE;
+			bHandled = true;
 		}
 	}
 
@@ -50,7 +50,7 @@ HRESULT CXuiCtrlPassThroughList::OnGetSourceDataText(XUIMessageGetSourceText *pG
 		if (Message.bHandled)
 		{
 			pGetSourceTextData->szText = MsgGetText.szText;
-			bHandled = TRUE;
+			bHandled = true;
 		}
 	}
 	return S_OK;
@@ -76,7 +76,7 @@ HRESULT CXuiCtrlPassThroughList::OnGetSourceDataImage(XUIMessageGetSourceImage *
 		if (Message.bHandled)
 		{
 			pGetSourceImageData->szPath	= MsgGetImage.szPath;
-			bHandled = TRUE;
+			bHandled = true;
 		}
 	}
 	return S_OK;
@@ -101,9 +101,9 @@ HRESULT CXuiCtrlPassThroughList::OnGetItemCountAll(XUIMessageGetItemCount *pGetI
 		if (Message.bHandled)
 		{
 			pGetItemCountData->cItems = MsgGetItemCountAll.cItems;
-			bHandled = TRUE;
+			bHandled = true;
 		}
 	}
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp

@@ -14,9 +14,9 @@ HRESULT CXuiCtrlProgressCtrlBase::OnGetSourceDataText(XUIMessageGetSourceText *p
 	this->SetRange( min, max );
 
 	pGetSourceTextData->szText = L"";
-	pGetSourceTextData->bDisplay = FALSE;
+	pGetSourceTextData->bDisplay = false;
 
-	bHandled = TRUE;
+	bHandled = true;
 
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_SliderWrapper.cpp

@@ -20,7 +20,7 @@ HRESULT CXuiCtrlSliderWrapper::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 	m_bDisplayVal=true;
 	m_bPlaySound=false; // make this false to avoid a sound being played in the first setting of the slider value in a scene
 	XuiSetTimer( m_hObj,NO_SOUND_TIMER,50);
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 
@@ -43,7 +43,7 @@ HRESULT CXuiCtrlSliderWrapper::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
 // 			m_pSlider->SetFocus(pInputData->UserIndex);
 // 			m_sliderActive = true;
 // 		}
-// 		rfHandled = TRUE;
+// 		rfHandled = true;
 // 
 // 		break;
 // 	default:
@@ -80,7 +80,7 @@ HRESULT CXuiCtrlSliderWrapper::OnNotifyValueChanged (HXUIOBJ hObjSource, XUINoti
 	if (HRESULT_SUCCEEDED(hr))
 	{
 		hr = XuiBubbleMessage(hObj, &Message);
-		rfHandled = TRUE;
+		rfHandled = true;
 	}
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp

@@ -72,7 +72,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnCustomMessage_GetSlotItem(HXUIOBJ hObj, Cust
 		pData->szPath = L"";
 	}
 
-	bHandled = TRUE;
+	bHandled = true;
 
 	return S_OK;
 }
@@ -230,7 +230,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnKeyDown(HXUIOBJ hObj, XUIMessageInput *pInpu
 
 			if (message.bHandled)
 			{
-				bHandled = TRUE;
+				bHandled = true;
 			}
 		}
 	}
@@ -244,8 +244,8 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnControlNavigate( HXUIOBJ hObj, XUIMessageCon
 	// Skip default navigation behaviour when navigation is by pointer.
 	if ( m_bSkipDefaultNavigation )
 	{
-		pControlNavigateData->bSkipNavigate = TRUE;
-		bHandled = TRUE;
+		pControlNavigateData->bSkipNavigate = true;
+		bHandled = true;
 	}
 	return S_OK;
 }

src/client/Common/XUI/XUI_Ctrl_SlotList.cpp

@@ -46,7 +46,7 @@ HRESULT CXuiCtrlSlotList::OnKeyDown(XUIMessageInput *pInputData, BOOL& bHandled)
 
 			if (message.bHandled)
 			{
-				bHandled = TRUE;
+				bHandled = true;
 			}
 		}
 	}
@@ -112,7 +112,7 @@ HRESULT CXuiCtrlSlotList::OnGetItemCountAll( XUIMessageGetItemCount *pGetItemCou
 	// We don't need to look at the type of request. The message map
 	// has already filtered out a request to retrieve all items.
 	pGetItemCountData->cItems = slotCount;
-	bHandled = TRUE;
+	bHandled = true;
 
 	return( S_OK );
 }
@@ -122,7 +122,7 @@ HRESULT CXuiCtrlSlotList::OnGetItemCountMaxLines( XUIMessageGetItemCount *pGetIt
 	// We don't need to look at the type of request. The message map
 	// has already filtered out a request to retrieve max lines.
 	pGetItemCountData->cItems = rows;
-	bHandled = TRUE;
+	bHandled = true;
 
 	return( S_OK );
 }
@@ -132,7 +132,7 @@ HRESULT CXuiCtrlSlotList::OnGetItemCountMaxPerLine( XUIMessageGetItemCount *pGet
 	// We don't need to look at the type of request. The message map
 	// has already filtered out a request to retrieve max per line.
 	pGetItemCountData->cItems = columns;
-	bHandled = TRUE;
+	bHandled = true;
 
 	return( S_OK );
 }

src/client/Common/XUI/XUI_Ctrl_SplashPulser.cpp

@@ -13,7 +13,7 @@
 
 //-----------------------------------------------------------------------------
 CXuiCtrlSplashPulser::CXuiCtrlSplashPulser() :
-	m_bDirty(FALSE),
+	m_bDirty(false),
 	m_fScale(1.0f),
 	m_fAlpha(1.0f)
 {
@@ -85,7 +85,7 @@ HRESULT CXuiCtrlSplashPulser::OnRender(XUIMessageRender *pRenderData, BOOL &bHan
 
 	XuiRenderRestoreState(hDC);
 
-	bHandled = TRUE;
+	bHandled = true;
 #endif
 	return S_OK;
 }

src/client/Common/XUI/XUI_DLCOffers.cpp

@@ -34,7 +34,7 @@ HRESULT CScene_DLCMain::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	//if(app.GetTMSDLCInfoRead())
 	{
-		m_Timer.SetShow(FALSE);
+		m_Timer.SetShow(false);
 		m_bIgnoreInput=false;
 
 		VOID *pObj;
@@ -48,27 +48,27 @@ HRESULT CScene_DLCMain::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 		m_bAllDLCContentRetrieved=false;
 		pListInfo[e_DLC_SkinPack].pwszText = app.GetString(IDS_DLC_MENU_SKINPACKS);
-		pListInfo[e_DLC_SkinPack].fEnabled=TRUE;
+		pListInfo[e_DLC_SkinPack].fEnabled=true;
 		list->AddData(pListInfo[e_DLC_SkinPack]);
 
 		pListInfo[e_DLC_TexturePacks].pwszText = app.GetString(IDS_DLC_MENU_TEXTUREPACKS);
-		pListInfo[e_DLC_TexturePacks].fEnabled=TRUE;
+		pListInfo[e_DLC_TexturePacks].fEnabled=true;
 		list->AddData(pListInfo[e_DLC_TexturePacks]);
 
 		pListInfo[e_DLC_MashupPacks].pwszText = app.GetString(IDS_DLC_MENU_MASHUPPACKS);
-		pListInfo[e_DLC_MashupPacks].fEnabled=TRUE;
+		pListInfo[e_DLC_MashupPacks].fEnabled=true;
 		list->AddData(pListInfo[e_DLC_MashupPacks]);
 
 		pListInfo[e_DLC_Themes].pwszText = app.GetString(IDS_DLC_MENU_THEMES);
-		pListInfo[e_DLC_Themes].fEnabled=TRUE;
+		pListInfo[e_DLC_Themes].fEnabled=true;
 		list->AddData(pListInfo[e_DLC_Themes]);
 
 		pListInfo[e_DLC_AvatarItems].pwszText = app.GetString(IDS_DLC_MENU_AVATARITEMS);
-		pListInfo[e_DLC_AvatarItems].fEnabled=TRUE;
+		pListInfo[e_DLC_AvatarItems].fEnabled=true;
 		list->AddData(pListInfo[e_DLC_AvatarItems]);
 
 		pListInfo[e_DLC_Gamerpics].pwszText = app.GetString(IDS_DLC_MENU_GAMERPICS);
-		pListInfo[e_DLC_Gamerpics].fEnabled=TRUE;
+		pListInfo[e_DLC_Gamerpics].fEnabled=true;
 		list->AddData(pListInfo[e_DLC_Gamerpics]);
 
 		app.AddDLCRequest(e_Marketplace_Content); // content is skin packs, texture packs and mash-up packs
@@ -85,7 +85,7 @@ HRESULT CScene_DLCMain::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 		app.AddTMSPPFileTypeRequest(e_DLC_MashupPacks);
 	}
 
-	XuiElementInitUserFocus(xList, ProfileManager.GetPrimaryPad(), TRUE);
+	XuiElementInitUserFocus(xList, ProfileManager.GetPrimaryPad(), true);
 	TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0); // 4J JEV ?
 
 	return S_OK;
@@ -137,9 +137,9 @@ HRESULT CScene_DLCMain::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 		// set the timer running to navigate back when any tms retrieval has come in
 		XuiSetTimer(m_hObj,TIMER_ID_NAVIGATE_BACK,50);
 		m_bIgnoreInput=true;
-		m_Timer.SetShow(TRUE);
+		m_Timer.SetShow(true);
 		//app.NavigateBack(XUSER_INDEX_ANY);
-		rfHandled = TRUE;
+		rfHandled = true;
 
 		break;
 	}
@@ -229,12 +229,12 @@ HRESULT CScene_DLCOffers::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	m_pOffersList = (CXuiCtrl4JList *)pObj;
 	m_bAllDLCContentRetrieved=false;
 
-	XuiElementInitUserFocus(m_hObj,ProfileManager.GetPrimaryPad(),TRUE);
+	XuiElementInitUserFocus(m_hObj,ProfileManager.GetPrimaryPad(),true);
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_DLCOffersMenu, 0);
 	ui.SetTooltips( DEFAULT_XUI_MENU_USER, -1,IDS_TOOLTIPS_BACK);
 
 	// Disable the price tag display
-	m_PriceTag.SetShow(FALSE);
+	m_PriceTag.SetShow(false);
 
 	// If we don't yet have this DLC, we need to display a timer
 	m_bDLCRequiredIsRetrieved=false;
@@ -391,7 +391,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 					break;
 				}
 
-				pListInfo[iCount].fEnabled=TRUE;
+				pListInfo[iCount].fEnabled=true;
 
 				// store the offer index
 				pListInfo[iCount].iData=i;
@@ -438,7 +438,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 	}
 
 	// turn off the timer display
-	m_Timer.SetShow(FALSE);
+	m_Timer.SetShow(false);
 	if(iCount!=0)
 	{	
 		// get the right index for the first list item - it will have been re-sorted internally in the list
@@ -498,16 +498,16 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 		wstrTemp = formatting + wstrTemp;
 
 		m_SellText.SetText(wstrTemp.c_str());
-		m_SellText.SetShow(TRUE);
+		m_SellText.SetShow(true);
 
 		// set the price info	
-		m_PriceTag.SetShow(TRUE);
+		m_PriceTag.SetShow(true);
 // 		swprintf(formatting, 40, L"%d",xOffer.dwPointsPrice);
 // 		wstrTemp=wstring(formatting);
 // 		m_PriceTag.SetText(wstrTemp.c_str());
 		m_PriceTag.SetText(xOffer.wszCurrencyPrice);
 
-		XuiElementSetShow(m_List,TRUE);
+		XuiElementSetShow(m_List,true);
 		XuiElementSetFocus(m_List);
 
 		UpdateTooltips(xOffer);
@@ -522,7 +522,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 		wstrTemp = formatting + wstrTemp;
 
 		m_SellText.SetText(wstrTemp.c_str());
-		m_SellText.SetShow(TRUE);		
+		m_SellText.SetShow(true);		
 	}
 	return S_OK;
 }
@@ -590,7 +590,7 @@ HRESULT CScene_DLCOffers::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled
 	case VK_PAD_B:
 	case VK_ESCAPE:
 		app.NavigateBack(XUSER_INDEX_ANY);
-		rfHandled = TRUE;
+		rfHandled = true;
 
 		break;
 
@@ -651,7 +651,7 @@ HRESULT CScene_DLCOffers::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSou
 	{
 		pGetSourceImageData->hBrush = m_hXuiBrush;	
 
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	return S_OK;
 }
@@ -688,7 +688,7 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha
 		m_SellText.SetText(wstrTemp.c_str());
 
 		// set the price info	
- 		m_PriceTag.SetShow(TRUE);
+ 		m_PriceTag.SetShow(true);
 // 		swprintf(formatting, 40, L"%d",xOffer.dwPointsPrice);
 // 		wstrTemp=wstring(formatting);
 // 		m_PriceTag.SetText(wstrTemp.c_str());
@@ -879,7 +879,7 @@ HRESULT CScene_DLCOffers::OnCustomMessage_DLCInstalled()
 		break;
 	}
 
-	m_Timer.SetShow(TRUE);
+	m_Timer.SetShow(true);
 	m_bDLCRequiredIsRetrieved=false;
 
 	return S_OK;

src/client/Common/XUI/XUI_Death.cpp

@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_Death.h"
+#include "XUI/XUI_Death.h"
 #include <assert.h>
 #include "AABB.h"
 #include "Vec3.h"
@@ -66,7 +66,7 @@ HRESULT CScene_Death::OnNotifySelChanged( HXUIOBJ hObjSource, XUINotifySelChange
 
 
 
-		bHandled = TRUE;
+		bHandled = true;
 	}
 
 	return S_OK;
@@ -202,7 +202,7 @@ HRESULT CScene_Death::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled)
 		// 4J Stu - No back out, must choose
 		//app.CloseXuiScenes();
 
-		rfHandled = TRUE;
+		rfHandled = true;
 
 		break;
 	}

src/client/Common/XUI/XUI_DebugItemEditor.cpp

@@ -65,7 +65,7 @@ HRESULT CScene_DebugItemEditor::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfH
 		// kill the crafting xui
 		app.NavigateBack(m_iPad);
 
-		rfHandled = TRUE;
+		rfHandled = true;
 
 		break;
 

src/client/Common/XUI/XUI_DebugOverlay.cpp

@@ -106,7 +106,7 @@ HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
 
 	XuiSetTimer(m_hObj,0,DEBUG_OVERLAY_UPDATE_TIME_PERIOD);
 
-	bHandled = TRUE;
+	bHandled = true;
 	return S_OK;
 }
 
@@ -223,7 +223,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 		conn->send( TimeCommand::preparePacket(true) );
 	}
 
-    rfHandled = TRUE;
+    rfHandled = true;
     return S_OK;
 }
 
@@ -242,7 +242,7 @@ HRESULT CScene_DebugOverlay::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHand
 		// kill the crafting xui
 		app.EnableDebugOverlay(false,pInputData->UserIndex);
 
-		rfHandled = TRUE;
+		rfHandled = true;
 
 		break;
 

src/client/Common/XUI/XUI_DebugSchematicCreator.cpp

@@ -79,7 +79,7 @@ HRESULT CScene_DebugSchematicCreator::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINo
 		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, (void *)m_data);
 		
 		NavigateBack();
-		rfHandled = TRUE;
+		rfHandled = true;
 	}
 	return S_OK;
 }
@@ -96,7 +96,7 @@ HRESULT CScene_DebugSchematicCreator::OnKeyDown(XUIMessageInput* pInputData, BOO
 	case VK_PAD_BACK:
 		NavigateBack();
 
-		rfHandled = TRUE;
+		rfHandled = true;
 
 		break;
 

src/client/Common/XUI/XUI_DebugSchematicCreator.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_debug_schematic_create.h"
+#include "Media/xuiscene_debug_schematic_create.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "Common\GameRules\ConsoleSchematicFile.h"
 

src/client/Common/XUI/XUI_DebugSetCamera.cpp

@@ -71,13 +71,13 @@ HRESULT CScene_DebugSetCamera::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPre
 		app.SetXuiServerAction(	ProfileManager.GetPrimaryPad(),
 								eXuiServerAction_SetCameraLocation, 
 								(void *)currentPosition);
-		rfHandled = TRUE;
+		rfHandled = true;
 	}
 	else if (hObjPressed == m_lockPlayer)
 	{
 		app.SetFreezePlayers( m_lockPlayer.IsChecked() );
 
-		rfHandled = TRUE;
+		rfHandled = true;
 	}
 
 	return S_OK;
@@ -96,7 +96,7 @@ HRESULT CScene_DebugSetCamera::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
 		//delete currentPosition;
 		//currentPosition = NULL;
 
-		rfHandled = TRUE;
+		rfHandled = true;
 		break;
 	}
 	return S_OK;
@@ -112,7 +112,7 @@ HRESULT CScene_DebugSetCamera::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINoti
 		wstring value = m_camX.GetText();
 		if(!value.empty()) iVal = _fromString<double>( value );
 		currentPosition->m_camX = iVal;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	else if (hObjSource == m_camY)
 	{
@@ -120,7 +120,7 @@ HRESULT CScene_DebugSetCamera::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINoti
 		wstring value = m_camY.GetText();
 		if(!value.empty()) iVal = _fromString<double>( value );
 		currentPosition->m_camY = iVal - 1.62;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	else if (hObjSource == m_camZ)
 	{
@@ -128,7 +128,7 @@ HRESULT CScene_DebugSetCamera::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINoti
 		wstring value = m_camZ.GetText();
 		if(!value.empty()) iVal = _fromString<double>( value );
 		currentPosition->m_camZ = iVal;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	else if (hObjSource == m_yRot)
 	{
@@ -136,7 +136,7 @@ HRESULT CScene_DebugSetCamera::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINoti
 		wstring value = m_yRot.GetText();
 		if(!value.empty()) iVal = _fromString<double>( value );
 		currentPosition->m_yRot = iVal;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 	else if (hObjSource == m_elevation)
 	{
@@ -144,7 +144,7 @@ HRESULT CScene_DebugSetCamera::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINoti
 		wstring value = m_elevation.GetText();
 		if(!value.empty()) iVal = _fromString<double>( value );
 		currentPosition->m_elev = iVal;
-		bHandled = TRUE;
+		bHandled = true;
 	}
 
 	return S_OK;

src/client/Common/XUI/XUI_DebugSetCamera.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_debug_set_camera.h"
+#include "Media/xuiscene_debug_set_camera.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "Common\GameRules\ConsoleSchematicFile.h"