mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -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
src/d/actor/d_a_midna.cpp
+4 -4
View File
@@ -374,7 +374,7 @@ int daMidna_c::createHeap() {
}
for (int i = 0; i < 2; i++) {
mpEyeMatAnm[i] = JKR_NEW daMidna_matAnm_c();
mpEyeMatAnm[i] = new daMidna_matAnm_c();
if (mpEyeMatAnm[i] == NULL) {
return 0;
}
@@ -463,7 +463,7 @@ int daMidna_c::createHeap() {
J3DAnmTransform* md_anm = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mBckHeap[0].getBuffer());
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 14);
JUT_ASSERT(852, modelData != NULL);
mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, &mMorfCB, NULL, md_anm, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, NULL, 0, 0x11000284);
mpMorf = new mDoExt_McaMorfSO(modelData, &mMorfCB, NULL, md_anm, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, NULL, 0, 0x11000284);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
}
@@ -508,13 +508,13 @@ int daMidna_c::createHeap() {
return 0;
}
mpHIO = JKR_NEW NPC_MIDNA_HIO_CLASS();
mpHIO = new NPC_MIDNA_HIO_CLASS();
if (mpHIO == NULL) {
return 0;
}
if (mpDemoFCBlendBmd != NULL) {
mpDemoFCTmpBlk = JKR_NEW mDoExt_blkAnm();
mpDemoFCTmpBlk = new mDoExt_blkAnm();
if (mpDemoFCTmpBlk == NULL) {
return 0;
}