From 7ae8c7c373abee82ac774983f4ae824077562ab8 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Wed, 11 Mar 2026 02:02:12 +1100 Subject: [PATCH] Use standard TMSPP buffers in common app --- Minecraft.Client/Platform/Common/Consoles_App.cpp | 4 ++-- Minecraft.Client/Platform/Common/Consoles_App.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 83e9c0906..7198569d0 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -8313,7 +8313,7 @@ int CMinecraftApp::TMSPPFileReturned(void *pParam,int iPad,int iUserData,C4JStor case e_DLC_TexturePackData: { // 4J-PB - we need to allocate memory for the file data and copy into it, since the current data is a reference into the blob download memory - PBYTE pbData = new BYTE [pFileData->dwSize]; + std::uint8_t *pbData = new std::uint8_t[pFileData->dwSize]; memcpy(pbData,pFileData->pbData,pFileData->dwSize); pClass->m_vTMSPPData.push_back(pbData); @@ -8328,7 +8328,7 @@ int CMinecraftApp::TMSPPFileReturned(void *pParam,int iPad,int iUserData,C4JStor if(pFileData->pbData[0]==0x89) { // 4J-PB - we need to allocate memory for the file data and copy into it, since the current data is a reference into the blob download memory - PBYTE pbData = new BYTE [pFileData->dwSize]; + std::uint8_t *pbData = new std::uint8_t[pFileData->dwSize]; memcpy(pbData,pFileData->pbData,pFileData->dwSize); pClass->m_vTMSPPData.push_back(pbData); diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index a634f2c52..9503384e3 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -369,9 +369,9 @@ public: private: PlayerUID m_xuidNotch; #ifdef _DURANGO - std::unordered_map m_GTS_Files; + std::unordered_map m_GTS_Files; #else - std::unordered_map m_GTS_Files; + std::unordered_map m_GTS_Files; #endif // for storing memory textures - player skin @@ -858,7 +858,7 @@ private: bool m_bResetNether; std::uint32_t m_dwRequiredTexturePackID; #ifdef _XBOX_ONE - std::vector m_vTMSPPData; + std::vector m_vTMSPPData; #endif #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)