mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-14 03:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Isolate JKRHeap operator overloads" (#39)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/J2DGraph/J2DMaterial.cpp
+18 -18
View File
@@ -18,9 +18,9 @@ J2DMaterial::J2DMaterial() {
}
J2DMaterial::~J2DMaterial() {
JKR_DELETE(mTevBlock);
JKR_DELETE(mIndBlock);
JKR_DELETE(mAnmPointer);
delete mTevBlock;
delete mIndBlock;
delete mAnmPointer;
}
void J2DMaterial::setGX() {
@@ -45,27 +45,27 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
if (noAlign) {
if (block_type <= 1) {
block = JKR_NEW J2DTevBlock1();
block = new J2DTevBlock1();
} else if (block_type == 2) {
block = JKR_NEW J2DTevBlock2();
block = new J2DTevBlock2();
} else if (block_type <= 4) {
block = JKR_NEW J2DTevBlock4();
block = new J2DTevBlock4();
} else if (block_type <= 8) {
block = JKR_NEW J2DTevBlock8();
block = new J2DTevBlock8();
} else {
block = JKR_NEW J2DTevBlock16();
block = new J2DTevBlock16();
}
} else {
if (block_type <= 1) {
block = JKR_NEW_ARGS (-4) J2DTevBlock1();
block = new (-4) J2DTevBlock1();
} else if (block_type == 2) {
block = JKR_NEW_ARGS (-4) J2DTevBlock2();
block = new (-4) J2DTevBlock2();
} else if (block_type <= 4) {
block = JKR_NEW_ARGS (-4) J2DTevBlock4();
block = new (-4) J2DTevBlock4();
} else if (block_type <= 8) {
block = JKR_NEW_ARGS (-4) J2DTevBlock8();
block = new (-4) J2DTevBlock8();
} else {
block = JKR_NEW_ARGS (-4) J2DTevBlock16();
block = new (-4) J2DTevBlock16();
}
}
ASSERTMSGLINE(101, block, "Error : allocate memory.");
@@ -78,15 +78,15 @@ J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) {
if (noAlign) {
if (block_type != 0) {
block = JKR_NEW J2DIndBlockFull();
block = new J2DIndBlockFull();
} else {
block = JKR_NEW J2DIndBlockNull();
block = new J2DIndBlockNull();
}
} else {
if (block_type != 0) {
block = JKR_NEW_ARGS (-4) J2DIndBlockFull();
block = new (-4) J2DIndBlockFull();
} else {
block = JKR_NEW_ARGS (-4) J2DIndBlockNull();
block = new (-4) J2DIndBlockNull();
}
}
ASSERTMSGLINE(133, block, "Error : allocate memory.");
@@ -122,7 +122,7 @@ void J2DMaterial::makeAnmPointer() {
int r29;
int r28;
if (mAnmPointer == NULL) {
mAnmPointer = JKR_NEW J2DMaterialAnmPointer();
mAnmPointer = new J2DMaterialAnmPointer();
r29 = 1;
if (mAnmPointer == NULL) {
OS_PANIC(171, "Error : allocate memory.");