From b723cb35cc902888f715e18f6ec77ec08d2cf91f Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 17 Sep 2023 16:15:42 +0200
Subject: [PATCH] Combine methods

Combine ClearAutoComplete with ResetAutoComplete, full reset needs to be performed when calling this. Combining avoids confusion and potential bugs later on.
---
 r5dev/gameui/IConsole.cpp | 24 ++++++++----------------
 r5dev/gameui/IConsole.h   |  1 -
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index 1f460084..48e0f65e 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -301,7 +301,7 @@ void CConsole::DrawSurface(void)
         if (m_szInputBuf[0])
         {
             ProcessCommand(m_szInputBuf);
-            ClearAutoComplete();
+            ResetAutoComplete();
 
             m_bModifyInput = true;
         }
@@ -508,7 +508,7 @@ bool CConsole::AutoComplete(void)
     {
         if (m_bSuggestActive)
         {
-            ClearAutoComplete();
+            ResetAutoComplete();
         }
         return false;
     }
@@ -522,7 +522,7 @@ bool CConsole::AutoComplete(void)
     }
     else if (m_bCanAutoComplete) // Command completion callback.
     {
-        ClearAutoComplete();
+        ResetAutoComplete();
         string svCommand;
 
         for (size_t i = 0; i < sizeof(m_szInputBuf); i++)
@@ -571,18 +571,10 @@ bool CConsole::AutoComplete(void)
 //-----------------------------------------------------------------------------
 void CConsole::ResetAutoComplete(void)
 {
+    m_nSuggestPos = PositionMode_t::kPark;
     m_bCanAutoComplete = false;
     m_bSuggestActive = false;
     m_bSuggestMoved = true;
-    m_nSuggestPos = PositionMode_t::kPark;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: clears the auto complete window
-//-----------------------------------------------------------------------------
-void CConsole::ClearAutoComplete(void)
-{
-    ResetAutoComplete();
     m_vSuggest.clear();
 }
 
@@ -592,12 +584,12 @@ void CConsole::ClearAutoComplete(void)
 //-----------------------------------------------------------------------------
 void CConsole::FindFromPartial(void)
 {
-    ClearAutoComplete();
+    ResetAutoComplete();
 
     ICvar::Iterator iter(g_pCVar);
     for (iter.SetFirst(); iter.IsValid(); iter.Next())
     {
-        if (m_vSuggest.size() >= size_t(con_suggest_limit->GetInt()))
+        if (m_vSuggest.size() >= con_suggest_limit->GetInt())
         {
             break;
         }
@@ -762,7 +754,7 @@ void CConsole::ClampLogSize(void)
 //-----------------------------------------------------------------------------
 void CConsole::ClampHistorySize(void)
 {
-    while (m_vHistory.size() > size_t(con_max_history->GetInt()))
+    while (m_vHistory.size() > con_max_history->GetInt())
     {
         m_vHistory.erase(m_vHistory.begin());
     }
@@ -1024,7 +1016,7 @@ int CConsole::TextEditCallback(ImGuiInputTextCallbackData* iData)
         }
         else // Reset state and enable history scrolling when buffer is empty.
         {
-            ClearAutoComplete();
+            ResetAutoComplete();
         }
 
         break;
diff --git a/r5dev/gameui/IConsole.h b/r5dev/gameui/IConsole.h
index fae7c1ed..2d2ea343 100644
--- a/r5dev/gameui/IConsole.h
+++ b/r5dev/gameui/IConsole.h
@@ -34,7 +34,6 @@ private:
 
     bool AutoComplete(void);
     void ResetAutoComplete(void);
-    void ClearAutoComplete(void);
 
     void FindFromPartial(void);
     void ProcessCommand(string svCommand);