From bfa2fd6715a7a8660cec1dbcdfa4a20a2f26a9f3 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Wed, 11 Mar 2026 03:11:54 +1100 Subject: [PATCH] Remove UINT from game rule manager sizes --- .../Common/GameRules/GameRuleManager.cpp | 32 +++++++++---------- .../Common/GameRules/GameRuleManager.h | 8 ++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp index d7d6cfdf0..42694511d 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp @@ -142,7 +142,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack) } } -LevelGenerationOptions *GameRuleManager::loadGameRules(uint8_t *dIn, UINT dSize) +LevelGenerationOptions *GameRuleManager::loadGameRules(uint8_t *dIn, unsigned int dSize) { LevelGenerationOptions *lgo = new LevelGenerationOptions(); lgo->setGrSource( new JustGrSource() ); @@ -153,7 +153,7 @@ LevelGenerationOptions *GameRuleManager::loadGameRules(uint8_t *dIn, UINT dSize) } // 4J-JEV: Reverse of saveGameRules. -void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize) +void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, unsigned int dSize) { app.DebugPrintf("GameRuleManager::LoadingGameRules:\n"); @@ -174,7 +174,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, U app.DebugPrintf("\tcompressionType=%d.\n", compression_type); - UINT compr_len, decomp_len; + unsigned int compr_len, decomp_len; compr_len = dis.readInt(); decomp_len = dis.readInt(); @@ -240,7 +240,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, U } // 4J-JEV: Reverse of loadGameRules. -void GameRuleManager::saveGameRules(uint8_t **dOut, UINT *dSize) +void GameRuleManager::saveGameRules(uint8_t **dOut, unsigned int *dSize) { if (m_currentGameRuleDefinitions == NULL && m_currentLevelGenerationOptions == NULL) @@ -264,7 +264,7 @@ void GameRuleManager::saveGameRules(uint8_t **dOut, UINT *dSize) // Write 8 bytes of empty space in case we need them later. // Mainly useful for the ones we save embedded in game saves. - for (UINT i = 0; i < 8; i++) + for (unsigned int i = 0; i < 8; i++) dos.writeByte(0x0); dos.writeByte(APPROPRIATE_COMPRESSION_TYPE); // m_compressionType @@ -373,7 +373,7 @@ void GameRuleManager::writeRuleFile(DataOutputStream *dos) m_currentGameRuleDefinitions->write(dos); } -bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize, StringTable *strings) //(DLCGameRulesFile *dlcFile, StringTable *strings) +bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, unsigned int dSize, StringTable *strings) //(DLCGameRulesFile *dlcFile, StringTable *strings) { bool levelGenAdded = false; bool gameRulesAdded = false; @@ -469,15 +469,15 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UI } // string lookup. - UINT numStrings = contentDis->readInt(); + unsigned int numStrings = contentDis->readInt(); std::vector tagsAndAtts; - for (UINT i = 0; i < numStrings; i++) + for (unsigned int i = 0; i < numStrings; i++) tagsAndAtts.push_back( contentDis->readUTF() ); std::unordered_map tagIdMap; for(int type = (int)ConsoleGameRules::eGameRuleType_Root; type < (int)ConsoleGameRules::eGameRuleType_Count; ++type) { - for(UINT i = 0; i < numStrings; ++i) + for(unsigned int i = 0; i < numStrings; ++i) { if(tagsAndAtts[i].compare(wchTagNameA[type]) == 0) { @@ -492,7 +492,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UI std::unordered_map attrIdMap; for(int attr = (int)ConsoleGameRules::eGameRuleAttr_descriptionName; attr < (int)ConsoleGameRules::eGameRuleAttr_Count; ++attr) { - for (UINT i = 0; i < numStrings; i++) + for (unsigned int i = 0; i < numStrings; i++) { if (tagsAndAtts[i].compare(wchAttrNameA[attr]) == 0) { @@ -503,8 +503,8 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UI }*/ // subfile - UINT numFiles = contentDis->readInt(); - for (UINT i = 0; i < numFiles; i++) + unsigned int numFiles = contentDis->readInt(); + for (unsigned int i = 0; i < numFiles; i++) { std::wstring sFilename = contentDis->readUTF(); int length = contentDis->readInt(); @@ -519,8 +519,8 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UI LEVEL_GEN_ID lgoID = LEVEL_GEN_ID_NULL; // xml objects - UINT numObjects = contentDis->readInt(); - for(UINT i = 0; i < numObjects; ++i) + unsigned int numObjects = contentDis->readInt(); + for(unsigned int i = 0; i < numObjects; ++i) { int tagId = contentDis->readInt(); ConsoleGameRules::EGameRuleType tagVal = ConsoleGameRules::eGameRuleType_Invalid; @@ -584,7 +584,7 @@ LevelGenerationOptions *GameRuleManager::readHeader(DLCGameRulesHeader *grh) void GameRuleManager::readAttributes(DataInputStream *dis, std::vector *tagsAndAtts, GameRuleDefinition *rule) { int numAttrs = dis->readInt(); - for (UINT att = 0; att < numAttrs; ++att) + for (unsigned int att = 0; att < static_cast(numAttrs); ++att) { int attID = dis->readInt(); std::wstring value = dis->readUTF(); @@ -596,7 +596,7 @@ void GameRuleManager::readAttributes(DataInputStream *dis, std::vector *tagsAndAtts, std::unordered_map *tagIdMap, GameRuleDefinition *rule) { int numChildren = dis->readInt(); - for(UINT child = 0; child < numChildren; ++child) + for(unsigned int child = 0; child < static_cast(numChildren); ++child) { int tagId = dis->readInt(); ConsoleGameRules::EGameRuleType tagVal = ConsoleGameRules::eGameRuleType_Invalid; diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h index 7bc3f2dfd..95a0dbf4d 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h @@ -40,10 +40,10 @@ public: void loadGameRules(DLCPack *); - LevelGenerationOptions *loadGameRules(uint8_t *dIn, UINT dSize); - void loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize); + LevelGenerationOptions *loadGameRules(uint8_t *dIn, unsigned int dSize); + void loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, unsigned int dSize); - void saveGameRules(uint8_t **dOut, UINT *dSize); + void saveGameRules(uint8_t **dOut, unsigned int *dSize); private: LevelGenerationOptions *readHeader(DLCGameRulesHeader *grh); @@ -51,7 +51,7 @@ private: void writeRuleFile(DataOutputStream *dos); public: - bool readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, UINT dSize, StringTable *strings); //(DLCGameRulesFile *dlcFile, StringTable *strings); + bool readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, unsigned int dSize, StringTable *strings); //(DLCGameRulesFile *dlcFile, StringTable *strings); private: void readAttributes(DataInputStream *dis, std::vector *tagsAndAtts, GameRuleDefinition *rule);