mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-23 09:52:20 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into rando-custom-messages

Browse Source
This commit is contained in:
Christopher Leggett 2022-07-14 00:56:17 -04:00
commit 873995199b
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libultraship/libultraship/ImGuiImpl.cpp
View File

@ -736,6 +736,10 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::Separator();
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Audio")) { if (ImGui::BeginMenu("Audio")) {
EnhancementSliderFloat("Master Volume: %d %%", "##Master_Vol", "gGameMasterVolume", 0.0f, 1.0f, "", 1.0f, true); EnhancementSliderFloat("Master Volume: %d %%", "##Master_Vol", "gGameMasterVolume", 0.0f, 1.0f, "", 1.0f, true);
@ -747,6 +751,8 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Controller")) if (ImGui::BeginMenu("Controller"))
{ {
EnhancementCheckbox("Use Controller Navigation", "gControlNav"); EnhancementCheckbox("Use Controller Navigation", "gControlNav");
@ -775,6 +781,8 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Graphics")) if (ImGui::BeginMenu("Graphics"))
{ {
EnhancementSliderFloat("Internal Resolution: %d %%", "##IMul", "gInternalResolution", 0.5f, 2.0f, "", 1.0f, true); EnhancementSliderFloat("Internal Resolution: %d %%", "##IMul", "gInternalResolution", 0.5f, 2.0f, "", 1.0f, true);
@ -823,6 +831,8 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Languages")) { if (ImGui::BeginMenu("Languages")) {
EnhancementRadioButton("English", "gLanguages", 0); EnhancementRadioButton("English", "gLanguages", 0);
EnhancementRadioButton("German", "gLanguages", 1); EnhancementRadioButton("German", "gLanguages", 1);
@ -830,6 +840,8 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Enhancements")) if (ImGui::BeginMenu("Enhancements"))
{ {
if (ImGui::BeginMenu("Gameplay")) if (ImGui::BeginMenu("Gameplay"))
@ -1154,6 +1166,8 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Cheats")) if (ImGui::BeginMenu("Cheats"))
{ {
if (ImGui::BeginMenu("Infinite...")) { if (ImGui::BeginMenu("Infinite...")) {
@ -1191,6 +1205,8 @@ namespace SohImGui {
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu("Developer Tools")) if (ImGui::BeginMenu("Developer Tools"))
{ {
EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled"); EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");
@ -1211,6 +1227,7 @@ namespace SohImGui {
} }
for (const auto& category : windowCategories) { for (const auto& category : windowCategories) {
ImGui::SetCursorPosY(0.0f);
if (ImGui::BeginMenu(category.first.c_str())) { if (ImGui::BeginMenu(category.first.c_str())) {
for (const std::string& name : category.second) { for (const std::string& name : category.second) {
std::string varName(name); std::string varName(name);