backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use standard skin and cape IDs in common app

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 01:35:14 +11:00
parent 1bd031eacb
commit 09d56dc853
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Platform/Common/App_structs.h
View file

@ -62,7 +62,7 @@ typedef struct
// adding new flags for interim TU to 1.6.6 // adding new flags for interim TU to 1.6.6
// A value that encodes the skin that the player has set as their default // A value that encodes the skin that the player has set as their default
DWORD dwSelectedSkin; std::uint32_t dwSelectedSkin;
// In-Menu sensitivity // In-Menu sensitivity
unsigned char ucMenuSensitivity; unsigned char ucMenuSensitivity;
@ -92,7 +92,7 @@ typedef struct
unsigned int uiSpecialTutorialBitmask; unsigned int uiSpecialTutorialBitmask;
// A value that encodes the cape that the player has set // A value that encodes the cape that the player has set
DWORD dwSelectedCape; std::uint32_t dwSelectedCape;
unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS]; unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS];
unsigned char ucCurrentFavoriteSkinPos; unsigned char ucCurrentFavoriteSkinPos;

14
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -1334,12 +1334,12 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
void CMinecraftApp::SetPlayerSkin(int iPad,const std::wstring &name) void CMinecraftApp::SetPlayerSkin(int iPad,const std::wstring &name)
{ {
DWORD skinId = app.getSkinIdFromPath(name); std::uint32_t skinId = app.getSkinIdFromPath(name);
SetPlayerSkin(iPad,skinId); SetPlayerSkin(iPad,skinId);
} }
void CMinecraftApp::SetPlayerSkin(int iPad,DWORD dwSkinId) void CMinecraftApp::SetPlayerSkin(int iPad,std::uint32_t dwSkinId)
{ {
DebugPrintf("Setting skin for %d to %08X\n", iPad, dwSkinId); DebugPrintf("Setting skin for %d to %08X\n", iPad, dwSkinId);
@ -1357,12 +1357,12 @@ std::wstring CMinecraftApp::GetPlayerSkinName(int iPad)
return app.getSkinPathFromId(GameSettingsA[iPad]->dwSelectedSkin); return app.getSkinPathFromId(GameSettingsA[iPad]->dwSelectedSkin);
} }
DWORD CMinecraftApp::GetPlayerSkinId(int iPad) std::uint32_t CMinecraftApp::GetPlayerSkinId(int iPad)
{ {
// 4J-PB -check the user has rights to use this skin - they may have had at some point but the entitlement has been removed. // 4J-PB -check the user has rights to use this skin - they may have had at some point but the entitlement has been removed.
DLCPack *Pack=NULL; DLCPack *Pack=NULL;
DLCSkinFile *skinFile=NULL; DLCSkinFile *skinFile=NULL;
DWORD dwSkin=GameSettingsA[iPad]->dwSelectedSkin; std::uint32_t dwSkin=GameSettingsA[iPad]->dwSelectedSkin;
wchar_t chars[256]; wchar_t chars[256];
if( GET_IS_DLC_SKIN_FROM_BITMASK(dwSkin) ) if( GET_IS_DLC_SKIN_FROM_BITMASK(dwSkin) )
@ -1402,12 +1402,12 @@ DWORD CMinecraftApp::GetPlayerSkinId(int iPad)
void CMinecraftApp::SetPlayerCape(int iPad,const std::wstring &name) void CMinecraftApp::SetPlayerCape(int iPad,const std::wstring &name)
{ {
DWORD capeId = Player::getCapeIdFromPath(name); std::uint32_t capeId = Player::getCapeIdFromPath(name);
SetPlayerCape(iPad,capeId); SetPlayerCape(iPad,capeId);
} }
void CMinecraftApp::SetPlayerCape(int iPad,DWORD dwCapeId) void CMinecraftApp::SetPlayerCape(int iPad,std::uint32_t dwCapeId)
{ {
DebugPrintf("Setting cape for %d to %08X\n", iPad, dwCapeId); DebugPrintf("Setting cape for %d to %08X\n", iPad, dwCapeId);
@ -1424,7 +1424,7 @@ std::wstring CMinecraftApp::GetPlayerCapeName(int iPad)
return Player::getCapePathFromId(GameSettingsA[iPad]->dwSelectedCape); return Player::getCapePathFromId(GameSettingsA[iPad]->dwSelectedCape);
} }
DWORD CMinecraftApp::GetPlayerCapeId(int iPad) std::uint32_t CMinecraftApp::GetPlayerCapeId(int iPad)
{ {
return GameSettingsA[iPad]->dwSelectedCape; return GameSettingsA[iPad]->dwSelectedCape;
} }

8
Minecraft.Client/Platform/Common/Consoles_App.h
View file

@ -234,9 +234,9 @@ public:
unsigned char GetGameSettings(int iPad,eGameSetting eVal); unsigned char GetGameSettings(int iPad,eGameSetting eVal);
unsigned char GetGameSettings(eGameSetting eVal); // for the primary pad unsigned char GetGameSettings(eGameSetting eVal); // for the primary pad
void SetPlayerSkin(int iPad,const std::wstring &name); void SetPlayerSkin(int iPad,const std::wstring &name);
void SetPlayerSkin(int iPad,DWORD dwSkinId); void SetPlayerSkin(int iPad,std::uint32_t dwSkinId);
void SetPlayerCape(int iPad,const std::wstring &name); void SetPlayerCape(int iPad,const std::wstring &name);
void SetPlayerCape(int iPad,DWORD dwCapeId); void SetPlayerCape(int iPad,std::uint32_t dwCapeId);
void SetPlayerFavoriteSkin(int iPad, int iIndex,unsigned int uiSkinID); void SetPlayerFavoriteSkin(int iPad, int iIndex,unsigned int uiSkinID);
unsigned int GetPlayerFavoriteSkin(int iPad,int iIndex); unsigned int GetPlayerFavoriteSkin(int iPad,int iIndex);
unsigned char GetPlayerFavoriteSkinsPos(int iPad); unsigned char GetPlayerFavoriteSkinsPos(int iPad);
@ -261,9 +261,9 @@ public:
public: public:
std::wstring GetPlayerSkinName(int iPad); std::wstring GetPlayerSkinName(int iPad);
DWORD GetPlayerSkinId(int iPad); std::uint32_t GetPlayerSkinId(int iPad);
std::wstring GetPlayerCapeName(int iPad); std::wstring GetPlayerCapeName(int iPad);
DWORD GetPlayerCapeId(int iPad); std::uint32_t GetPlayerCapeId(int iPad);
DWORD GetAdditionalModelParts(int iPad); DWORD GetAdditionalModelParts(int iPad);
void CheckGameSettingsChanged(bool bOverride5MinuteTimer=false, int iPad=XUSER_INDEX_ANY); void CheckGameSettingsChanged(bool bOverride5MinuteTimer=false, int iPad=XUSER_INDEX_ANY);
void ApplyGameSettingsChanged(int iPad); void ApplyGameSettingsChanged(int iPad);