Revert "Add window to customize specific controls (HarbourMasters#1122)"

This reverts commit 46a421f.
dcvz · Aug 16, 2022 · 38673f6 · 38673f6
1 parent 46a421f
commit 38673f6
Show file tree

Hide file tree

Showing 12 changed files with 363 additions and 753 deletions.
diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp
@@ -1162,27 +1162,10 @@ namespace SohImGui {
                 PaddedSeparator();
 
                 if (ImGui::BeginMenu("Controls")) {
-                    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
-                    ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
-                    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-                    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-                    float availableWidth = ImGui::GetContentRegionAvail().x;
-                    if (ImGui::Button(
-                        GetWindowButtonText("Customize Game Controls", CVar_GetS32("gGameControlEditorEnabled", 0)).c_str(),
-                        ImVec2(availableWidth, 0)
-                    )) {
-                        bool currentValue = CVar_GetS32("gGameControlEditorEnabled", 0);
-                        CVar_SetS32("gGameControlEditorEnabled", !currentValue);
-                        needs_save = true;
-                        customWindows["Game Control Editor"].enabled = CVar_GetS32("gGameControlEditorEnabled", 0);
-                    }
-                    ImGui::PopStyleVar(3);
-                    ImGui::PopStyleColor(1);
-
                     // TODO mutual exclusions -- There should be some system to prevent conclifting enhancements from being selected
-                    PaddedEnhancementCheckbox("D-pad Support on Pause and File Select", "gDpadPauseName");
+                    EnhancementCheckbox("D-pad Support on Pause and File Select", "gDpadPauseName");
                     Tooltip("Enables Pause and File Select screen navigation with the D-pad\nIf used with D-pad as Equip Items, you must hold C-Up to equip instead of navigate");
-                    PaddedEnhancementCheckbox("D-pad Support in Text Choice", "gDpadText", true, false);
+                    PaddedEnhancementCheckbox("D-pad Support in Ocarina and Text Choice", "gDpadOcarinaText", true, false);
                     PaddedEnhancementCheckbox("D-pad Support for Browsing Shop Items", "gDpadShop", true, false);
                     PaddedEnhancementCheckbox("D-pad as Equip Items", "gDpadEquips", true, false);
                     Tooltip("Allows the D-pad to be used as extra C buttons");

diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -157,11 +157,6 @@ set(Header_Files__soh__Enhancements
 )
 source_group("Header Files\\soh\\Enhancements" FILES ${Header_Files__soh__Enhancements})
 
-set(Header_Files__soh__Enhancements__controls
-    "soh/Enhancements/controls/GameControlEditor.h"
-)
-source_group("Header Files\\soh\\Enhancements\\controls" FILES ${Header_Files__soh__Enhancements__controls})
-
 set(Header_Files__soh__Enhancements__cosmetics
     "soh/Enhancements/cosmetics/CosmeticsEditor.h"
 )
@@ -254,11 +249,6 @@ set(Source_Files__soh__Enhancements
 )
 source_group("Source Files\\soh\\Enhancements" FILES ${Source_Files__soh__Enhancements})
 
-set(Source_Files__soh__Enhancements__controls
-    "soh/Enhancements/controls/GameControlEditor.cpp"
-)
-source_group("Source Files\\soh\\Enhancements\\controls" FILES ${Source_Files__soh__Enhancements__controls})
-
 set(Source_Files__soh__Enhancements__cosmetics
     "soh/Enhancements/cosmetics/CosmeticsEditor.cpp"
 )
@@ -1553,15 +1543,13 @@ set(ALL_FILES
     ${Header_Files}
     ${Header_Files__include}
     ${Header_Files__soh__Enhancements}
-    ${Header_Files__soh__Enhancements__controls}
     ${Header_Files__soh__Enhancements__cosmetics}
     ${Header_Files__soh__Enhancements__debugger}
     ${Header_Files__soh__Enhancements__randomizer}
     ${Header_Files__soh__Enhancements__randomizer__3drando}
     ${Header_Files__soh__Enhancements__custom_message}
     ${Source_Files__soh}
     ${Source_Files__soh__Enhancements}
-    ${Source_Files__soh__Enhancements__controls}
     ${Source_Files__soh__Enhancements__cosmetics}
     ${Source_Files__soh__Enhancements__debugger}
     ${Source_Files__soh__Enhancements__randomizer}

diff --git a/soh/include/z64audio.h b/soh/include/z64audio.h
@@ -1094,11 +1094,11 @@ typedef struct {
 } OcarinaStaff;
 
 typedef enum {
-    /*  0 */ OCARINA_NOTE_D4,
-    /*  1 */ OCARINA_NOTE_F4,
-    /*  2 */ OCARINA_NOTE_A4,
-    /*  3 */ OCARINA_NOTE_B4,
-    /*  4 */ OCARINA_NOTE_D5,
+    /*  0 */ OCARINA_NOTE_A,
+    /*  1 */ OCARINA_NOTE_C_DOWN,
+    /*  2 */ OCARINA_NOTE_C_RIGHT,
+    /*  3 */ OCARINA_NOTE_C_LEFT,
+    /*  4 */ OCARINA_NOTE_C_UP,
     /* -1 */ OCARINA_NOTE_INVALID = 0xFF
 } OcarinaNoteIdx;
 

diff --git a/soh/soh/Enhancements/controls/GameControlEditor.cpp b/soh/soh/Enhancements/controls/GameControlEditor.cpp
diff --git a/soh/soh/Enhancements/controls/GameControlEditor.h b/soh/soh/Enhancements/controls/GameControlEditor.h
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -29,7 +29,6 @@
 #define DRWAV_IMPLEMENTATION
 #include "Lib/dr_libs/wav.h"
 #include "AudioPlayer.h"
-#include "Enhancements/controls/GameControlEditor.h"
 #include "Enhancements/cosmetics/CosmeticsEditor.h"
 #include "Enhancements/debugconsole.h"
 #include "Enhancements/debugger/debugger.h"
@@ -192,7 +191,6 @@ extern "C" void InitOTR() {
     OTRMessage_Init();
     OTRAudio_Init();
     InitCosmeticsEditor();
-    GameControlEditor::Init();
     DebugConsole_Init();
     Debug_Init();
     Rando_Init();