mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-21 21:40:32 -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_e_dk.cpp
+4 -4
View File
@@ -939,7 +939,7 @@ static int daE_DK_Delete(daE_DK_c* i_this) {
int daE_DK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK);
JUT_ASSERT(1488, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DK", BCK_DK_WAIT), 0, 1.0f, 0,
-1, &mCreatureSound, 0x80000, 0x31000284);
@@ -948,7 +948,7 @@ int daE_DK_c::CreateHeap() {
}
for (s32 i = 0; i < 2; i++) {
mpBrkAnm[i] = new mDoExt_brkAnm();
mpBrkAnm[i] = JKR_NEW mDoExt_brkAnm();
if (mpBrkAnm[i] == 0) {
return 0;
}
@@ -960,7 +960,7 @@ int daE_DK_c::CreateHeap() {
return 0;
}
mpBtkAnm[i] = new mDoExt_btkAnm();
mpBtkAnm[i] = JKR_NEW mDoExt_btkAnm();
if (mpBtkAnm[i] == 0) {
return 0;
}
@@ -975,7 +975,7 @@ int daE_DK_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK_CORE);
JUT_ASSERT(1537, modelData != NULL);
mpCoreMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
mpCoreMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_DK", BCK_DK_C_WAIT), 0,
1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11000084);