thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-10-30 07:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

options_menu: hide reset button during intro, fix pause menu reappearing

Browse source
This commit is contained in:
Hyper 2025-01-03 00:46:11 +00:00
parent e24fa84e16
commit 90e499cc8c
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
UnleashedRecomp/ui/options_menu.cpp
View file

@ -569,7 +569,7 @@ static void DrawConfigOption(int32_t rowIndex, float yOffset, ConfigDef<T>* conf
DrawTextWithMarquee(g_seuratFont, size, textPos, min, max, textColour, configName.c_str(), g_rowSelectionTime, 0.9, Scale(250.0));
// Show reset button if this option is accessible or not a language option.
g_canReset = !g_lockedOnOption && g_selectedItem->GetName().find("Language") == std::string::npos && isAccessible;
g_canReset = g_isControlsVisible && !g_lockedOnOption && g_selectedItem->GetName().find("Language") == std::string::npos && isAccessible;
}
else
{
@ -1040,17 +1040,27 @@ static void DrawInfoPanel()
drawList->PopClipRect();
}
static void SetOptionsMenuVisible(bool isVisible)
{
OptionsMenu::s_isVisible = isVisible;
*(bool*)g_memory.Translate(0x8328BB26) = !isVisible;
}
static bool DrawMilesElectric()
{
auto drawList = ImGui::GetForegroundDrawList();
auto& res = ImGui::GetIO().DisplaySize;
// Compensate for the lack of CSD UI dimming the background.
if (g_isStage)
drawList->AddRectFilled({ 0.0f, 0.0f }, res, IM_COL32(0, 0, 0, 127));
auto scaleMotion = ComputeMotion(g_appearTime, 0, MILES_ELECTRIC_SCALE_DURATION);
if (scaleMotion >= 1.0)
{
if (g_isClosing)
OptionsMenu::s_isVisible = false;
SetOptionsMenuVisible(false);
return true;
}
@ -1169,7 +1179,6 @@ void OptionsMenu::Draw()
void OptionsMenu::Open(bool isPause, SWA::EMenuType pauseMenuType)
{
s_isVisible = true;
g_isClosing = false;
s_isPause = isPause;
s_pauseMenuType = pauseMenuType;
@ -1187,9 +1196,7 @@ void OptionsMenu::Open(bool isPause, SWA::EMenuType pauseMenuType)
g_isEnterKeyBuffered = true;
ResetSelection();
// Hide CSD UI.
*(bool*)g_memory.Translate(0x8328BB26) = false;
SetOptionsMenuVisible(true);
std::array<Button, 4> buttons =
{
@ -1210,10 +1217,7 @@ void OptionsMenu::Close()
// Skip Miles Electric animation at main menu.
if (!g_isStage)
s_isVisible = false;
// Show CSD UI.
*(bool*)g_memory.Translate(0x8328BB26) = true;
SetOptionsMenuVisible(false);
ButtonGuide::Close();
Config::Save();

2
UnleashedRecompResources

@ -1 +1 @@
Subproject commit 179dad7bf4c95eaec2b5be911529d82fe80b15f1
Subproject commit 9fcb849d7843b5247ed94b8fff451bc40de62ed2