Remove DWORD texture pack IDs from image metadata APIs

This commit is contained in:
notmatthewbeshay 2026-03-10 01:05:18 +11:00
parent fc1e696409
commit 26c3ac6197
4 changed files with 6 additions and 4 deletions

View file

@ -7631,7 +7631,7 @@ unsigned int CMinecraftApp::FromBigEndian(unsigned int uiValue)
#endif
}
void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,DWORD &uiTexturePack)
void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,std::uint32_t &uiTexturePack)
{
unsigned char *ucPtr=pbImageData;
unsigned int uiCount=0;

View file

@ -703,7 +703,7 @@ public:
bool CanRecordStatsAndAchievements();
// World seed from png image
void GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,DWORD &uiTexturePack);
void GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,std::uint32_t &uiTexturePack);
unsigned int CreateImageTextData(PBYTE bTextMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId);
// Game rules

View file

@ -1,6 +1,7 @@
#include "../../../../Minecraft.World/Platform/stdafx.h"
#include "SonyRemoteStorage_PS3.h"
#include <cstdint>
#include <stdio.h>
#include <string>
#include <stdlib.h>
@ -341,7 +342,7 @@ bool SonyRemoteStorage_PS3::setDataInternal()
{
unsigned int uiHostOptions;
bool bHostOptionsRead;
DWORD uiTexturePack;
std::uint32_t uiTexturePack = 0;
char seed[22];
app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack);

View file

@ -2,6 +2,7 @@
#include "SonyRemoteStorage_Vita.h"
#include "SonyHttp_Vita.h"
#include <cstdint>
#include <stdio.h>
#include <string>
#include <stdlib.h>
@ -313,7 +314,7 @@ bool SonyRemoteStorage_Vita::setDataInternal()
{
unsigned int uiHostOptions;
bool bHostOptionsRead;
DWORD uiTexturePack;
std::uint32_t uiTexturePack = 0;
char seed[22];
app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack);