backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-22 17:32:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use standard DLC content types in common app

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 02:14:23 +11:00
parent 1ba21c1250
commit 1b6447a3ca
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,7 @@ BANNEDLIST;
typedef struct _DLCRequest
{
DWORD dwType;
std::uint32_t dwType;
eDLCContentState eState;
}
DLCRequest;

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

@ -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<std::uint32_t>(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<e_DLC_MAX;i++)
{

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

@ -738,8 +738,8 @@ public:
bool RetrieveNextDLCContent();
bool CheckTMSDLCCanStop();
static int DLCOffersReturned(void *pParam, int iOfferC, DWORD dwType, int iPad);
DWORD GetDLCContentType(eDLCContentType eType) { return m_dwContentTypeA[eType];}
eDLCContentType Find_eDLCContentType(DWORD dwType);
std::uint32_t GetDLCContentType(eDLCContentType eType) { return m_dwContentTypeA[eType];}
eDLCContentType Find_eDLCContentType(std::uint32_t dwType);
int GetDLCOffersCount() { return m_iDLCOfferC;}
bool DLCContentRetrieved(eDLCMarketplaceType eType);
void TickDLCOffersRetrieved();
@ -792,7 +792,7 @@ private:
//Request current_download;
std::vector<DLCRequest *> m_DLCDownloadQueue;
std::vector<TMSPPRequest *> 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;