diff --git a/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.cpp index 90cdcf816..4bd79aa8e 100644 --- a/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.cpp @@ -9,7 +9,7 @@ AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() m_enchantmentId = m_enchantmentLevel = 0; } -void AddEnchantmentRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) +void AddEnchantmentRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes) { GameRuleDefinition::writeAttributes(dos, numAttributes + 2); diff --git a/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.h index bb6f48ae3..d939c0f96 100644 --- a/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.h @@ -15,7 +15,7 @@ public: virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_AddEnchantment; } - virtual void writeAttributes(DataOutputStream *, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); diff --git a/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.cpp index f26580add..7ae0aecf9 100644 --- a/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.cpp @@ -12,7 +12,7 @@ AddItemRuleDefinition::AddItemRuleDefinition() m_slot = -1; } -void AddItemRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void AddItemRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { GameRuleDefinition::writeAttributes(dos, numAttrs + 5); diff --git a/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.h index 01ac84eef..d4863ec9b 100644 --- a/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.h @@ -18,7 +18,7 @@ private: public: AddItemRuleDefinition(); - virtual void writeAttributes(DataOutputStream *, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *, unsigned int numAttributes); virtual void getChildren(std::vector *children); virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_AddItem; } diff --git a/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.cpp index cd235b9e9..02e8ecc63 100644 --- a/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.cpp @@ -30,7 +30,7 @@ ApplySchematicRuleDefinition::~ApplySchematicRuleDefinition() delete m_location; } -void ApplySchematicRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void ApplySchematicRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { GameRuleDefinition::writeAttributes(dos, numAttrs + 5); diff --git a/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.h index 7cf307ae1..a7495c841 100644 --- a/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.h @@ -30,7 +30,7 @@ public: virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_ApplySchematic; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); void processSchematic(AABB *chunkBox, LevelChunk *chunk); diff --git a/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp b/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp index d05f98098..eb8809555 100644 --- a/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp @@ -9,7 +9,7 @@ BiomeOverride::BiomeOverride() m_biomeId = 0; } -void BiomeOverride::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void BiomeOverride::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { GameRuleDefinition::writeAttributes(dos, numAttrs + 3); diff --git a/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h b/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h index 3259658ef..29cd64f5b 100644 --- a/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h +++ b/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h @@ -15,7 +15,7 @@ public: virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_BiomeOverride; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); bool isBiome(int id); diff --git a/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.cpp index 4e6a757cc..a97b585e0 100644 --- a/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.cpp @@ -17,7 +17,7 @@ CollectItemRuleDefinition::~CollectItemRuleDefinition() { } -void CollectItemRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) +void CollectItemRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes) { GameRuleDefinition::writeAttributes(dos, numAttributes + 3); diff --git a/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.h index 3a6b981c9..d9bc6b7e3 100644 --- a/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.h @@ -20,7 +20,7 @@ public: ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_CollectItemRule; } - virtual void writeAttributes(DataOutputStream *, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *, unsigned int numAttributes); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual int getGoal(); diff --git a/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.cpp index 8c78623ef..ad9238a70 100644 --- a/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.cpp @@ -55,7 +55,7 @@ GameRuleDefinition *ConsoleGenerateStructure::addChild(ConsoleGameRules::EGameRu return rule; } -void ConsoleGenerateStructure::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void ConsoleGenerateStructure::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { GameRuleDefinition::writeAttributes(dos, numAttrs + 5); diff --git a/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.h b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.h index 6ad055949..e9aaaface 100644 --- a/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.h +++ b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.h @@ -23,7 +23,7 @@ public: virtual void getChildren(std::vector *children); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); // StructurePiece diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.cpp index f94f5c573..0aaabb754 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.cpp @@ -29,7 +29,7 @@ void GameRuleDefinition::write(DataOutputStream *dos) (*it)->write(dos); } -void GameRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) +void GameRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes) { dos->writeInt(numAttributes + 3); diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h index d41e1aea7..6b7e1afc7 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h @@ -34,7 +34,7 @@ public: virtual void write(DataOutputStream *); - virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes); virtual void getChildren(std::vector *); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp index 2e2e6c904..ba29442e3 100644 --- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp @@ -90,7 +90,7 @@ LevelGenerationOptions::~LevelGenerationOptions() ConsoleGameRules::EGameRuleType LevelGenerationOptions::getActionType() { return ConsoleGameRules::eGameRuleType_LevelGenerationOptions; } -void LevelGenerationOptions::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void LevelGenerationOptions::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { GameRuleDefinition::writeAttributes(dos, numAttrs + 5); diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h index 829d03b4e..6dee74f27 100644 --- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h +++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h @@ -170,7 +170,7 @@ public: virtual ConsoleGameRules::EGameRuleType getActionType(); - virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes); virtual void getChildren(std::vector *children); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); diff --git a/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.cpp index 9e6480016..bf79d1c14 100644 --- a/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.cpp @@ -14,7 +14,7 @@ NamedAreaRuleDefinition::~NamedAreaRuleDefinition() delete m_area; } -void NamedAreaRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) +void NamedAreaRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes) { GameRuleDefinition::writeAttributes(dos, numAttributes + 7); diff --git a/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.h index 8386b3fd4..ff3eb3cb9 100644 --- a/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.h @@ -12,7 +12,7 @@ public: NamedAreaRuleDefinition(); ~NamedAreaRuleDefinition(); - virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes); virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_NamedArea; } diff --git a/Minecraft.Client/Platform/Common/GameRules/StartFeature.cpp b/Minecraft.Client/Platform/Common/GameRules/StartFeature.cpp index 5ab776b68..be44ca2b4 100644 --- a/Minecraft.Client/Platform/Common/GameRules/StartFeature.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/StartFeature.cpp @@ -9,7 +9,7 @@ StartFeature::StartFeature() m_feature = StructureFeature::eFeature_Temples; } -void StartFeature::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void StartFeature::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { GameRuleDefinition::writeAttributes(dos, numAttrs + 3); diff --git a/Minecraft.Client/Platform/Common/GameRules/StartFeature.h b/Minecraft.Client/Platform/Common/GameRules/StartFeature.h index b725fccc4..6a153bfcd 100644 --- a/Minecraft.Client/Platform/Common/GameRules/StartFeature.h +++ b/Minecraft.Client/Platform/Common/GameRules/StartFeature.h @@ -15,7 +15,7 @@ public: virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_StartFeature; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature); diff --git a/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.cpp index 741773782..38ffc2768 100644 --- a/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.cpp @@ -24,7 +24,7 @@ UpdatePlayerRuleDefinition::~UpdatePlayerRuleDefinition() } } -void UpdatePlayerRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) +void UpdatePlayerRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes) { int attrCount = 3; if(m_bUpdateHealth) ++attrCount; diff --git a/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.h index 2b14dd508..0ac062dd7 100644 --- a/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.h @@ -26,7 +26,7 @@ public: virtual void getChildren(std::vector *children); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); - virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void postProcessPlayer(std::shared_ptr player); diff --git a/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp index cb2284a25..5b775ea81 100644 --- a/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp @@ -8,7 +8,7 @@ UseTileRuleDefinition::UseTileRuleDefinition() m_useCoords = false; } -void UseTileRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) +void UseTileRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes) { GameRuleDefinition::writeAttributes(dos, numAttributes + 5); diff --git a/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.h index df3a584ac..ee047d96b 100644 --- a/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.h +++ b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.h @@ -17,7 +17,7 @@ public: ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_UseTileRule; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual bool onUseTile(GameRule *rule, int tileId, int x, int y, int z); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp index 60d64a113..a16822fe9 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp @@ -9,7 +9,7 @@ XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() m_skipAir = false; } -void XboxStructureActionGenerateBox::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void XboxStructureActionGenerateBox::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 9); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.h index 3570b5a3f..44ff199c9 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.h +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.h @@ -19,7 +19,7 @@ public: virtual int getEndY() { return m_y1; } virtual int getEndZ() { return m_z1; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); bool generateBoxInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.cpp index c9250561b..dcc5d59ed 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.cpp @@ -8,7 +8,7 @@ XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() m_x = m_y = m_z = m_tile = m_data = 0; } -void XboxStructureActionPlaceBlock::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void XboxStructureActionPlaceBlock::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 5); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.h index 75648965c..4101028a0 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.h +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.h @@ -18,7 +18,7 @@ public: virtual int getEndY() { return m_y; } virtual int getEndZ() { return m_z; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); bool placeBlockInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp index f4819e329..04606e7ca 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp @@ -21,7 +21,7 @@ XboxStructureActionPlaceContainer::~XboxStructureActionPlaceContainer() } // 4J-JEV: Super class handles attr-facing fine. -//void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream *dos, UINT numAttrs) +//void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) void XboxStructureActionPlaceContainer::getChildren(std::vector *children) diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h index bef68bbb9..f9950e1ba 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h @@ -21,7 +21,7 @@ public: virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); // 4J-JEV: Super class handles attr-facing fine. - //virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + //virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.cpp index 936e7bc8d..af33a418d 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.cpp @@ -15,7 +15,7 @@ XboxStructureActionPlaceSpawner::~XboxStructureActionPlaceSpawner() { } -void XboxStructureActionPlaceSpawner::writeAttributes(DataOutputStream *dos, UINT numAttrs) +void XboxStructureActionPlaceSpawner::writeAttributes(DataOutputStream *dos, unsigned int numAttrs) { XboxStructureActionPlaceBlock::writeAttributes(dos, numAttrs + 1); diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.h index 92899b93e..933a467c4 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.h +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.h @@ -17,7 +17,7 @@ public: virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_PlaceSpawner; } - virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); + virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); bool placeSpawnerInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB);