Revert "Isolate JKRHeap operator overloads" (#39)

This commit is contained in:
TakaRikka
2026-03-06 19:49:35 -08:00
committed by GitHub
parent fa47658844
commit 3623b27f37
630 changed files with 3349 additions and 3452 deletions
+4 -6
View File
@@ -5,14 +5,12 @@
#include <gx.h>
#include "os_report.h"
#include "JSystem/JKernel/JKRHeap.h"
JUTTexture::~JUTTexture() {
if (getCaptureFlag()) {
JKR_DELETE_ARRAY(field_0x3c);
delete[] field_0x3c;
}
if (getEmbPaletteDelFlag()) {
JKR_DELETE(mEmbPalette);
delete mEmbPalette;
}
}
@@ -51,7 +49,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) {
u32 palOffset = mTexInfo->paletteOffset;
if (mEmbPalette == NULL || !getEmbPaletteDelFlag()) {
mEmbPalette = JKR_NEW JUTPalette(tlut, (GXTlutFmt)mTexInfo->colorFormat,
mEmbPalette = new JUTPalette(tlut, (GXTlutFmt)mTexInfo->colorFormat,
(JUTTransparency)mTexInfo->alphaEnabled,
numColors,
(void*)((intptr_t)mTexInfo + palOffset));
@@ -90,7 +88,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, GXTlut p
mTexData = ((u8*)mTexInfo) + sizeof(ResTIMG);
}
if (getEmbPaletteDelFlag()) {
JKR_DELETE(mEmbPalette);
delete mEmbPalette;
}
mEmbPalette = param_1;
setEmbPaletteDelFlag(false);