From cfa572f20e8733e9d1fe84e2378d99927c9f968c Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 23 Feb 2022 21:02:37 +0100
Subject: [PATCH] Small fixes + improve console autocomplete readability

---
 r5dev/engine/common.cpp   |  1 +
 r5dev/gameui/IConsole.cpp | 12 ++++++------
 r5dev/tier0/IConVar.cpp   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/r5dev/engine/common.cpp b/r5dev/engine/common.cpp
index 7732ca3d..7fe09e64 100644
--- a/r5dev/engine/common.cpp
+++ b/r5dev/engine/common.cpp
@@ -16,4 +16,5 @@ COM_ExplainDisconnection
 void* HCOM_ExplainDisconnection(void* unused, const char* fmt, ...)
 {
 	// !TODO: rebuild.
+	return nullptr;
 }
diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index 6913d10d..9447b97d 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -256,7 +256,7 @@ void CConsole::BasePanel(bool* bDraw)
     }
     m_vecSuggestWindowPos = ImGui::GetItemRectMin();
     m_vecSuggestWindowPos.y += ImGui::GetItemRectSize().y;
-    m_vecSuggestWindowSize = ImVec2(500, nPad + std::clamp(static_cast<int>(m_vsvSuggest.size()) * 18, 37, 122));
+    m_vecSuggestWindowSize = ImVec2(600, nPad + std::clamp(static_cast<int>(m_vsvSuggest.size()) * 18, 37, 122));
 
     ImGui::SameLine();
     if (ImGui::Button("Submit"))
@@ -427,7 +427,7 @@ void CConsole::FindFromPartial(void)
                         {
                             ConVar* pConVar = reinterpret_cast<ConVar*>(pCommandBase);
 
-                            svValue = "= ["; // Assign default value to string if its a ConVar.
+                            svValue = " = ["; // Assign default value to string if its a ConVar.
                             svValue.append(pConVar->GetString());
                             svValue.append("]");
                         }
@@ -438,7 +438,7 @@ void CConsole::FindFromPartial(void)
                                 std::string svHelpText = pCommandBase->GetHelpText();
                                 if (!svHelpText.empty())
                                 {
-                                    svValue.append(" | \"" + svHelpText + "\"");
+                                    svValue.append(" - \"" + svHelpText + "\"");
                                 }
                             }
                             if (pCommandBase->GetUsageText())
@@ -446,13 +446,13 @@ void CConsole::FindFromPartial(void)
                                 std::string svUsageText = pCommandBase->GetUsageText();
                                 if (!svUsageText.empty())
                                 {
-                                    svValue.append(" | \"" + svUsageText + "\"");
+                                    svValue.append(" - \"" + svUsageText + "\"");
                                 }
                             }
                         }
                     }
 
-                    m_vsvSuggest.push_back(g_vsvAllConVars[i] + " " + svValue + "");
+                    m_vsvSuggest.push_back(g_vsvAllConVars[i] + svValue);
                 }
             }
         }
@@ -868,7 +868,7 @@ void CConsole::SetStyleVar(void)
     style.ItemSpacing       = ImVec2(4, 4);
     style.FramePadding      = ImVec2(4, 4);
     style.WindowPadding     = ImVec2(5, 5);
-    style.WindowMinSize = ImVec2(518, 518);
+    style.WindowMinSize = ImVec2(618, 518);
 }
 
 CConsole* g_pIConsole = new CConsole();
diff --git a/r5dev/tier0/IConVar.cpp b/r5dev/tier0/IConVar.cpp
index 5447fe88..2848df81 100644
--- a/r5dev/tier0/IConVar.cpp
+++ b/r5dev/tier0/IConVar.cpp
@@ -453,7 +453,7 @@ void ConVar::SetDefault(const char* pszDefault)
 //-----------------------------------------------------------------------------
 void ConVar::ChangeStringValue(const char* pszTempVal, float flOldValue)
 {
-	assert(!(m_ConCommandBase.m_nFlags & FCVAR_NEVER_AS_STRING));
+	assert(!(m_nFlags & FCVAR_NEVER_AS_STRING));
 
 	char* pszOldValue = (char*)_malloca(m_Value.m_iStringLength);
 	if (pszOldValue != NULL)