Merge pull request #215 from 4jcraft/dev

just merging all of the dev branch stuff into the java gui branch
This commit is contained in:
Tropical
2026-03-13 12:11:37 -05:00
committed by GitHub
342 changed files with 4066 additions and 3340 deletions

View File

@@ -1031,8 +1031,8 @@ MemTexture *Textures::addMemTexture(const std::wstring& name,MemTextureProcessor
if(texture == NULL)
{
// can we find it in the app mem files?
PBYTE pbData=NULL;
DWORD dwBytes=0;
std::uint8_t *pbData=NULL;
unsigned int dwBytes=0;
app.GetMemFileDetails(name,&pbData,&dwBytes);
if(dwBytes!=0)