mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 20:41:29 -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_name.cpp
+14 -14
View File
@@ -103,32 +103,32 @@ dName_c::dName_c(J2DPane* pane) {
}
dName_c::~dName_c() {
delete stick;
delete nameIn.NameInScr;
JKR_DELETE(stick);
JKR_DELETE(nameIn.NameInScr);
mDoExt_removeMesgFont();
for (int i = 0; i < 8; i++) {
delete mNameCursor[i];
JKR_DELETE(mNameCursor[i]);
}
for (int i = 0; i < 65; i++) {
delete mMojiIcon[i];
JKR_DELETE(mMojiIcon[i]);
}
for (int i = 0; i < 4; i++) {
if (mMenuIcon[i] != NULL) {
delete mMenuIcon[i];
JKR_DELETE(mMenuIcon[i]);
}
}
delete mCursorColorKey;
delete mCursorTexKey;
delete mSelIcon;
JKR_DELETE(mCursorColorKey);
JKR_DELETE(mCursorTexKey);
JKR_DELETE(mSelIcon);
archive->removeResourceAll();
}
void dName_c::_create() {
stick = new STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800);
stick = JKR_NEW STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800);
stick->setFirstWaitTime(5);
nameIn.font = mDoExt_getMesgFont();
g_nmHIO.field_0x4 = -1;
@@ -1344,7 +1344,7 @@ void dName_c::screenSet() {
MULTI_CHAR('s__n_00'), MULTI_CHAR('s__n_01'), MULTI_CHAR('s__n_02'), MULTI_CHAR('s__n_03'), MULTI_CHAR('s__n_04'), MULTI_CHAR('s__n_05'), MULTI_CHAR('s__n_06'), MULTI_CHAR('s__n_07'),
};
nameIn.NameInScr = new J2DScreen();
nameIn.NameInScr = JKR_NEW J2DScreen();
JUT_ASSERT(0, nameIn.NameInScr != NULL);
archive = dComIfGp_getNameResArchive();
@@ -1401,7 +1401,7 @@ void dName_c::screenSet() {
mMenuText[i] = NULL;
} else {
#endif
mMenuIcon[i] = new CPaneMgr(nameIn.NameInScr, l_menu_icon_tag[i], 1, NULL);
mMenuIcon[i] = JKR_NEW CPaneMgr(nameIn.NameInScr, l_menu_icon_tag[i], 1, NULL);
char buf[16];
fopMsgM_messageGet(buf, l_menu_msg[i]);
@@ -1428,7 +1428,7 @@ void dName_c::screenSet() {
mMojiPane = nameIn.NameInScr->search(MULTI_CHAR('moji_n'));
for (u32 i = 0; i < 65; i++) {
mMojiIcon[i] = new CPaneMgr(nameIn.NameInScr, l_tagName[i], 2, NULL);
mMojiIcon[i] = JKR_NEW CPaneMgr(nameIn.NameInScr, l_tagName[i], 2, NULL);
((J2DTextBox*)mMojiIcon[i]->getPanePtr())->setFont(nameIn.font);
((J2DTextBox*)mMojiIcon[i]->getPanePtr())->setString(72, "");
mMojiText[i] = ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->getStringPtr();
@@ -1436,7 +1436,7 @@ void dName_c::screenSet() {
J2DPane* nameTagPane[8];
for (int i = 0; i < 8; i++) {
mNameCursor[i] = new CPaneMgrAlpha(nameIn.NameInScr, l_nameCurTagName[i], 2, NULL);
mNameCursor[i] = JKR_NEW CPaneMgrAlpha(nameIn.NameInScr, l_nameCurTagName[i], 2, NULL);
nameTagPane[i] = nameIn.NameInScr->search(l_nameTagName[i]);
((J2DTextBox*)nameTagPane[i])->setFont(nameIn.font);
((J2DTextBox*)nameTagPane[i])->setString(72, "");
@@ -1481,7 +1481,7 @@ void dName_c::screenSet() {
mCharColumn = 0;
mCharRow = 0;
mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL);
mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL);
JUT_ASSERT(0, mSelIcon != NULL);
mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f);