mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_b_ds.cpp
+8 -8
View File
@@ -5308,7 +5308,7 @@ int daB_DS_c::CreateHeap() {
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(
mpMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", anm_res)),
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
@@ -5326,14 +5326,14 @@ int daB_DS_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74);
JUT_ASSERT(0, modelData != NULL);
mpSwordMorf = new mDoExt_McaMorfSO(
mpSwordMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)), 0,
1.0f, 0, -1, NULL, 0, 0x11000084);
if (mpSwordMorf == NULL || mpSwordMorf->getModel() == NULL) {
return 0;
}
mpSwordBrkAnm = new mDoExt_brkAnm();
mpSwordBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpSwordBrkAnm == NULL) {
return 0;
}
@@ -5348,7 +5348,7 @@ int daB_DS_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75);
JUT_ASSERT(0, modelData != NULL);
mpZantMorf = new mDoExt_McaMorfSO(
mpZantMorf = JKR_NEW mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)), 2,
1.0f, 0, -1, NULL, 0, 0x11000084);
if (mpZantMorf == NULL || mpZantMorf->getModel() == NULL) {
@@ -5363,7 +5363,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpOpPatternBrkAnm = new mDoExt_brkAnm();
mpOpPatternBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpOpPatternBrkAnm == NULL) {
return 0;
}
@@ -5375,7 +5375,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpOpPatternBtkAnm = new mDoExt_btkAnm();
mpOpPatternBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpOpPatternBtkAnm == NULL) {
return 0;
}
@@ -5395,7 +5395,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpPatternBrkAnm = new mDoExt_brkAnm();
mpPatternBrkAnm = JKR_NEW mDoExt_brkAnm();
if (mpPatternBrkAnm == NULL) {
return 0;
}
@@ -5407,7 +5407,7 @@ int daB_DS_c::CreateHeap() {
return 0;
}
mpPatternBtkAnm = new mDoExt_btkAnm();
mpPatternBtkAnm = JKR_NEW mDoExt_btkAnm();
if (mpPatternBtkAnm == NULL) {
return 0;
}