From 8c9d067657e55c38346f2dc814e85d68233c7b89 Mon Sep 17 00:00:00 2001
From: Kenix3 <kenixwhisperwind@gmail.com>
Date: Tue, 2 Aug 2022 22:25:27 -0400
Subject: [PATCH] LUS Cleanup: CVars functions are now consistent

---
 libultraship/libultraship/Cvar.cpp | 6 ++----
 libultraship/libultraship/Cvar.h   | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/libultraship/libultraship/Cvar.cpp b/libultraship/libultraship/Cvar.cpp
index d5b3af750..c20aec25a 100644
--- a/libultraship/libultraship/Cvar.cpp
+++ b/libultraship/libultraship/Cvar.cpp
@@ -4,8 +4,6 @@
 #include <functional>
 #include <memory>
 #include <utility>
-#include <PR/ultra64/gbi.h>
-#include "imgui_internal.h"
 
 std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
 
@@ -96,7 +94,7 @@ extern "C" void CVar_SetS32(const char* name, int32_t value) {
     cvar->value.valueS32 = value;
 }
 
-void CVar_SetFloat(const char* name, float value) {
+extern "C" void CVar_SetFloat(const char* name, float value) {
     auto& cvar = cvars[name];
     if (!cvar) {
         cvar = std::make_unique<CVar>();
@@ -111,7 +109,7 @@ extern "C" void CVar_SetString(const char* name, const char* value) {
         cvar = std::make_unique<CVar>();
     }
     cvar->type = CVarType::String;
-    cvar->value.valueStr = ImStrdup(value);
+    cvar->value.valueStr = _strdup(value);
 }
 
 extern "C" void CVar_RegisterRGBA(const char* name, Color_RGBA8 defaultValue) {
diff --git a/libultraship/libultraship/Cvar.h b/libultraship/libultraship/Cvar.h
index b8f294be6..e6225610d 100644
--- a/libultraship/libultraship/Cvar.h
+++ b/libultraship/libultraship/Cvar.h
@@ -32,14 +32,13 @@ extern "C" CVar * CVar_Get(const char* name);
 extern "C"
 {
 #endif
-//#include <ultra64.h>
 
 int32_t CVar_GetS32(const char* name, int32_t defaultValue);
 float CVar_GetFloat(const char* name, float defaultValue);
+void CVar_SetFloat(const char* name, float value);
 const char* CVar_GetString(const char* name, const char* defaultValue);
 void CVar_SetS32(const char* name, int32_t value);
 void CVar_SetString(const char* name, const char* value);
-
 Color_RGB8 CVar_GetRGB(const char* name, Color_RGB8 defaultValue);
 Color_RGBA8 CVar_GetRGBA(const char* name, Color_RGBA8 defaultValue);
 void CVar_SetRGBA(const char* name, Color_RGBA8 value);
@@ -56,11 +55,8 @@ void CVar_RegisterRGBA(const char* name, Color_RGBA8 defaultValue);
 #ifdef __cplusplus
 #include <map>
 #include <string>
-#include <functional>
 #include <memory>
 
-//extern "C" CVar * CVar_Get(const char* name);
 extern std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
-void CVar_SetFloat(const char* name, float value);
 #endif
 #endif