mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 12:52:51 -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:
@@ -606,7 +606,7 @@ int daNpc_Kn_c::CreateHeap() {
|
||||
JUT_ASSERT(1259, NULL != mdlData_p);
|
||||
|
||||
u32 sp2C = 0x11020284;
|
||||
mpModelMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C);
|
||||
mpModelMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C);
|
||||
if (mpModelMorf[0] != NULL && mpModelMorf[0]->getModel() == NULL) {
|
||||
mpModelMorf[0]->stopZelAnime();
|
||||
mpModelMorf[0] = NULL;
|
||||
@@ -635,7 +635,7 @@ int daNpc_Kn_c::CreateHeap() {
|
||||
JUT_ASSERT(1310, NULL != mdlData_p);
|
||||
|
||||
sp2C = 0x11020284;
|
||||
mpModelMorf[1] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C);
|
||||
mpModelMorf[1] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C);
|
||||
|
||||
if (mpModelMorf[1] != NULL && mpModelMorf[1]->getModel() == NULL) {
|
||||
mpModelMorf[1] = NULL;
|
||||
|
||||
Reference in New Issue
Block a user