From a1fdebbc3b31469ffafe5210fea506ceef14671d Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Wed, 11 Mar 2026 03:17:18 +1100 Subject: [PATCH] Use standard skin locals in player code --- Minecraft.Client/Network/PlayerConnection.cpp | 2 +- Minecraft.World/Player/Player.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Minecraft.Client/Network/PlayerConnection.cpp b/Minecraft.Client/Network/PlayerConnection.cpp index 1a4d8721e..b5b494e81 100644 --- a/Minecraft.Client/Network/PlayerConnection.cpp +++ b/Minecraft.Client/Network/PlayerConnection.cpp @@ -932,7 +932,7 @@ void PlayerConnection::handleTextureAndGeometryReceived(const std::wstring &text else { // get the data from the app - DWORD dwSkinID = app.getSkinIdFromPath(textureName); + std::uint32_t dwSkinID = app.getSkinIdFromPath(textureName); std::vector *pvSkinBoxes = app.GetAdditionalSkinBoxes(dwSkinID); unsigned int uiAnimOverrideBitmask= app.GetAnimOverrideBitmask(dwSkinID); diff --git a/Minecraft.World/Player/Player.cpp b/Minecraft.World/Player/Player.cpp index 5a1361d04..82f706430 100644 --- a/Minecraft.World/Player/Player.cpp +++ b/Minecraft.World/Player/Player.cpp @@ -666,8 +666,8 @@ void Player::setCustomSkin(std::uint32_t skinId) if(pDLCSkinFile!=NULL) { - DWORD dwBoxC=pDLCSkinFile->getAdditionalBoxesCount(); - if(dwBoxC!=0) + const int additionalBoxCount = pDLCSkinFile->getAdditionalBoxesCount(); + if(additionalBoxCount != 0) { app.DebugPrintf("Got model parts from DLCskin for skin %X\n",m_dwSkinId); pvModelParts=app.SetAdditionalSkinBoxes(m_dwSkinId,pDLCSkinFile->getAdditionalBoxes()); @@ -2958,8 +2958,8 @@ std::vector *Player::GetAdditionalModelParts() if(pDLCSkinFile!=NULL) { - DWORD dwBoxC=pDLCSkinFile->getAdditionalBoxesCount(); - if(dwBoxC!=0) + const int additionalBoxCount = pDLCSkinFile->getAdditionalBoxesCount(); + if(additionalBoxCount != 0) { app.DebugPrintf("m_bCheckedForModelParts Got model parts from DLCskin for skin %X\n",m_dwSkinId); m_ppAdditionalModelParts=app.SetAdditionalSkinBoxes(m_dwSkinId,pDLCSkinFile->getAdditionalBoxes());