diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp index 956457fa1..058db6805 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp @@ -371,7 +371,7 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly ) // Bug 49249 - JPN: Code Defect: Missing Text: String 'Minecraft' is missing in contents download screen. // Looks like we shouldn't be removing this text for Japanese, and probably Chinese & Korean - DWORD dwLanguage = XGetLanguage( ); + unsigned int dwLanguage = XGetLanguage(); switch(dwLanguage) { case XC_LANGUAGE_KOREAN: @@ -450,7 +450,6 @@ HRESULT CScene_DLCOffers::GetDLCInfo( int iOfferC, bool bUpdateOnly ) if (dlc != NULL) { std::uint8_t *pData=NULL; - UINT uiSize=0; unsigned int dwSize=0; WCHAR *cString = dlc->wchBanner; @@ -703,7 +702,6 @@ HRESULT CScene_DLCOffers::OnNotifySelChanged(HXUIOBJ hObjSource, XUINotifySelCha if (dlc != NULL) { std::uint8_t *pImage=NULL; - UINT uiSize=0; unsigned int dwSize=0; WCHAR *cString = dlc->wchBanner; diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp index d999cad59..461640c6f 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp @@ -326,7 +326,7 @@ HRESULT CScene_HelpAndOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa case VK_PAD_B: case VK_ESCAPE: - BYTE userIndex = pInputData->UserIndex; + int userIndex = pInputData->UserIndex; if( !app.IsPauseMenuDisplayed(userIndex) ) { // If we are not from a pause menu, then we are from the main menu @@ -459,4 +459,4 @@ HRESULT CScene_HelpAndOptions::OnCustomMessage_Splitscreenplayer(bool bJoining, { bHandled=true; return app.AdjustSplitscreenScene_PlayerChanged(m_hObj,&m_OriginalPosition,m_iPad,bJoining,false); -} \ No newline at end of file +} diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp index c4bc86e33..dc60cdc6f 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp @@ -500,7 +500,6 @@ HRESULT CScene_Credits::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled) HRESULT CScene_Credits::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled) { // ignore any joypads other than the main - BYTE bFocusUser=XuiElementGetFocusUser(pControlNavigateData->hObjSource); // get the user from the control /*if(!=ProfileManager.GetLockedProfile()) { diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp index 875696a44..9da266cc2 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp @@ -473,7 +473,7 @@ HRESULT CScene_Leaderboards::OnKeyDown(XUIMessageInput* pInputData, BOOL& bHandl case VK_PAD_B: case VK_ESCAPE: { - BYTE userIndex = pInputData->UserIndex; + int userIndex = pInputData->UserIndex; if( !app.IsPauseMenuDisplayed(userIndex) ) { // If we are not from a pause menu, then we are from the main menu diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h index 3c1082afa..95eafb34a 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h +++ b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h @@ -155,7 +155,7 @@ private: std::vector *m_generators; JoinMenuInitData *m_initData; - UINT m_DefaultMinecraftIconSize; + unsigned int m_DefaultMinecraftIconSize; PBYTE m_DefaultMinecraftIconData; int *m_iConfigA; // track the texture packs that we don't have installed int m_iTexturePacksNotInstalled; @@ -165,4 +165,4 @@ private: bool m_bTransferComplete; bool m_bTransferFail; bool m_bSaveTransferInProgress; -}; \ No newline at end of file +};