mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-28 23:15: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/d_meter_hakusha.cpp
+14 -14
View File
@@ -29,14 +29,14 @@ int dMeterHakusha_c::_create() {
};
for (int i = 0; i < 6; i++) {
mpHakushaPos[i] = new CPaneMgr(field_0x004, haku_tag[i], 0, NULL);
mpHakushaPos[i] = JKR_NEW CPaneMgr(field_0x004, haku_tag[i], 0, NULL);
JUT_ASSERT(0, mpHakushaPos[i] != NULL);
}
mpHakushaParent = new CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL);
mpHakushaParent = JKR_NEW CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL);
JUT_ASSERT(0, mpHakushaParent != NULL);
mpHakushaScreen = new J2DScreen();
mpHakushaScreen = JKR_NEW J2DScreen();
JUT_ASSERT(0, mpHakushaScreen != NULL);
bool fg = mpHakushaScreen->setPriority("zelda_game_image_hakusha_parts.blo", 0x20000,
@@ -44,10 +44,10 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpHakushaScreen);
mpHakushaOn = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL);
mpHakushaOn = JKR_NEW CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL);
JUT_ASSERT(0, mpHakushaOn != NULL);
mpHakushaOff = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL);
mpHakushaOff = JKR_NEW CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL);
JUT_ASSERT(0, mpHakushaOff != NULL);
mpHakushaOn->setAlphaRate(0.0f);
@@ -65,7 +65,7 @@ int dMeterHakusha_c::_create() {
mHakushaNum = dMeter2Info_getHorseLifeCount();
mpButtonScreen = new J2DScreen();
mpButtonScreen = JKR_NEW J2DScreen();
JUT_ASSERT(0, mpButtonScreen != NULL);
fg = mpButtonScreen->setPriority("zelda_game_image_hakusha_a_btn.blo", 0x20000,
@@ -73,7 +73,7 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpButtonScreen);
mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL);
mpButtonA = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonA != NULL);
mpButtonA->show();
mpButtonA->setAlphaRate(0.0f);
@@ -153,28 +153,28 @@ void dMeterHakusha_c::draw() {
int dMeterHakusha_c::_delete() {
for (int i = 0; i < 6; i++) {
delete mpHakushaPos[i];
JKR_DELETE(mpHakushaPos[i]);
mpHakushaPos[i] = NULL;
}
mpHakushaParent->paneTrans(0.0f, 0.0f);
mpHakushaParent->scale(1.0f, 1.0f);
delete mpHakushaParent;
JKR_DELETE(mpHakushaParent);
mpHakushaParent = NULL;
delete mpHakushaScreen;
JKR_DELETE(mpHakushaScreen);
mpHakushaScreen = NULL;
delete mpHakushaOn;
JKR_DELETE(mpHakushaOn);
mpHakushaOn = NULL;
delete mpHakushaOff;
JKR_DELETE(mpHakushaOff);
mpHakushaOff = NULL;
delete mpButtonScreen;
JKR_DELETE(mpButtonScreen);
mpButtonScreen = NULL;
delete mpButtonA;
JKR_DELETE(mpButtonA);
mpButtonA = NULL;
return 1;
}