From 6c34c03cdfc8d01a63da15c03fe53388531a360d Mon Sep 17 00:00:00 2001
From: PurpleHato <linkvssangoku.jr@gmail.com>
Date: Sat, 4 Jun 2022 14:40:58 +0200
Subject: [PATCH] FIX: EnhancementCombobox

It was returning the wrong value and could mess array sizes.
---
 libultraship/libultraship/SohImGuiImpl.cpp | 27 +++++++++++-----------
 libultraship/libultraship/SohImGuiImpl.h   |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 2f660dc7b..7f28a9a38 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -99,7 +99,7 @@ namespace SohImGui {
         "gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim"        
     };
 
-    const char* filters[3] = {
+    std::vector<std::string> filters = {
         "Three-Point",
         "Linear",
         "None"
@@ -438,20 +438,21 @@ namespace SohImGui {
     }
 
 
-    void EnhancementCombobox(const char* name, const char* ComboArray[], uint8_t FirstTimeValue = 0){
-        if (FirstTimeValue <= 0){
+    void EnhancementCombobox(const char* name, std::vector<std::string> ComboArray, uint8_t FirstTimeValue = 0) {
+        if (FirstTimeValue <= 0) {
             FirstTimeValue = 0;
         }
-        uint8_t selected=CVar_GetS32(name, FirstTimeValue);
-        uint8_t DefaultValue=selected;
-        if (ImGui::BeginCombo("##name", ComboArray[DefaultValue])) {
-            uint8_t ComboxSize = sizeof(&ComboArray);
-            for (uint8_t i = 0; i <= ComboxSize; i++) {
-                if (strlen(ComboArray[i]) > 1) {
-                    if (ImGui::Selectable(ComboArray[i], i==selected)) {
-                    CVar_SetS32(name, i);
-                    selected=i;
-                    needs_save = true;
+        uint8_t selected = CVar_GetS32(name, FirstTimeValue);
+        uint8_t DefaultValue = selected;
+        std::string comboName = std::string("##") + std::string(name);
+        if (ImGui::BeginCombo(comboName.c_str(), ComboArray[DefaultValue].c_str())) {
+            uint8_t ComboxSize = ComboArray.size();
+            for (uint8_t i = 0; i < ComboxSize; i++) {
+                if (strlen(ComboArray[i].c_str()) > 1) {
+                    if (ImGui::Selectable(ComboArray[i].c_str(), i == selected)) {
+                        CVar_SetS32(name, i);
+                        selected = i;
+                        needs_save = true;
                     }
                 }
             }
diff --git a/libultraship/libultraship/SohImGuiImpl.h b/libultraship/libultraship/SohImGuiImpl.h
index 3a4a18e07..10260d62e 100644
--- a/libultraship/libultraship/SohImGuiImpl.h
+++ b/libultraship/libultraship/SohImGuiImpl.h
@@ -70,7 +70,7 @@ namespace SohImGui {
     void EnhancementButton(const char* text, const char* cvarName);
     void EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format);
     void EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage);
-    void EnhancementCombobox(const char* name, const char* ComboArray[], uint8_t FirstTimeValue);
+    void EnhancementCombobox(const char* name, std::vector<std::string> ComboArray, uint8_t FirstTimeValue);
     void EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow = true, bool has_alpha=false, bool TitleSameLine=false);
 
     void DrawMainMenuAndCalculateGameSize(void);