mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-10-05 19:49:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delta time menus

Browse Source
This commit is contained in:
Irastris
2026-08-17 21:36:00 -04:00
parent 115bb6d2ea
commit 8e844cf93b
39 changed files with 1359 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_menu_dmap_map.cpp
+22 -18
View File
@@ -13,7 +13,7 @@
#include "m_Do/m_Do_graphic.h"
#if TARGET_PC
#include <dolphin/gx/GXExtra.h>
#include "dusk/interp/user_interface.h"
#endif
struct dMdm_HIO_prm_res_dst_s {
@@ -462,7 +462,7 @@ void dMenu_StageMapCtrl_c::setPlusNowStayFloorNo(s8 param_0, u8 param_1) {
}
void dMenu_StageMapCtrl_c::moveFloor() {
if ((field_0xf3 == 0) && (field_0xf1 == 0)) {
if ((field_0xf3 DUSK_IF_ELSE(<= , ==) 0) && (field_0xf1 DUSK_IF_ELSE(<= , ==) 0)) {
if (field_0xea != 0) {
field_0xf3 = field_0xf0;
field_0x90 = 0.0f;
@@ -489,7 +489,7 @@ void dMenu_StageMapCtrl_c::moveFloor() {
field_0xea = 0;
}
} else if (field_0xf1 != 0 && field_0xea != 0) {
} else if (field_0xf1 DUSK_IF_ELSE(>, !=) 0 && field_0xea != 0) {
if (field_0xea > 0) {
if (field_0xe7 < field_0xed) {
if ((field_0xe7 == std::floor(field_0xc4) && field_0xe8 == field_0xe7 + field_0xea) || field_0x90 > 0.5f) {
@@ -521,22 +521,22 @@ void dMenu_StageMapCtrl_c::moveFloor() {
field_0xeb = field_0xe7;
}
if (field_0xf1 != 0) {
if (field_0xf1 DUSK_IF_ELSE(>, !=) 0) {
f32 temp_f31 = (f32)(field_0xf0 - field_0xf3) / (f32)field_0xf0;
field_0xeb = getFloorNo(field_0xc4);
field_0xec = getFloorNo(field_0xc0);
field_0x90 = getBlendPer(temp_f31 - std::floor(temp_f31));
field_0xf1--;
if (field_0xf1 == 0) {
DUSK_IF_ELSE(dusk::vdt::advance_toward_frame(field_0xf1, 0.0f, 1.0f), field_0xf1--);
if (field_0xf1 DUSK_IF_ELSE(<=, ==) 0) {
field_0xe8 = field_0xe7;
}
}
if (field_0xf3 != 0) {
field_0xf3--;
if (field_0xf3 != 0 && field_0xf1 != 0) {
if (field_0xf3 DUSK_IF_ELSE(>, !=) 0) {
DUSK_IF_ELSE(dusk::vdt::advance_toward_frame(field_0xf3, 0.0f, 1.0f), field_0xf3--);
if (field_0xf3 DUSK_IF_ELSE(>, !=) 0 && field_0xf1 DUSK_IF_ELSE(>, !=) 0) {
f32 temp_f30 = (f32)(field_0xf0 - field_0xf3) / (f32)field_0xf0;
field_0xeb = getFloorNo(field_0xc4);
field_0xec = getFloorNo(field_0xc0);
@@ -805,12 +805,14 @@ void dMenu_StageMapCtrl_c::zoomCalcSet(f32 param_0) {
}
void dMenu_StageMapCtrl_c::zoomIn_proc() {
f32 temp_f1 = fopMsgM_valueIncrease(field_0xf2, field_0xf2 - field_0xf4, 4);
IF_DUSK(dusk::vdt::advance_toward_frame(field_0xf4, 0.0f, 1.0f));
f32 temp_f1 = DUSK_IF_ELSE(dusk::vdt::present_sine_ease(field_0xf2, field_0xf2 - field_0xf4),
fopMsgM_valueIncrease(field_0xf2, field_0xf2 - field_0xf4, 4));
field_0xd8 = temp_f1;
zoomCalcSet(temp_f1);
field_0xf4--;
if (field_0xf4 < 0) {
IF_NOT_DUSK(field_0xf4--);
if (field_0xf4 DUSK_IF_ELSE(<=, <) 0) {
field_0xf5 = 2;
}
}
@@ -844,7 +846,7 @@ void dMenu_StageMapCtrl_c::zoomWait_init_proc() {
}
bool dMenu_DmapMapCtrl_c::isEnableZoomMove() const {
return field_0xf3 == 0 && (!getDisableZoomMoveFlgX() || !getDisableZoomMoveFlgZ());
return field_0xf3 DUSK_IF_ELSE(<=, ==) 0 && (!getDisableZoomMoveFlgX() || !getDisableZoomMoveFlgZ());
}
void dMenu_StageMapCtrl_c::zoomWait_proc() {
@@ -888,12 +890,14 @@ void dMenu_StageMapCtrl_c::zoomOut_init_proc() {
}
void dMenu_StageMapCtrl_c::zoomOut_proc() {
f32 temp_f1 = fopMsgM_valueIncrease(field_0xf2, field_0xf2 - field_0xf4, 4);
IF_DUSK(dusk::vdt::advance_toward_frame(field_0xf4, 0.0f, 1.0f));
f32 temp_f1 = DUSK_IF_ELSE(dusk::vdt::present_sine_ease(field_0xf2, field_0xf2 - field_0xf4),
fopMsgM_valueIncrease(field_0xf2, field_0xf2 - field_0xf4, 4));
zoomCalcSet(1.0f - temp_f1);
field_0xd8 = 1.0f - temp_f1;
field_0xf4--;
if (field_0xf4 < 0) {
IF_NOT_DUSK(field_0xf4--);
if (field_0xf4 DUSK_IF_ELSE(<=, <) 0) {
field_0xf5 = 0;
}
}
@@ -991,7 +995,7 @@ void dMenu_StageMapCtrl_c::_delete() {
bool dMenu_StageMapCtrl_c::isEnableZoomIn() {
bool var_r30 = 0;
if (field_0xf3 == 0 && dStage_roomControl_c::getFileList2(field_0xe6) != NULL) {
if (field_0xf3 DUSK_IF_ELSE(<=, ==) 0 && dStage_roomControl_c::getFileList2(field_0xe6) != NULL) {
var_r30 = 1;
}
@@ -999,7 +1003,7 @@ bool dMenu_StageMapCtrl_c::isEnableZoomIn() {
}
bool dMenu_StageMapCtrl_c::isEnableZoomOut() {
return field_0xf3 == 0;
return field_0xf3 DUSK_IF_ELSE(<=, ==) 0;
}
void dMenu_StageMapCtrl_c::setPlusZoomCenterX(f32 param_0) {