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
+5 -5
View File
@@ -546,7 +546,7 @@ int daBgObj_c::CreateHeapType0() {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBtkName(0, i));
if (btk != NULL) {
field_0x5b8[0][i] = JKR_NEW mDoExt_btkAnm();
field_0x5b8[0][i] = new mDoExt_btkAnm();
if (field_0x5b8[0][i] == NULL ||
!field_0x5b8[0][i]->init(modelData, btk, TRUE, 2, 1.0f, 0, -1))
{
@@ -559,7 +559,7 @@ int daBgObj_c::CreateHeapType0() {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBrkName(0, i));
if (brk != NULL) {
field_0x5c8[0][i] = JKR_NEW mDoExt_brkAnm();
field_0x5c8[0][i] = new mDoExt_brkAnm();
if (field_0x5c8[0][i] == NULL ||
!field_0x5c8[0][i]->init(modelData, brk, TRUE, 2, 1.0f, 0, -1))
{
@@ -597,7 +597,7 @@ int daBgObj_c::CreateHeapType1() {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBtkName(i, j));
if (btk != NULL) {
field_0x5b8[i][j] = JKR_NEW mDoExt_btkAnm();
field_0x5b8[i][j] = new mDoExt_btkAnm();
if (field_0x5b8[i][j] == NULL ||
!field_0x5b8[i][j]->init(modelData, btk, TRUE, 2, 1.0f, 0,
-1))
@@ -611,7 +611,7 @@ int daBgObj_c::CreateHeapType1() {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(
daSetBgObj_c::getArcName(this), getBrkName(i, j));
if (brk != NULL) {
field_0x5c8[i][j] = JKR_NEW mDoExt_brkAnm();
field_0x5c8[i][j] = new mDoExt_brkAnm();
if (field_0x5c8[i][j] == NULL ||
!field_0x5c8[i][j]->init(modelData, brk, TRUE, 2, 1.0f, 0,
-1))
@@ -629,7 +629,7 @@ int daBgObj_c::CreateHeapType1() {
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), getDzbName(1));
if (dzb != NULL) {
mpBgW2 = JKR_NEW dBgW();
mpBgW2 = new dBgW();
if (mpBgW2 == NULL || mpBgW2->Set(dzb, cBgW::MOVE_BG_e, &mBgMtx)) {
mpBgW2 = NULL;
return 0;