mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 12:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Isolate JKRHeap operator overloads" (#39)

Browse Source
This commit is contained in:
TakaRikka
2026-03-06 19:49:35 -08:00
committed by GitHub
parent fa47658844
commit 3623b27f37
630 changed files with 3349 additions and 3452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_select_cursor.cpp
+19 -19
View File
@@ -54,7 +54,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
"",
};
mpCursorHIO = JKR_NEW dSelect_cursorHIO_c();
mpCursorHIO = new dSelect_cursorHIO_c();
mpCursorHIO->field_0x4 = -1;
mNameIdx = 0;
field_0xb6 = param_0;
@@ -92,7 +92,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
param_2 = dComIfGp_getMain2DArchive();
}
mpScreen = JKR_NEW J2DScreen();
mpScreen = new J2DScreen();
mpScreen->setPriority(blo_name[mNameIdx], 0x20000, param_2);
dPaneClass_showNullPane(mpScreen);
@@ -102,13 +102,13 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
switch(mNameIdx) {
case 0: {
mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpPaneMgr->hide();
mpPaneMgr->setAlpha(0);
static u64 const corner_tag[4] = {MULTI_CHAR('l_u_null'), MULTI_CHAR('l_d_null'), MULTI_CHAR('r_u_null'), MULTI_CHAR('r_d_null')};
for (int i = 0; i< 4; i++) {
field_0x1C[i] = JKR_NEW CPaneMgr(mpScreen, corner_tag[i], 0, NULL);
field_0x1C[i] = new CPaneMgr(mpScreen, corner_tag[i], 0, NULL);
field_0x94[i] = mpScreen->search(corner_tag[i])->getTranslateX();
field_0xa4[i] = mpScreen->search(corner_tag[i])->getTranslateY();
field_0x74[i] = field_0x94[i];
@@ -120,16 +120,16 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
field_0x18 = NULL;
} break;
case 1:
mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpPaneMgr->hide();
mpPaneMgr->setAlpha(0);
mpPaneMgr->scale(param_1, param_1);
field_0x14 = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('sel_po00'), 0, NULL);
field_0x14 = new CPaneMgr(mpScreen, MULTI_CHAR('sel_po00'), 0, NULL);
field_0x14->hide();
field_0x18 = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all2'), 2, NULL);
field_0x18 = new CPaneMgr(mpScreen, MULTI_CHAR('n_all2'), 2, NULL);
break;
case 2:
mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, 'Null', 2, NULL);
mpPaneMgr = new CPaneMgr(mpScreen, 'Null', 2, NULL);
mpPaneMgr->hide();
mpPaneMgr->setAlpha(0);
mpPaneMgr->scale(param_1, param_1);
@@ -137,7 +137,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
field_0x18 = NULL;
break;
case 3:
mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('batsu'), 2, NULL);
mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('batsu'), 2, NULL);
mpPaneMgr->hide();
mpPaneMgr->setAlpha(0);
mpPaneMgr->scale(param_1, param_1);
@@ -198,46 +198,46 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
dSelect_cursor_c::~dSelect_cursor_c() {
JKR_DELETE(mpScreen);
delete mpScreen;
mpScreen = NULL;
if (mpPaneMgr) {
JKR_DELETE(mpPaneMgr);
delete mpPaneMgr;
mpPaneMgr = NULL;
}
for (int i = 0; i < 4; i++) {
if (field_0x1C[i]) {
JKR_DELETE(field_0x1C[i]);
delete field_0x1C[i];
field_0x1C[i] = NULL;
}
}
if (field_0x14) {
JKR_DELETE(field_0x14);
delete field_0x14;
field_0x14 = NULL;
}
if (field_0x18) {
JKR_DELETE(field_0x18);
delete field_0x18;
field_0x18 = NULL;
}
if (mpSelectIcon) {
JKR_DELETE(mpSelectIcon);
delete mpSelectIcon;
mpSelectIcon = NULL;
}
if (field_0x30) {
JKR_DELETE(field_0x30);
delete field_0x30;
field_0x30 = NULL;
}
for (int i = 0; i < 2; i++) {
if (field_0x34[i]) {
JKR_DELETE(field_0x34[i]);
delete field_0x34[i];
field_0x34[i] = NULL;
}
}
if (field_0x2C) {
JKR_DELETE(field_0x2C);
delete field_0x2C;
field_0x2C = NULL;
}
if (mpCursorHIO) {
JKR_DELETE(mpCursorHIO);
delete mpCursorHIO;
mpCursorHIO = NULL;
}
}