From 3f8374bc4572d270acee316766b57869913e6fe0 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Wed, 11 Mar 2026 01:38:52 +1100 Subject: [PATCH] Use standard skin IDs in common app helpers --- .../Platform/Common/Consoles_App.cpp | 32 +++++++++---------- .../Platform/Common/Consoles_App.h | 26 +++++++-------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 4809fdc12..bf55778fa 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -1394,7 +1394,7 @@ std::uint32_t CMinecraftApp::GetPlayerSkinId(int iPad) return dwSkin; } - DWORD CMinecraftApp::GetAdditionalModelParts(int iPad) + std::uint32_t CMinecraftApp::GetAdditionalModelParts(int iPad) { return m_dwAdditionalModelParts[iPad]; } @@ -8598,7 +8598,7 @@ bool CMinecraftApp::DLCContentRetrieved(eDLCMarketplaceType eType) return false; } -void CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, SKIN_BOX *SkinBoxA, DWORD dwSkinBoxC) +void CMinecraftApp::SetAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX *SkinBoxA, unsigned int dwSkinBoxC) { EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_PLAYER); Model *pModel = renderer->getModel(); @@ -8622,15 +8622,15 @@ void CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, SKIN_BOX *SkinBoxA, D } - m_AdditionalModelParts.insert( std::pair *>(dwSkinID, pvModelPart) ); - m_AdditionalSkinBoxes.insert( std::pair *>(dwSkinID, pvSkinBoxes) ); + m_AdditionalModelParts.insert( std::pair *>(dwSkinID, pvModelPart) ); + m_AdditionalSkinBoxes.insert( std::pair *>(dwSkinID, pvSkinBoxes) ); LeaveCriticalSection( &csAdditionalSkinBoxes ); LeaveCriticalSection( &csAdditionalModelParts ); } -std::vector * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, std::vector *pvSkinBoxA) +std::vector * CMinecraftApp::SetAdditionalSkinBoxes(std::uint32_t dwSkinID, std::vector *pvSkinBoxA) { EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_PLAYER); Model *pModel = renderer->getModel(); @@ -8650,8 +8650,8 @@ std::vector * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, } } - m_AdditionalModelParts.insert( std::pair *>(dwSkinID, pvModelPart) ); - m_AdditionalSkinBoxes.insert( std::pair *>(dwSkinID, pvSkinBoxA) ); + m_AdditionalModelParts.insert( std::pair *>(dwSkinID, pvModelPart) ); + m_AdditionalSkinBoxes.insert( std::pair *>(dwSkinID, pvSkinBoxA) ); LeaveCriticalSection( &csAdditionalSkinBoxes ); LeaveCriticalSection( &csAdditionalModelParts ); @@ -8659,7 +8659,7 @@ std::vector * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, } -std::vector *CMinecraftApp::GetAdditionalModelParts(DWORD dwSkinID) +std::vector *CMinecraftApp::GetAdditionalModelParts(std::uint32_t dwSkinID) { EnterCriticalSection( &csAdditionalModelParts ); std::vector *pvModelParts=NULL; @@ -8676,7 +8676,7 @@ std::vector *CMinecraftApp::GetAdditionalModelParts(DWORD dwSkinID) return pvModelParts; } -std::vector *CMinecraftApp::GetAdditionalSkinBoxes(DWORD dwSkinID) +std::vector *CMinecraftApp::GetAdditionalSkinBoxes(std::uint32_t dwSkinID) { EnterCriticalSection( &csAdditionalSkinBoxes ); std::vector *pvSkinBoxes=NULL; @@ -8693,7 +8693,7 @@ std::vector *CMinecraftApp::GetAdditionalSkinBoxes(DWORD dwSkinID) return pvSkinBoxes; } -unsigned int CMinecraftApp::GetAnimOverrideBitmask(DWORD dwSkinID) +unsigned int CMinecraftApp::GetAnimOverrideBitmask(std::uint32_t dwSkinID) { EnterCriticalSection( &csAnimOverrideBitmask ); unsigned int uiAnimOverrideBitmask=0L; @@ -8711,7 +8711,7 @@ unsigned int CMinecraftApp::GetAnimOverrideBitmask(DWORD dwSkinID) return uiAnimOverrideBitmask; } -void CMinecraftApp::SetAnimOverrideBitmask(DWORD dwSkinID,unsigned int uiAnimOverrideBitmask) +void CMinecraftApp::SetAnimOverrideBitmask(std::uint32_t dwSkinID,unsigned int uiAnimOverrideBitmask) { // Make thread safe EnterCriticalSection( &csAnimOverrideBitmask ); @@ -8725,11 +8725,11 @@ void CMinecraftApp::SetAnimOverrideBitmask(DWORD dwSkinID,unsigned int uiAnimOve return; // already in here } } - m_AnimOverrides.insert( std::pair(dwSkinID, uiAnimOverrideBitmask) ); + m_AnimOverrides.insert( std::pair(dwSkinID, uiAnimOverrideBitmask) ); LeaveCriticalSection( &csAnimOverrideBitmask ); } -DWORD CMinecraftApp::getSkinIdFromPath(const std::wstring &skin) +std::uint32_t CMinecraftApp::getSkinIdFromPath(const std::wstring &skin) { bool dlcSkin = false; unsigned int skinId = 0; @@ -8755,7 +8755,7 @@ DWORD CMinecraftApp::getSkinIdFromPath(const std::wstring &skin) return skinId; } -std::wstring CMinecraftApp::getSkinPathFromId(DWORD skinId) +std::wstring CMinecraftApp::getSkinPathFromId(std::uint32_t skinId) { // 4J Stu - This function maps the encoded DWORD we store in the player profile // to a filename that is stored as a memory texture and shared between systems in game @@ -8768,8 +8768,8 @@ std::wstring CMinecraftApp::getSkinPathFromId(DWORD skinId) } else { - DWORD ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(skinId); - DWORD defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(skinId); + std::uint32_t ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(skinId); + std::uint32_t defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(skinId); if( ugcSkinIndex == 0 ) { swprintf(chars, 256, L"defskin%08X.png",defaultSkinIndex); diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index f6f3fd88b..9d205621b 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -264,7 +264,7 @@ public: std::uint32_t GetPlayerSkinId(int iPad); std::wstring GetPlayerCapeName(int iPad); std::uint32_t GetPlayerCapeId(int iPad); - DWORD GetAdditionalModelParts(int iPad); + std::uint32_t GetAdditionalModelParts(int iPad); void CheckGameSettingsChanged(bool bOverride5MinuteTimer=false, int iPad=XUSER_INDEX_ANY); void ApplyGameSettingsChanged(int iPad); void ClearGameSettingsChangedFlag(int iPad); @@ -804,7 +804,7 @@ private: CRITICAL_SECTION csAnimOverrideBitmask; bool m_bCorruptSaveDeleted; - DWORD m_dwAdditionalModelParts[XUSER_MAX_COUNT]; + std::uint32_t m_dwAdditionalModelParts[XUSER_MAX_COUNT]; BYTE *m_pBannedListFileBuffer; DWORD m_dwBannedListFileSize; @@ -818,15 +818,15 @@ public: // static int CallbackBannedListFileFromTMS(LPVOID lpParam, WCHAR *wchFilename, int iPad, bool bResult, int iAction); // Storing additional model parts per skin texture - void SetAdditionalSkinBoxes(DWORD dwSkinID, SKIN_BOX *SkinBoxA, DWORD dwSkinBoxC); - std::vector * SetAdditionalSkinBoxes(DWORD dwSkinID, std::vector *pvSkinBoxA); - std::vector *GetAdditionalModelParts(DWORD dwSkinID); - std::vector *GetAdditionalSkinBoxes(DWORD dwSkinID); - void SetAnimOverrideBitmask(DWORD dwSkinID,unsigned int uiAnimOverrideBitmask); - unsigned int GetAnimOverrideBitmask(DWORD dwSkinID); + void SetAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX *SkinBoxA, unsigned int dwSkinBoxC); + std::vector * SetAdditionalSkinBoxes(std::uint32_t dwSkinID, std::vector *pvSkinBoxA); + std::vector *GetAdditionalModelParts(std::uint32_t dwSkinID); + std::vector *GetAdditionalSkinBoxes(std::uint32_t dwSkinID); + void SetAnimOverrideBitmask(std::uint32_t dwSkinID,unsigned int uiAnimOverrideBitmask); + unsigned int GetAnimOverrideBitmask(std::uint32_t dwSkinID); - static DWORD getSkinIdFromPath(const std::wstring &skin); - static std::wstring getSkinPathFromId(DWORD skinId); + static std::uint32_t getSkinIdFromPath(const std::wstring &skin); + static std::wstring getSkinPathFromId(std::uint32_t skinId); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile)=0; virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)=0; @@ -850,9 +850,9 @@ public: private: // vector of additional skin model parts, indexed by the skin texture id - std::unordered_map *> m_AdditionalModelParts; - std::unordered_map *> m_AdditionalSkinBoxes; - std::unordered_map m_AnimOverrides; + std::unordered_map *> m_AdditionalModelParts; + std::unordered_map *> m_AdditionalSkinBoxes; + std::unordered_map m_AnimOverrides; bool m_bResetNether;