replace paths & windows apis, cleanup source tree
This commit is contained in:
murdle
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user