2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 08:27:42 +00:00

Minor fixes to CFrontEndUI, add elapsed seconds to save selection

This commit is contained in:
2019-02-03 13:20:05 -08:00
parent 0bb51f067c
commit 157946810a
3 changed files with 57 additions and 10 deletions

View File

@@ -26,6 +26,8 @@
namespace urde::MP1 {
#define FE_USE_SECONDS_IN_ELAPSED 1
/* Music volume constants */
static const float FE1_VOL = 0.7421875f;
static const float FE2_VOL = 0.7421875f;
@@ -455,7 +457,7 @@ void CFrontEndUI::SNewFileSelectFrame::SetupFrameContents() {
case 0:
// Completion percent
if (data) {
std::u16string fileStr = g_MainStringTable->GetString(data->x20_hardMode ? 106 : 39);
std::u16string fileStr = g_MainStringTable->GetString((data->x20_hardMode ? 106 : 39) + i);
str = fileStr + hecl::Char16Format(L" %02d%%", data->x18_itemPercent);
break;
}
@@ -473,7 +475,21 @@ void CFrontEndUI::SNewFileSelectFrame::SetupFrameContents() {
}
str = g_MainStringTable->GetString(51);
break;
#if FE_USE_SECONDS_IN_ELAPSED
case 2:
// Formatted time
if (data) {
auto pt = std::div(data->x0_playTime, 3600);
str = hecl::Char16Format(L"%02d:%02d:%02d", pt.quot, pt.rem / 60, pt.rem % 60);
break;
}
str = g_MainStringTable->GetString(52);
break;
case 3:
// "Elapsed"
str = std::u16string(u" ") + std::u16string(g_MainStringTable->GetString(data ? 54 : 53));
break;
#else
case 2:
// Formatted time
if (data) {
@@ -488,6 +504,7 @@ void CFrontEndUI::SNewFileSelectFrame::SetupFrameContents() {
// "Elapsed"
str = g_MainStringTable->GetString(data ? 54 : 53);
break;
#endif
default:
break;