mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-15 12:08:37 -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:
@@ -202,7 +202,7 @@ int daNpc_ZelR_c::CreateHeap() {
|
||||
|
||||
JUT_ASSERT(0x1b0, NULL != mdlData_p);
|
||||
|
||||
mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284);
|
||||
mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284);
|
||||
if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) {
|
||||
mpMorf[0]->stopZelAnime();
|
||||
mpMorf[0] = NULL;
|
||||
@@ -219,7 +219,7 @@ int daNpc_ZelR_c::CreateHeap() {
|
||||
|
||||
model->setUserArea((uintptr_t)this);
|
||||
for (int i = 0; i < 2; i++) {
|
||||
mpMatAnm[i] = new daNpcT_MatAnm_c();
|
||||
mpMatAnm[i] = JKR_NEW daNpcT_MatAnm_c();
|
||||
|
||||
if (mpMatAnm[i] == NULL) {
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user