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:
@@ -64,14 +64,14 @@ int daObjKAM_c::CreateHeap() {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kam", 10);
|
||||
JUT_ASSERT(0x103, modelData != NULL);
|
||||
}
|
||||
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("I_Kam", 7), 2, 1.0f, 0,
|
||||
-1, &mCreatureSound, 0, 0x11000284);
|
||||
if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) {
|
||||
return 0;
|
||||
}
|
||||
J3DModel* model = mpMorfSO->getModel();
|
||||
mpBrkAnm = new mDoExt_brkAnm();
|
||||
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
|
||||
if (mpBrkAnm == NULL) {
|
||||
return 0;
|
||||
}
|
||||
@@ -91,7 +91,7 @@ int daObjKAM_c::CreateHeap() {
|
||||
}
|
||||
}
|
||||
|
||||
mpBtkAnm = new mDoExt_btkAnm();
|
||||
mpBtkAnm = JKR_NEW mDoExt_btkAnm();
|
||||
if (mpBtkAnm == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user