mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-15 04:02:50 -04:00
Isolate JKRHeap operator overloads
Fixes #25 This isolates the JKRHeap operator new/delete overloads. Every single new/delete site in the code has been replaced with a macro. Sadly for new[] and delete[] we have to keep global operators. The global new[] just allocates into malloc() however, and delete[] goes into free() if it's not in a JKRHeap. So that's fine.
This commit is contained in:
@@ -241,7 +241,7 @@ int daPeru_c::CreateHeap() {
|
||||
J3DModelData* mdlData_p =
|
||||
(J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[idx][1]], l_bmdData[idx][0]);
|
||||
JUT_ASSERT(660, NULL != mdlData_p);
|
||||
mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000,
|
||||
mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000,
|
||||
0x11020284);
|
||||
if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) {
|
||||
mpMorf[0]->stopZelAnime();
|
||||
@@ -258,7 +258,7 @@ int daPeru_c::CreateHeap() {
|
||||
}
|
||||
|
||||
model->setUserArea((uintptr_t)this);
|
||||
mpMatAnm[0] = new daNpcT_MatAnm_c();
|
||||
mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c();
|
||||
if (mpMatAnm[0] == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user