diff --git a/Minecraft.Client/Platform/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h index 7ae6eed13..0775cf0c0 100644 --- a/Minecraft.Client/Platform/Common/App_structs.h +++ b/Minecraft.Client/Platform/Common/App_structs.h @@ -62,7 +62,7 @@ typedef struct // adding new flags for interim TU to 1.6.6 // A value that encodes the skin that the player has set as their default - DWORD dwSelectedSkin; + std::uint32_t dwSelectedSkin; // In-Menu sensitivity unsigned char ucMenuSensitivity; @@ -92,7 +92,7 @@ typedef struct unsigned int uiSpecialTutorialBitmask; // A value that encodes the cape that the player has set - DWORD dwSelectedCape; + std::uint32_t dwSelectedCape; unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS]; unsigned char ucCurrentFavoriteSkinPos; diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 84ba5e822..4809fdc12 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -1334,12 +1334,12 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal) void CMinecraftApp::SetPlayerSkin(int iPad,const std::wstring &name) { - DWORD skinId = app.getSkinIdFromPath(name); + std::uint32_t skinId = app.getSkinIdFromPath(name); 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); @@ -1357,12 +1357,12 @@ std::wstring CMinecraftApp::GetPlayerSkinName(int iPad) 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. DLCPack *Pack=NULL; DLCSkinFile *skinFile=NULL; - DWORD dwSkin=GameSettingsA[iPad]->dwSelectedSkin; + std::uint32_t dwSkin=GameSettingsA[iPad]->dwSelectedSkin; wchar_t chars[256]; 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) { - DWORD capeId = Player::getCapeIdFromPath(name); + std::uint32_t capeId = Player::getCapeIdFromPath(name); 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); @@ -1424,7 +1424,7 @@ std::wstring CMinecraftApp::GetPlayerCapeName(int iPad) return Player::getCapePathFromId(GameSettingsA[iPad]->dwSelectedCape); } -DWORD CMinecraftApp::GetPlayerCapeId(int iPad) +std::uint32_t CMinecraftApp::GetPlayerCapeId(int iPad) { return GameSettingsA[iPad]->dwSelectedCape; } diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index 8a1018b7a..f6f3fd88b 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -234,9 +234,9 @@ public: unsigned char GetGameSettings(int iPad,eGameSetting eVal); unsigned char GetGameSettings(eGameSetting eVal); // for the primary pad 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,DWORD dwCapeId); + void SetPlayerCape(int iPad,std::uint32_t dwCapeId); void SetPlayerFavoriteSkin(int iPad, int iIndex,unsigned int uiSkinID); unsigned int GetPlayerFavoriteSkin(int iPad,int iIndex); unsigned char GetPlayerFavoriteSkinsPos(int iPad); @@ -261,9 +261,9 @@ public: public: std::wstring GetPlayerSkinName(int iPad); - DWORD GetPlayerSkinId(int iPad); + std::uint32_t GetPlayerSkinId(int iPad); std::wstring GetPlayerCapeName(int iPad); - DWORD GetPlayerCapeId(int iPad); + std::uint32_t GetPlayerCapeId(int iPad); DWORD GetAdditionalModelParts(int iPad); void CheckGameSettingsChanged(bool bOverride5MinuteTimer=false, int iPad=XUSER_INDEX_ANY); void ApplyGameSettingsChanged(int iPad);