TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 00:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ConsoleValue improvements

Browse source
This commit is contained in:
Lukas Aldershaab 2023-04-23 00:15:21 +02:00
parent 89b0c7f73b
commit e28e24a802
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/console.cpp
View file

@ -72,7 +72,7 @@ char* ConsoleValue::convertToBuffer() const
const char* ConsoleValue::getConsoleData() 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; ConsoleDocFragment* ConsoleDocFragment::smFirst;

5
Engine/source/console/console.h
View file

@ -128,6 +128,7 @@ enum ConsoleValueType
struct ConsoleValueConsoleType struct ConsoleValueConsoleType
{ {
S32 consoleType;
void* dataPtr; void* dataPtr;
EnumTable* enumTable; EnumTable* enumTable;
}; };
@ -340,8 +341,8 @@ public:
TORQUE_FORCEINLINE void setConsoleData(S32 consoleType, void* dataPtr, const EnumTable* enumTable) TORQUE_FORCEINLINE void setConsoleData(S32 consoleType, void* dataPtr, const EnumTable* enumTable)
{ {
cleanupData(); cleanupData();
type = ConsoleValueType::cvSTEntry; type = ConsoleValueType::cvConsoleValueType;
ct = new ConsoleValueConsoleType{ dataPtr, const_cast<EnumTable*>(enumTable) }; ct = new ConsoleValueConsoleType{ consoleType, dataPtr, const_cast<EnumTable*>(enumTable) };
} }
TORQUE_FORCEINLINE S32 getType() const TORQUE_FORCEINLINE S32 getType() const