Revert "Isolate JKRHeap operator overloads" (#39)

This commit is contained in:
TakaRikka
2026-03-06 19:49:35 -08:00
committed by GitHub
parent b7c482fb87
commit 78d4169929
630 changed files with 3349 additions and 3452 deletions
+3 -3
View File
@@ -62,14 +62,14 @@ static int const l_nan_btk_index[2] = {
inline int daObjNAN_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Nan", 9);
JUT_ASSERT(254, modelData != NULL);
mMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
mMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("I_Nan", 6), 2, 1.0f,
0, -1, &mCreatureSound, 0, 0x11000284);
if (mMorf == NULL || mMorf->getModel() == NULL) {
return 0;
}
J3DModel* model = mMorf->getModel();
mBrk = JKR_NEW mDoExt_brkAnm();
mBrk = new mDoExt_brkAnm();
if (mBrk == NULL) {
return 0;
}
@@ -78,7 +78,7 @@ inline int daObjNAN_c::CreateHeap() {
if (mBrk->init(model->getModelData(), anmRegKey, 1, 2, 1.0f, 0, -1) == 0) {
return 0;
}
mBtk = JKR_NEW mDoExt_btkAnm();
mBtk = new mDoExt_btkAnm();
if (mBtk == NULL) {
return 0;
}