diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index db437755..e14ed156 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -1784,8 +1784,8 @@ void ClientConnection::handlePreLogin(shared_ptr packet) app.SetGameHostOption(eGameHostOption_All,packet->m_serverSettings); // 4J-PB - if we go straight in from the menus via an invite, we won't have the DLC info - //str1k3r - TMS only exists on Xbox platforms therefore, we only need this on Xbox platforms. -#if defined(_DURANGO) || defined(_XBOX) + //str1k3r - TMS only exists on Xbox 360 therefore, we only need this on Xbox 360. +#ifdef _XBOX if(app.GetTMSGlobalFileListRead()==false) { app.SetTMSAction(ProfileManager.GetPrimaryPad(),eTMSAction_TMSPP_RetrieveFiles_RunPlayGame); diff --git a/Minecraft.Client/Durango/Durango_App.cpp b/Minecraft.Client/Durango/Durango_App.cpp index e4d6599a..916bffd3 100644 --- a/Minecraft.Client/Durango/Durango_App.cpp +++ b/Minecraft.Client/Durango/Durango_App.cpp @@ -146,27 +146,6 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) } -int CConsoleMinecraftApp::GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT) -{ - return -1; -} - - -int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile) -{ - return -1; -} - -int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt) -{ - return -1; -} - -void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType) -{ - -} - int CConsoleMinecraftApp::LoadLocalDLCImages() { unordered_map *pDLCInfoA=app.GetDLCInfo(); diff --git a/Minecraft.Client/Durango/Durango_App.h b/Minecraft.Client/Durango/Durango_App.h index e27a3b23..906b0235 100644 --- a/Minecraft.Client/Durango/Durango_App.h +++ b/Minecraft.Client/Durango/Durango_App.h @@ -27,15 +27,10 @@ public: virtual void ReleaseSaveThumbnail(); virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); - virtual int LoadLocalTMSFile(WCHAR *wchTMSFile); - virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt); int LoadLocalDLCImage(WCHAR *wchName,PBYTE *ppbImageData,DWORD *pdwBytes); int LoadLocalDLCImages(); void FreeLocalDLCImages(); - virtual void FreeLocalTMSFiles(eTMSFileType eType); - virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT=eFileExtensionType_PNG); - // BANNED LEVEL LIST virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {}