LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-13 04:28:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove DWORD skin IDs from player customisation APIs

Browse Source
This commit is contained in:
notmatthewbeshay
2026-03-10 07:25:29 +11:00
parent 62a1aea3fc
commit 3f374cecad
6 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/Player/Player.cpp
View File

@@ -620,7 +620,7 @@ void Player::setPlayerDefaultSkin(EDefaultSkins skin)
m_skinIndex = skin;
}
void Player::setCustomSkin(DWORD skinId)
void Player::setCustomSkin(std::uint32_t skinId)
{
#ifndef _CONTENT_PACKAGE
wprintf(L"Attempting to set skin to %08X for player %ls\n", skinId, name.c_str() );
@@ -634,8 +634,8 @@ void Player::setCustomSkin(DWORD skinId)
if( !GET_IS_DLC_SKIN_FROM_BITMASK(skinId) )
{
// GET_UGC_SKIN_ID_FROM_BITMASK will always be zero - this was for a possible custom skin editor skin
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 && defaultSkinIndex > 0 )
{
playerSkin = (EDefaultSkins) defaultSkinIndex;
@@ -699,7 +699,7 @@ void Player::setCustomSkin(DWORD skinId)
}
unsigned int Player::getSkinAnimOverrideBitmask(DWORD skinId)
unsigned int Player::getSkinAnimOverrideBitmask(std::uint32_t skinId)
{
unsigned long bitmask = 0L;
if( GET_IS_DLC_SKIN_FROM_BITMASK(skinId) )
@@ -751,7 +751,7 @@ void Player::setXuid(PlayerUID xuid)
#endif
}
void Player::setCustomCape(DWORD capeId)
void Player::setCustomCape(std::uint32_t capeId)
{
#ifndef _CONTENT_PACKAGE
wprintf(L"Attempting to set cape to %08X for player %s\n", capeId, name.c_str() );
@@ -801,10 +801,10 @@ void Player::setCustomCape(DWORD capeId)
}
}
DWORD Player::getCapeIdFromPath(const std::wstring &cape)
std::uint32_t Player::getCapeIdFromPath(const std::wstring &cape)
{
bool dlcCape = false;
unsigned int capeId = 0;
std::uint32_t capeId = 0;
if(cape.size() >= 14)
{
@@ -827,7 +827,7 @@ DWORD Player::getCapeIdFromPath(const std::wstring &cape)
return capeId;
}
std::wstring Player::getCapePathFromId(DWORD capeId)
std::wstring Player::getCapePathFromId(std::uint32_t capeId)
{
// 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
@@ -840,8 +840,8 @@ std::wstring Player::getCapePathFromId(DWORD capeId)
}
else
{
DWORD ugcCapeIndex = GET_UGC_SKIN_ID_FROM_BITMASK(capeId);
DWORD defaultCapeIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(capeId);
std::uint32_t ugcCapeIndex = GET_UGC_SKIN_ID_FROM_BITMASK(capeId);
std::uint32_t defaultCapeIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(capeId);
if( ugcCapeIndex == 0 )
{
swprintf(chars,256,L"defcape%08X.png",defaultCapeIndex);