diff --git a/Minecraft.Client/Platform/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h index 7c9e201c7..e73248d9e 100644 --- a/Minecraft.Client/Platform/Common/App_structs.h +++ b/Minecraft.Client/Platform/Common/App_structs.h @@ -203,7 +203,7 @@ BANNEDLIST; typedef struct _DLCRequest { - DWORD dwType; + std::uint32_t dwType; eDLCContentState eState; } DLCRequest; diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 9aaa1bd0a..6d6c85dfa 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -7907,7 +7907,7 @@ std::wstring CMinecraftApp::getEntityName(eINSTANCEOF type) return L""; } -DWORD CMinecraftApp::m_dwContentTypeA[e_Marketplace_MAX]= +std::uint32_t CMinecraftApp::m_dwContentTypeA[e_Marketplace_MAX] = { XMARKETPLACE_OFFERING_TYPE_CONTENT, // e_DLC_SkinPack, e_DLC_TexturePacks, e_DLC_MashupPacks #ifndef _XBOX_ONE @@ -8558,7 +8558,7 @@ int CMinecraftApp::DLCOffersReturned(void *pParam, int iOfferC, DWORD dwType, in DLCRequest *pCurrent = *it; // avatar items are coming back as type Content, so we can't trust the type setting - if(pCurrent->dwType==dwType) + if(pCurrent->dwType == static_cast(dwType)) { pClass->m_iDLCOfferC = iOfferC; app.DebugPrintf("DLCOffersReturned - type %d, count %d - setting to retrieved\n",dwType,iOfferC); @@ -8570,7 +8570,7 @@ int CMinecraftApp::DLCOffersReturned(void *pParam, int iOfferC, DWORD dwType, in return 0; } -eDLCContentType CMinecraftApp::Find_eDLCContentType(DWORD dwType) +eDLCContentType CMinecraftApp::Find_eDLCContentType(std::uint32_t dwType) { for(int i=0;i m_DLCDownloadQueue; std::vector m_TMSPPDownloadQueue; - static DWORD m_dwContentTypeA[e_Marketplace_MAX]; + static std::uint32_t m_dwContentTypeA[e_Marketplace_MAX]; int m_iDLCOfferC; bool m_bAllDLCContentRetrieved; bool m_bAllTMSContentRetrieved;