diff --git a/Minecraft.Client/Platform/Common/Colours/ColourTable.cpp b/Minecraft.Client/Platform/Common/Colours/ColourTable.cpp index 18f959d44..294c3f5fd 100644 --- a/Minecraft.Client/Platform/Common/Colours/ColourTable.cpp +++ b/Minecraft.Client/Platform/Common/Colours/ColourTable.cpp @@ -314,20 +314,20 @@ void ColourTable::staticCtor() } } -ColourTable::ColourTable(PBYTE pbData, DWORD dwLength) +ColourTable::ColourTable(std::uint8_t *pbData, std::uint32_t dataLength) { - loadColoursFromData(pbData, dwLength); + loadColoursFromData(pbData, dataLength); } -ColourTable::ColourTable(ColourTable *defaultColours, PBYTE pbData, DWORD dwLength) +ColourTable::ColourTable(ColourTable *defaultColours, std::uint8_t *pbData, std::uint32_t dataLength) { // 4J Stu - Default the colours that of the table passed in XMemCpy( (void *)m_colourValues, (void *)defaultColours->m_colourValues, sizeof(int) * eMinecraftColour_COUNT); - loadColoursFromData(pbData, dwLength); + loadColoursFromData(pbData, dataLength); } -void ColourTable::loadColoursFromData(PBYTE pbData, DWORD dwLength) +void ColourTable::loadColoursFromData(std::uint8_t *pbData, std::uint32_t dataLength) { - byteArray src(pbData, dwLength); + byteArray src(pbData, dataLength); ByteArrayInputStream bais(src); DataInputStream dis(&bais); diff --git a/Minecraft.Client/Platform/Common/Colours/ColourTable.h b/Minecraft.Client/Platform/Common/Colours/ColourTable.h index 5b3e6ee03..8a467e6cd 100644 --- a/Minecraft.Client/Platform/Common/Colours/ColourTable.h +++ b/Minecraft.Client/Platform/Common/Colours/ColourTable.h @@ -1,4 +1,5 @@ #pragma once +#include class ColourTable { @@ -11,13 +12,13 @@ private: public: static void staticCtor(); - ColourTable(PBYTE pbData, DWORD dwLength); - ColourTable(ColourTable *defaultColours, PBYTE pbData, DWORD dwLength); + ColourTable(std::uint8_t *pbData, std::uint32_t dataLength); + ColourTable(ColourTable *defaultColours, std::uint8_t *pbData, std::uint32_t dataLength); unsigned int getColour(eMinecraftColour id); unsigned int getColor(eMinecraftColour id) { return getColour(id); } - void loadColoursFromData(PBYTE pbData, DWORD dwLength); + void loadColoursFromData(std::uint8_t *pbData, std::uint32_t dataLength); void setColour(const std::wstring &colourName, int value); void setColour(const std::wstring &colourName, const std::wstring &value); -}; \ No newline at end of file +};