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_msg_scrn_staff.cpp
+6 -6
View File
@@ -21,16 +21,16 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) {
field_0xd0 = 0.0f;
field_0xcc = 0.0f;
mpScreen = new J2DScreen();
mpScreen = JKR_NEW J2DScreen();
mpScreen->setPriority("zelda_staff_roll.blo", 0x20000, dComIfGp_getMsgArchive(6));
dPaneClass_showNullPane(mpScreen);
mpPmP_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL);
mpPmP_c = JKR_NEW CPaneMgr(mpScreen, 'ROOT', 2, NULL);
mpScreen->search(MULTI_CHAR('left_n'))->hide();
mpScreen->search(MULTI_CHAR('right_n'))->hide();
for (int i = 0; i < 6; i++) {
mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], NULL, NULL);
mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], NULL, NULL);
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, "");
}
@@ -52,14 +52,14 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) {
}
dMsgScrnStaff_c::~dMsgScrnStaff_c() {
delete mpScreen;
JKR_DELETE(mpScreen);
mpScreen = NULL;
delete mpPmP_c;
JKR_DELETE(mpPmP_c);
mpPmP_c = NULL;
for (int i = 0; i < 6; i++) {
delete mpTm_c[i];
JKR_DELETE(mpTm_c[i]);
mpTm_c[i] = 0;
}