LegacyConsole/GabsPuNs-MinecraftConsoles
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-07-06 12:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert secure funcs part 2

Browse Source
This commit is contained in:
GabsPuNs
2026-04-18 14:10:17 -04:00
parent 86879aa2fc
commit 28cd1dd580
14 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.Client/Textures.cpp
View File

@@ -473,7 +473,7 @@ void Textures::bindTextureLayers(ResourceLocation *resource)
mergedWidth = width;
mergedHeight = height;
mergedPixels = intArray(width * height);
memcpy_s(mergedPixels.data, width * height * sizeof(int), layerPixels.data, width * height * sizeof(int));
memcpy(mergedPixels.data, layerPixels.data, width * height * sizeof(int));
hasMergedPixels = true;
}
else if( width == mergedWidth && height == mergedHeight )
@@ -514,7 +514,7 @@ void Textures::bindTextureLayers(ResourceLocation *resource)
if( hasMergedPixels )
{
BufferedImage *mergedImage = new BufferedImage(mergedWidth, mergedHeight, BufferedImage::TYPE_INT_ARGB);
memcpy_s(mergedImage->getData(), mergedWidth * mergedHeight * sizeof(int), mergedPixels.data, mergedWidth * mergedHeight * sizeof(int));
memcpy(mergedImage->getData(), mergedPixels.data, mergedWidth * mergedHeight * sizeof(int));
delete[] mergedPixels.data;
id = getTexture(mergedImage, C4JRender::TEXTURE_FORMAT_RxGyBzAw, false);
}
@@ -776,7 +776,7 @@ void Textures::loadTexture(BufferedImage *img, int id, bool blur, bool clamp)
// 4J - added - have we loaded mipmap data for this level? Use that rather than generating if possible
if( img->getData( level ) )
{
memcpy_s( tempData, ww * hh * 4, img->getData( level ), ww * hh * 4);
memcpy( tempData, img->getData( level ), ww * hh * 4);
#ifndef _XBOX
// Swap ARGB to RGBA
for( int i = 0; i < ww * hh ; i++ )