mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 12:24:45 -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:
@@ -61,7 +61,7 @@ int daObjKABUTO_c::CreateHeap() {
|
||||
} else {
|
||||
model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kab_m", 11));
|
||||
}
|
||||
mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
|
||||
mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL,
|
||||
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Kab_m", 7)),
|
||||
2, 1.5f, 0, -1, &mCreatureSound, 0, 0x11000284);
|
||||
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
|
||||
@@ -69,7 +69,7 @@ int daObjKABUTO_c::CreateHeap() {
|
||||
}
|
||||
J3DModel* model = mpMorf->getModel();
|
||||
|
||||
mpBrkAnm = new mDoExt_brkAnm();
|
||||
mpBrkAnm = JKR_NEW mDoExt_brkAnm();
|
||||
if (mpBrkAnm == NULL) {
|
||||
return 0;
|
||||
}
|
||||
@@ -85,7 +85,7 @@ int daObjKABUTO_c::CreateHeap() {
|
||||
}
|
||||
}
|
||||
|
||||
mpBtkAnm = new mDoExt_btkAnm();
|
||||
mpBtkAnm = JKR_NEW mDoExt_btkAnm();
|
||||
if (mpBtkAnm == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user