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