mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-02 08:43:42 -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:
@@ -391,7 +391,7 @@ int daNpcMoiR_c::CreateHeap() {
|
||||
JUT_ASSERT(403, NULL != mdlData_p);
|
||||
|
||||
u32 sp_0x18 = 0x11020284;
|
||||
mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18);
|
||||
mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18);
|
||||
if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
|
||||
mAnm_p->stopZelAnime();
|
||||
mAnm_p = NULL;
|
||||
@@ -407,7 +407,7 @@ int daNpcMoiR_c::CreateHeap() {
|
||||
}
|
||||
mdl_p->setUserArea((uintptr_t)this);
|
||||
|
||||
mpMatAnm = new daNpcF_MatAnm_c();
|
||||
mpMatAnm = JKR_NEW daNpcF_MatAnm_c();
|
||||
if (mpMatAnm == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user