mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -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_balloon_2D.cpp
+15 -15
View File
@@ -155,7 +155,7 @@ static int daBalloon2D_createHeap(fopAc_ac_c* i_this) {
static char* l_arcName = "Balloon2D";
int daBalloon2D_c::createHeap() {
mScreen = new J2DScreen();
mScreen = JKR_NEW J2DScreen();
if (mScreen == NULL) {
return 0;
}
@@ -164,26 +164,26 @@ int daBalloon2D_c::createHeap() {
JKRArchive* arc = resInfo->getArchive();
mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc);
dPaneClass_showNullPane(mScreen);
field_0x578 = new CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL);
field_0x57c = new CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL);
field_0x580 = new CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL);
field_0x584 = new CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL);
field_0x588 = new CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL);
field_0x58c = new CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL);
field_0x590 = new CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL);
field_0x594 = new CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL);
field_0x598 = new CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL);
field_0x59c = new CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL);
field_0x5a0 = new CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL);
field_0x5a4 = new CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL);
field_0x578 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL);
field_0x57c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL);
field_0x580 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL);
field_0x584 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL);
field_0x588 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL);
field_0x58c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL);
field_0x590 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL);
field_0x594 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL);
field_0x598 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL);
field_0x59c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL);
field_0x5a0 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL);
field_0x5a4 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL);
field_0x578->setAlphaRate(0.0f);
field_0x5a4->setAlphaRate(0.0f);
for (s32 i = 0; i < 10; i++) {
ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(i));
field_0x5c4[i] = new J2DPicture(resTimg);
field_0x5c4[i] = JKR_NEW J2DPicture(resTimg);
}
ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getPlusTextureName());
field_0x5ec = new J2DPicture(resTimg);
field_0x5ec = JKR_NEW J2DPicture(resTimg);
if (field_0x578 == NULL || field_0x57c == NULL || field_0x580 == NULL ||
field_0x584 == NULL ||field_0x588 == NULL || field_0x58c == NULL ||
field_0x590 == NULL || field_0x594 == NULL || field_0x598 == NULL ||