mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-12 11:35:09 -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:
@@ -1660,7 +1660,7 @@ int daE_GM_c::CreateHeap() {
|
||||
|
||||
JUT_ASSERT(2683, modelData != NULL);
|
||||
|
||||
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9),
|
||||
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9),
|
||||
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
|
||||
} else {
|
||||
if (mType != TYPE_NORMAL) {
|
||||
@@ -1678,7 +1678,7 @@ int daE_GM_c::CreateHeap() {
|
||||
|
||||
JUT_ASSERT(2714, modelData != NULL);
|
||||
|
||||
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR),
|
||||
mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR),
|
||||
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user