mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-02 00:03:54 -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 b7c482fb87
commit 78d4169929
630 changed files with 3349 additions and 3452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_gameover.cpp
+11 -11
View File
@@ -142,8 +142,8 @@ int dGameover_c::_create() {
JKRHeap* old_heap = mDoExt_setCurrentHeap(mpHeap);
int temp = mpHeap->getTotalFreeSize();
dgo_screen_c = JKR_NEW dDlst_GameOverScrnDraw_c(resInfo->getArchive());
dMs_c = JKR_NEW dMenu_save_c();
dgo_screen_c = new dDlst_GameOverScrnDraw_c(resInfo->getArchive());
dMs_c = new dMenu_save_c();
JUT_ASSERT(0, dMs_c != NULL);
if (dMeter2Info_getGameOverType() == 1) {
@@ -162,7 +162,7 @@ int dGameover_c::_create() {
}
dMs_c->_create();
dgo_capture_c = JKR_NEW dDlst_Gameover_CAPTURE_c();
dgo_capture_c = new dDlst_Gameover_CAPTURE_c();
JUT_ASSERT(0, dgo_capture_c != NULL);
OS_REPORT("game over create size ===> %d\n", temp - mpHeap->getTotalFreeSize());
@@ -345,13 +345,13 @@ int dGameover_c::_delete() {
JKRHeap* old_heap = mDoExt_setCurrentHeap(mpHeap);
if (dgo_screen_c != NULL) {
JKR_DELETE(dgo_screen_c);
delete dgo_screen_c;
dgo_screen_c = NULL;
}
dMs_c->_delete();
JKR_DELETE(dMs_c);
JKR_DELETE(dgo_capture_c);
delete dMs_c;
delete dgo_capture_c;
mpHeap->freeAll();
dComIfGp_offHeapLockFlag(0);
@@ -362,7 +362,7 @@ int dGameover_c::_delete() {
}
dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
mpScreen = JKR_NEW J2DScreen();
mpScreen = new J2DScreen();
mpScreen->setPriority("zelda_game_over.blo", 0x100000, i_archive);
dPaneClass_showNullPane(mpScreen);
@@ -385,7 +385,7 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
ResTIMG* img = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti");
mpBackImg =
JKR_NEW J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2<f32>(0.0f, 486.0f, 0.0f, 660.0f), img, NULL);
new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2<f32>(0.0f, 486.0f, 0.0f, 660.0f), img, NULL);
mpBackImg->setBlackWhite(img_white, img_black);
J2DTextBox* gold_tbox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('gold_00'));
@@ -395,14 +395,14 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
dMeter2Info_getString(0x381, string, NULL);
gold_tbox->setString(string);
mpLight = JKR_NEW dMsgScrnLight_c(6, 0xFF);
mpLight = new dMsgScrnLight_c(6, 0xFF);
field_0x10 = 0.0f;
}
dDlst_GameOverScrnDraw_c::~dDlst_GameOverScrnDraw_c() {
JKR_DELETE(mpBackImg);
JKR_DELETE(mpScreen);
delete mpBackImg;
delete mpScreen;
dComIfGp_getMain2DArchive()->removeResourceAll();
}