diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index da9fe0bae..32aacf9e4 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -5172,7 +5172,7 @@ int CMinecraftApp::DLCMountedCallback(void *pParam,int iPad,DWORD dwErr,DWORD dw void CMinecraftApp::HandleDLC(DLCPack *pack) { - DWORD dwFilesProcessed = 0; + unsigned int dwFilesProcessed = 0; #ifndef _XBOX #if defined(__PS3__) || defined(__ORBIS__) || defined(_WINDOWS64) || defined (__PSVITA__) || defined(__linux__) std::vector dlcFilenames; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp index ff26b88c9..c9983e831 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp @@ -62,7 +62,7 @@ DLCManager::EDLCParameterType DLCManager::getParameterType(const std::wstring &p { EDLCParameterType type = e_DLCParamType_Invalid; - for(DWORD i = 0; i < e_DLCParamType_Max; ++i) + for(unsigned int i = 0; i < e_DLCParamType_Max; ++i) { if(paramName.compare(wchTypeNamesA[i]) == 0) { @@ -74,9 +74,9 @@ DLCManager::EDLCParameterType DLCManager::getParameterType(const std::wstring &p return type; } -DWORD DLCManager::getPackCount(EDLCType type /*= e_DLCType_All*/) +unsigned int DLCManager::getPackCount(EDLCType type /*= e_DLCType_All*/) { - DWORD packCount = 0; + unsigned int packCount = 0; if( type != e_DLCType_All ) { for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) @@ -90,7 +90,7 @@ DWORD DLCManager::getPackCount(EDLCType type /*= e_DLCType_All*/) } else { - packCount = (DWORD)m_packs.size(); + packCount = static_cast(m_packs.size()); } return packCount; } @@ -150,12 +150,12 @@ DLCPack *DLCManager::getPackFromProductID(const std::wstring &productID) } #endif -DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/) +DLCPack *DLCManager::getPack(unsigned int index, EDLCType type /*= e_DLCType_All*/) { DLCPack *pack = NULL; if( type != e_DLCType_All ) { - DWORD currentIndex = 0; + unsigned int currentIndex = 0; DLCPack *currentPack = NULL; for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) { @@ -184,9 +184,9 @@ DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/) return pack; } -DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_DLCType_All*/) +unsigned int DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_DLCType_All*/) { - DWORD foundIndex = 0; + unsigned int foundIndex = 0; found = false; if(pack == NULL) { @@ -196,7 +196,7 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D } if( type != e_DLCType_All ) { - DWORD index = 0; + unsigned int index = 0; for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) { DLCPack *thisPack = *it; @@ -214,7 +214,7 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D } else { - DWORD index = 0; + unsigned int index = 0; for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) { DLCPack *thisPack = *it; @@ -230,11 +230,11 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D return foundIndex; } -DWORD DLCManager::getPackIndexContainingSkin(const std::wstring &path, bool &found) +unsigned int DLCManager::getPackIndexContainingSkin(const std::wstring &path, bool &found) { - DWORD foundIndex = 0; + unsigned int foundIndex = 0; found = false; - DWORD index = 0; + unsigned int index = 0; for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) { DLCPack *pack = *it; @@ -285,9 +285,9 @@ DLCSkinFile *DLCManager::getSkinFile(const std::wstring &path) return foundSkinfile; } -DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/) +unsigned int DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/) { - DWORD corruptDLCCount = m_dwUnnamedCorruptDLCCount; + unsigned int corruptDLCCount = m_dwUnnamedCorruptDLCCount; DLCPack *pack = NULL; DLCPack *firstCorruptPack = NULL; @@ -304,7 +304,7 @@ DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/) // gotta fix this someday if(corruptDLCCount > 0 && showMessage) { - UINT uiIDA[1]; + unsigned int uiIDA[1]; uiIDA[0]=IDS_CONFIRM_OK; if(corruptDLCCount == 1 && firstCorruptPack != NULL) { @@ -326,13 +326,13 @@ DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/) return corruptDLCCount; } -bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const std::wstring &path, DLCPack *pack, bool fromArchive) +bool DLCManager::readDLCDataFile(unsigned int &dwFilesProcessed, const std::wstring &path, DLCPack *pack, bool fromArchive) { return readDLCDataFile( dwFilesProcessed, wstringtofilename(path), pack, fromArchive); } -bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const std::string &path, DLCPack *pack, bool fromArchive) +bool DLCManager::readDLCDataFile(unsigned int &dwFilesProcessed, const std::string &path, DLCPack *pack, bool fromArchive) { std::wstring wPath = convStringToWstring(path); if (fromArchive && app.getArchiveFileSize(wPath) >= 0) @@ -385,7 +385,7 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const std::string &pat return processDLCDataFile(dwFilesProcessed, pbData, bytesRead, pack); } -bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, std::uint8_t *pbData, DWORD dwLength, DLCPack *pack) +bool DLCManager::processDLCDataFile(unsigned int &dwFilesProcessed, std::uint8_t *pbData, unsigned int dwLength, DLCPack *pack) { std::unordered_map parameterMapping; unsigned int uiCurrentByte=0; @@ -433,7 +433,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, std::uint8_t *pbDat uiCurrentByte+=sizeof(int); C4JStorage::DLC_FILE_DETAILS *pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[uiCurrentByte]; - DWORD dwTemp=uiCurrentByte; + unsigned int dwTemp=uiCurrentByte; for(unsigned int i=0;idwWchCount); @@ -487,7 +487,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, std::uint8_t *pbDat if(dlcTexturePack != NULL) { - DWORD texturePackFilesProcessed = 0; + unsigned int texturePackFilesProcessed = 0; bool validPack = processDLCDataFile(texturePackFilesProcessed,pbTemp,pFile->uiFileSize,dlcTexturePack); pack->SetDataPointer(NULL); // If it's a child pack, it doesn't own the data if(!validPack || texturePackFilesProcessed == 0) diff --git a/Minecraft.Client/Platform/Common/DLC/DLCManager.h b/Minecraft.Client/Platform/Common/DLC/DLCManager.h index c9dd65228..258b9b546 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCManager.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCManager.h @@ -55,14 +55,14 @@ private: std::vector m_packs; //bool m_bNeedsUpdated; bool m_bNeedsCorruptCheck; - DWORD m_dwUnnamedCorruptDLCCount; + unsigned int m_dwUnnamedCorruptDLCCount; public: DLCManager(); ~DLCManager(); static EDLCParameterType getParameterType(const std::wstring ¶mName); - DWORD getPackCount(EDLCType type = e_DLCType_All); + unsigned int getPackCount(EDLCType type = e_DLCType_All); //bool NeedsUpdated() { return m_bNeedsUpdated; } //void SetNeedsUpdated(bool val) { m_bNeedsUpdated = val; } @@ -80,21 +80,21 @@ public: #ifdef _XBOX_ONE DLCPack *DLCManager::getPackFromProductID(const std::wstring &productID); #endif - DLCPack *getPack(DWORD index, EDLCType type = e_DLCType_All); - DWORD getPackIndex(DLCPack *pack, bool &found, EDLCType type = e_DLCType_All); + DLCPack *getPack(unsigned int index, EDLCType type = e_DLCType_All); + unsigned int getPackIndex(DLCPack *pack, bool &found, EDLCType type = e_DLCType_All); DLCSkinFile *getSkinFile(const std::wstring &path); // Will hunt all packs of type skin to find the right skinfile DLCPack *getPackContainingSkin(const std::wstring &path); - DWORD getPackIndexContainingSkin(const std::wstring &path, bool &found); + unsigned int getPackIndexContainingSkin(const std::wstring &path, bool &found); - DWORD checkForCorruptDLCAndAlert(bool showMessage = true); + unsigned int checkForCorruptDLCAndAlert(bool showMessage = true); - bool readDLCDataFile(DWORD &dwFilesProcessed, const std::wstring &path, DLCPack *pack, bool fromArchive = false); - bool readDLCDataFile(DWORD &dwFilesProcessed, const std::string &path, DLCPack *pack, bool fromArchive = false); + bool readDLCDataFile(unsigned int &dwFilesProcessed, const std::wstring &path, DLCPack *pack, bool fromArchive = false); + bool readDLCDataFile(unsigned int &dwFilesProcessed, const std::string &path, DLCPack *pack, bool fromArchive = false); DWORD retrievePackIDFromDLCDataFile(const std::string &path, DLCPack *pack); private: - bool processDLCDataFile(DWORD &dwFilesProcessed, std::uint8_t *pbData, DWORD dwLength, DLCPack *pack); + bool processDLCDataFile(unsigned int &dwFilesProcessed, std::uint8_t *pbData, unsigned int dwLength, DLCPack *pack); DWORD retrievePackID(std::uint8_t *pbData, DWORD dwLength, DLCPack *pack); }; diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp index 3e0e077aa..d7d6cfdf0 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp @@ -663,7 +663,7 @@ void GameRuleManager::loadDefaultGameRules() if(app.getArchiveFileSize(fpTutorial) >= 0) { DLCPack *pack = new DLCPack(L"",0xffffffff); - DWORD dwFilesProcessed = 0; + unsigned int dwFilesProcessed = 0; if ( app.m_dlcManager.readDLCDataFile(dwFilesProcessed,fpTutorial,pack,true) ) { app.m_dlcManager.addPack(pack); @@ -720,7 +720,7 @@ bool GameRuleManager::loadGameRulesPack(File *path) if(path->exists()) { DLCPack *pack = new DLCPack(L"",0xffffffff); - DWORD dwFilesProcessed = 0; + unsigned int dwFilesProcessed = 0; if( app.m_dlcManager.readDLCDataFile(dwFilesProcessed, path->getPath(),pack)) { app.m_dlcManager.addPack(pack); diff --git a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp index 9a3d41054..fed7cbf75 100644 --- a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp @@ -324,7 +324,7 @@ int DLCTexturePack::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD dwLicen app.DebugPrintf("Mounted DLC for texture pack, attempting to load data\n"); texturePack->m_dlcDataPack = new DLCPack(texturePack->m_dlcInfoPack->getName(), dwLicenceMask); texturePack->setHasAudio(false); - DWORD dwFilesProcessed = 0; + unsigned int dwFilesProcessed = 0; // Load the DLC textures std::wstring dataFilePath = texturePack->m_dlcInfoPack->getFullDataPath(); if(!dataFilePath.empty()) diff --git a/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp b/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp index b20bf8f57..9eccc3ff6 100644 --- a/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp +++ b/Minecraft.Client/Textures/Packs/TexturePackRepository.cpp @@ -59,7 +59,7 @@ void TexturePackRepository::addDebugPacks() { wprintf(L"Pack \"%ls\" is not installed, so adding it\n", L"DLCTestPack"); pack = new DLCPack(L"DLCTestPack",0xffffffff); - DWORD dwFilesProcessed = 0; + unsigned int dwFilesProcessed = 0; if( app.m_dlcManager.readDLCDataFile(dwFilesProcessed, "GAME:\\DummyTexturePack\\TexturePack.pck",pack)) { // 4J Stu - Don't need to do this, as the readDLCDataFile now adds texture packs