mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Isolate JKRHeap operator overloads

Browse Source 
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:
PJB3005
2026-02-27 23:11:59 +01:00
parent 2204ad0813
commit 038ef4216f
634 changed files with 3451 additions and 3350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_nan.cpp
+3 -3
View File
@@ -61,14 +61,14 @@ static int const l_nan_btk_index[2] = {
inline int daObjNAN_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Nan", 9);
JUT_ASSERT(254, modelData != NULL);
mMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("I_Nan", 6), 2, 1.0f,
0, -1, &mCreatureSound, 0, 0x11000284);
if (mMorf == NULL || mMorf->getModel() == NULL) {
return 0;
}
J3DModel* model = mMorf->getModel();
mBrk = new mDoExt_brkAnm();
mBrk = JKR_NEW mDoExt_brkAnm();
if (mBrk == NULL) {
return 0;
}
@@ -77,7 +77,7 @@ inline int daObjNAN_c::CreateHeap() {
if (mBrk->init(model->getModelData(), anmRegKey, 1, 2, 1.0f, 0, -1) == 0) {
return 0;
}
mBtk = new mDoExt_btkAnm();
mBtk = JKR_NEW mDoExt_btkAnm();
if (mBtk == NULL) {
return 0;
}