From e28e24a802f3207da44fc5314c8e89f3b55de651 Mon Sep 17 00:00:00 2001 From: Lukas Aldershaab Date: Sun, 23 Apr 2023 00:15:21 +0200 Subject: [PATCH] ConsoleValue improvements --- Engine/source/console/console.cpp | 2 +- Engine/source/console/console.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index 00165c46e..84ae03ce3 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -72,7 +72,7 @@ char* ConsoleValue::convertToBuffer() const const char* ConsoleValue::getConsoleData() const { - return Con::getData(type, ct->dataPtr, 0, ct->enumTable); + return Con::getData(ct->consoleType, ct->dataPtr, 0, ct->enumTable); } ConsoleDocFragment* ConsoleDocFragment::smFirst; diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index 11293338c..74807c860 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.h @@ -128,6 +128,7 @@ enum ConsoleValueType struct ConsoleValueConsoleType { + S32 consoleType; void* dataPtr; EnumTable* enumTable; }; @@ -340,8 +341,8 @@ public: TORQUE_FORCEINLINE void setConsoleData(S32 consoleType, void* dataPtr, const EnumTable* enumTable) { cleanupData(); - type = ConsoleValueType::cvSTEntry; - ct = new ConsoleValueConsoleType{ dataPtr, const_cast(enumTable) }; + type = ConsoleValueType::cvConsoleValueType; + ct = new ConsoleValueConsoleType{ consoleType, dataPtr, const_cast(enumTable) }; } TORQUE_FORCEINLINE S32 getType() const