mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 04:31: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:
@@ -545,7 +545,7 @@ int daBgObj_c::CreateHeapType0() {
|
||||
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(
|
||||
daSetBgObj_c::getArcName(this), getBtkName(0, i));
|
||||
if (btk != NULL) {
|
||||
field_0x5b8[0][i] = new mDoExt_btkAnm();
|
||||
field_0x5b8[0][i] = JKR_NEW mDoExt_btkAnm();
|
||||
if (field_0x5b8[0][i] == NULL ||
|
||||
!field_0x5b8[0][i]->init(modelData, btk, TRUE, 2, 1.0f, 0, -1))
|
||||
{
|
||||
@@ -558,7 +558,7 @@ int daBgObj_c::CreateHeapType0() {
|
||||
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(
|
||||
daSetBgObj_c::getArcName(this), getBrkName(0, i));
|
||||
if (brk != NULL) {
|
||||
field_0x5c8[0][i] = new mDoExt_brkAnm();
|
||||
field_0x5c8[0][i] = JKR_NEW mDoExt_brkAnm();
|
||||
if (field_0x5c8[0][i] == NULL ||
|
||||
!field_0x5c8[0][i]->init(modelData, brk, TRUE, 2, 1.0f, 0, -1))
|
||||
{
|
||||
@@ -596,7 +596,7 @@ int daBgObj_c::CreateHeapType1() {
|
||||
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(
|
||||
daSetBgObj_c::getArcName(this), getBtkName(i, j));
|
||||
if (btk != NULL) {
|
||||
field_0x5b8[i][j] = new mDoExt_btkAnm();
|
||||
field_0x5b8[i][j] = JKR_NEW mDoExt_btkAnm();
|
||||
if (field_0x5b8[i][j] == NULL ||
|
||||
!field_0x5b8[i][j]->init(modelData, btk, TRUE, 2, 1.0f, 0,
|
||||
-1))
|
||||
@@ -610,7 +610,7 @@ int daBgObj_c::CreateHeapType1() {
|
||||
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(
|
||||
daSetBgObj_c::getArcName(this), getBrkName(i, j));
|
||||
if (brk != NULL) {
|
||||
field_0x5c8[i][j] = new mDoExt_brkAnm();
|
||||
field_0x5c8[i][j] = JKR_NEW mDoExt_brkAnm();
|
||||
if (field_0x5c8[i][j] == NULL ||
|
||||
!field_0x5c8[i][j]->init(modelData, brk, TRUE, 2, 1.0f, 0,
|
||||
-1))
|
||||
@@ -628,7 +628,7 @@ int daBgObj_c::CreateHeapType1() {
|
||||
|
||||
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), getDzbName(1));
|
||||
if (dzb != NULL) {
|
||||
mpBgW2 = new dBgW();
|
||||
mpBgW2 = JKR_NEW dBgW();
|
||||
if (mpBgW2 == NULL || mpBgW2->Set(dzb, cBgW::MOVE_BG_e, &mBgMtx)) {
|
||||
mpBgW2 = NULL;
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user