From 98d861a4815181d625a7094ec75fd62e3abbddaf Mon Sep 17 00:00:00 2001 From: Sonic Dreamcaster Date: Sun, 6 Apr 2025 00:28:24 -0300 Subject: [PATCH] Audio Language install refactor. --- src/port/ui/ImguiUI.cpp | 50 +++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp index 23a85560..14449471 100644 --- a/src/port/ui/ImguiUI.cpp +++ b/src/port/ui/ImguiUI.cpp @@ -172,40 +172,36 @@ void DrawSettingsMenu(){ UIWidgets::ReEnableComponent(""); } - UIWidgets::PaddedEnhancementCheckbox("Surround 5.1 (needs reload)", "gAudioChannelsSetting", 1, 0); + UIWidgets::PaddedEnhancementCheckbox("Surround 5.1 (Needs reload)", "gAudioChannelsSetting", 1, 0); ImGui::EndMenu(); } - - UIWidgets::Spacer(0); - - if (UIWidgets::BeginMenu("Language")) { - ImGui::Dummy(ImVec2(150, 0.0f)); - if(GameEngine::HasVersion(SF64_VER_EU)){ - UIWidgets::Spacer(0); - if (UIWidgets::CVarCombobox("Voices", "gVoiceLanguage", voiceLangs, - { - .tooltip = "Changes the language of the voice acting in the game", - .defaultIndex = 0, - })) { - Audio_SetVoiceLanguage(CVarGetInteger("gVoiceLanguage", 0)); - }; - } else { - if(UIWidgets::Button("Install EU Audio")){ - if(!GameEngine::GenAssetFile()){ - GameEngine::ShowMessage("Success", "EU Audio Installed, restart the game to apply changes."); + + if (!GameEngine::HasVersion(SF64_VER_JP) || GameEngine::HasVersion(SF64_VER_EU)) { + UIWidgets::Spacer(0); + if (UIWidgets::BeginMenu("Language")) { + ImGui::Dummy(ImVec2(150, 0.0f)); + if (!GameEngine::HasVersion(SF64_VER_JP) && GameEngine::HasVersion(SF64_VER_EU)){ + //UIWidgets::Spacer(0); + if (UIWidgets::CVarCombobox("Voices", "gVoiceLanguage", voiceLangs, + { + .tooltip = "Changes the language of the voice acting in the game", + .defaultIndex = 0, + })) { + Audio_SetVoiceLanguage(CVarGetInteger("gVoiceLanguage", 0)); + }; + } else { + if (UIWidgets::Button("Install JP/EU Audio")) { + if (GameEngine::GenAssetFile()){ + GameEngine::ShowMessage("Success", "Audio assets Installed, restart the game to apply changes.", SDL_MESSAGEBOX_INFORMATION); + Ship::Context::GetInstance()->GetWindow()->Close(); + } } } + ImGui::EndMenu(); } - - if(!GameEngine::HasVersion(SF64_VER_JP) && UIWidgets::Button("Install JP Audio")) { - if(GameEngine::GenAssetFile()){ - GameEngine::ShowMessage("Success", "EU Audio Installed, restart the game to apply changes."); - } - } - ImGui::EndMenu(); } - + UIWidgets::Spacer(0); if (UIWidgets::BeginMenu("Controller")) {