From c3827174e9af59751d3a37475c9f88399783d21e Mon Sep 17 00:00:00 2001 From: superp00t Date: Thu, 24 Aug 2023 22:40:26 -0400 Subject: [PATCH] fix(console): forward declare command handlers --- src/console/CVar.cpp | 8 +++++++- src/console/CVar.hpp | 7 +++++-- src/util/SFile.cpp | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/console/CVar.cpp b/src/console/CVar.cpp index 987e5cb..3f5c0f6 100644 --- a/src/console/CVar.cpp +++ b/src/console/CVar.cpp @@ -160,6 +160,7 @@ bool CVar::Reset() { } this->InternalSet(value.GetString(), true, false, false, true); + return true; } bool CVar::Default() { @@ -200,7 +201,7 @@ int32_t CVar::Load(HOSFILE file) { char* data = nullptr; if (0x1fff < size) { - data = SMemAlloc(size + 1, __FILE__, __LINE__, 0); + data = reinterpret_cast(SMemAlloc(size + 1, __FILE__, __LINE__, 0)); } else { data = fastData; } @@ -261,6 +262,11 @@ int32_t CVar::Load(const char* filename) { return result; } +int32_t SetCommandHandler(const char* command, const char* arguments); +int32_t CvarResetCommandHandler(const char* command, const char* arguments); +int32_t CvarDefaultCommandHandler(const char* command, const char* arguments); +int32_t CvarListCommandHandler(const char* command, const char* arguments); + void CVar::Initialize(const char* filename) { STORM_ASSERT(filename); s_filename = filename; diff --git a/src/console/CVar.hpp b/src/console/CVar.hpp index 2815318..0d42e97 100644 --- a/src/console/CVar.hpp +++ b/src/console/CVar.hpp @@ -44,8 +44,11 @@ class CVar : public TSHashObject { int32_t Update(); }; + +int32_t SetCommandHandler(const char* command, const char* arguments); +int32_t CvarResetCommandHandler(const char* command, const char* arguments); +int32_t CvarDefaultCommandHandler(const char* command, const char* arguments); +int32_t CvarListCommandHandler(const char* command, const char* arguments); int32_t CvarCommandHandler(const char* command, const char* arguments); -int32_t CvarListCommandHandler(const char* command, const char* arguments); - #endif diff --git a/src/util/SFile.cpp b/src/util/SFile.cpp index 7ea543c..07babb4 100644 --- a/src/util/SFile.cpp +++ b/src/util/SFile.cpp @@ -166,4 +166,5 @@ int32_t SFile::GetBasePath(char* buffer, size_t bufferchars) { int32_t SFile::GetDataPath(char* buffer, size_t bufferchars) { SStrCopy(buffer, s_datapath, bufferchars); + return 1; }