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

Remove Win32 byte pointers from texture pack icons

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-10 00:15:56 +11:00
parent e4cc79387a
commit b02bcd27f5
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp
View file

@ -373,14 +373,14 @@ std::wstring AbstractTexturePack::getXuiRootPath()
return szResourceLocator;
}
PBYTE AbstractTexturePack::getPackIcon(DWORD &dwImageBytes)
uint8_t *AbstractTexturePack::getPackIcon(DWORD &dwImageBytes)
{
if(m_iconSize == 0 || m_iconData == NULL) loadIcon();
dwImageBytes = m_iconSize;
return m_iconData;
}
PBYTE AbstractTexturePack::getPackComparison(DWORD &dwImageBytes)
uint8_t *AbstractTexturePack::getPackComparison(DWORD &dwImageBytes)
{
if(m_comparisonSize == 0 || m_comparisonData == NULL) loadComparison();
@ -396,4 +396,4 @@ unsigned int AbstractTexturePack::getDLCParentPackId()
unsigned char AbstractTexturePack::getDLCSubPackId()
{
return 0;
}
}

8
Minecraft.Client/Textures/Packs/AbstractTexturePack.h
View file

@ -19,10 +19,10 @@ protected:
std::wstring desc1;
std::wstring desc2;
PBYTE m_iconData;
uint8_t *m_iconData;
DWORD m_iconSize;
PBYTE m_comparisonData;
uint8_t *m_comparisonData;
DWORD m_comparisonSize;
TexturePack *fallback;
@ -84,8 +84,8 @@ public:
virtual void loadUI();
virtual void unloadUI();
virtual std::wstring getXuiRootPath();
virtual PBYTE getPackIcon(DWORD &dwImageBytes);
virtual PBYTE getPackComparison(DWORD &dwImageBytes);
virtual uint8_t *getPackIcon(DWORD &dwImageBytes);
virtual uint8_t *getPackComparison(DWORD &dwImageBytes);
virtual unsigned int getDLCParentPackId();
virtual unsigned char getDLCSubPackId();
virtual ColourTable *getColourTable() { return m_colourTable; }

5
Minecraft.Client/Textures/Packs/TexturePack.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <cstdint>
#include "../../Platform/Common/App_enums.h"
@ -46,8 +47,8 @@ public:
virtual void loadUI() = 0;
virtual void unloadUI() = 0;
virtual std::wstring getXuiRootPath() = 0;
virtual PBYTE getPackIcon(DWORD &dwImageBytes) = 0;
virtual PBYTE getPackComparison(DWORD &dwImageBytes) = 0;
virtual uint8_t *getPackIcon(DWORD &dwImageBytes) = 0;
virtual uint8_t *getPackComparison(DWORD &dwImageBytes) = 0;
virtual unsigned int getDLCParentPackId() = 0;
virtual unsigned char getDLCSubPackId() = 0;
virtual ColourTable *getColourTable() = 0;