mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 04:02:50 -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_bemos.cpp
+6 -6
View File
@@ -411,7 +411,7 @@ int daObjBm_c::CreateHeap() {
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BRK_SERCH_e);
JUT_ASSERT(780, pbrk != NULL);
mSerchBrk = new mDoExt_brkAnm();
mSerchBrk = JKR_NEW mDoExt_brkAnm();
if (mSerchBrk == NULL || mSerchBrk->init(modelData, pbrk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) {
return 0;
}
@@ -423,7 +423,7 @@ int daObjBm_c::CreateHeap() {
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BM_UP_e);
JUT_ASSERT(798, pbck != NULL);
mBeamosBck = new mDoExt_bckAnm();
mBeamosBck = JKR_NEW mDoExt_bckAnm();
if (mBeamosBck == NULL || mBeamosBck->init(pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) {
return 0;
}
@@ -437,7 +437,7 @@ int daObjBm_c::CreateHeap() {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAMB_OFF_e);
JUT_ASSERT(827, pbtk != NULL);
mBeamBtk = new mDoExt_btkAnm();
mBeamBtk = JKR_NEW mDoExt_btkAnm();
if (mBeamBtk == NULL || mBeamBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) {
return 0;
}
@@ -450,14 +450,14 @@ int daObjBm_c::CreateHeap() {
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAM_e);
JUT_ASSERT(846, pbtk != NULL);
mBeamEffBtk = new mDoExt_btkAnm();
mBeamEffBtk = JKR_NEW mDoExt_btkAnm();
if (mBeamEffBtk == NULL || mBeamEffBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == 0) {
return 0;
}
J3DAnmTransform* pbck2 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_EF_BIMOBEAM_e);
JUT_ASSERT(858, pbck != NULL);
mBeamEffBck = new mDoExt_bckAnm();
mBeamEffBck = JKR_NEW mDoExt_bckAnm();
if (mBeamEffBck == NULL || mBeamEffBck->init(pbck2, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) == 0) {
return 0;
}
@@ -471,7 +471,7 @@ int daObjBm_c::CreateHeap() {
J3DAnmTransform* pbck3 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BMF_OFF_e);
JUT_ASSERT(885, pbck != NULL);
mBmfOffBck = new mDoExt_bckAnm();
mBmfOffBck = JKR_NEW mDoExt_bckAnm();
if (mBmfOffBck == NULL || mBmfOffBck->init(pbck3, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) {
return 0;
}