mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -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 b7c482fb87
commit 78d4169929
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_e_ym.cpp
+5 -5
View File
@@ -3322,13 +3322,13 @@ int daE_YM_c::CreateHeap() {
if (mFlyType == 1) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_TM", 0x11);
JUT_ASSERT(0x1094, modelData != NULL);
mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_TM", 10),
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_TM", 10),
0, 1.0f, 0, -1, &mSound, 0x80000,0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
}
mpBrk = JKR_NEW mDoExt_brkAnm();
mpBrk = new mDoExt_brkAnm();
if (mpBrk == NULL) {
return 0;
}
@@ -3341,13 +3341,13 @@ int daE_YM_c::CreateHeap() {
} else {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_YM", 0x13);
JUT_ASSERT(0x10bb, modelData != NULL);
mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YM", 0x10),
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YM", 0x10),
0, 1.0f, 0, -1, &mSound, 0x80000,0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return 0;
}
mpBrk = JKR_NEW mDoExt_brkAnm();
mpBrk = new mDoExt_brkAnm();
if (mpBrk == NULL) {
return 0;
}
@@ -3360,7 +3360,7 @@ int daE_YM_c::CreateHeap() {
}
if (mType == 6) {
field_0x6d0 = JKR_NEW cXyz[45];
field_0x6d0 = new cXyz[45];
}
return 1;