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

Update console.h

Browse source
This commit is contained in:
marauder2k7 2025-05-09 09:57:30 +01:00
parent 8176145aaa
commit dc16c50e4e
1 changed files with 1 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,7 @@ class ConsoleValue
} }
else if (type == ConsoleValueType::cvString) else if (type == ConsoleValueType::cvString)
{ {
if (s && s[0]) if (s != StringTable->EmptyString())
dFree(s); dFree(s);
} }
type = ConsoleValueType::cvNULL; type = ConsoleValueType::cvNULL;
@ -181,63 +181,6 @@ public:
s = const_cast<char*>(StringTable->EmptyString()); s = const_cast<char*>(StringTable->EmptyString());
} }
ConsoleValue(ConsoleValue&& ref) noexcept
{
if (ref.type == ConsoleValueType::cvNULL)
{
std::cout << "Cannot Move a variable twice!";
return;
}
switch (ref.type)
{
case cvInteger:
setInt(ref.i);
break;
case cvFloat:
setFloat(ref.f);
break;
case cvSTEntry:
setStringTableEntry(ref.s);
break;
case cvString:
setString(ref.s);
break;
default:
setConsoleData(ref.ct->consoleType, ref.ct->dataPtr, ref.ct->enumTable);
break;
}
ref.cleanupData();
}
TORQUE_FORCEINLINE ConsoleValue& operator=(ConsoleValue&& ref) noexcept
{
if (ref.type == ConsoleValueType::cvNULL)
{
std::cout << "Cannot Move a variable twice!";
return *this;
}
switch (ref.type)
{
case cvInteger:
setInt(ref.i);
break;
case cvFloat:
setFloat(ref.f);
break;
case cvSTEntry:
setStringTableEntry(ref.s);
break;
case cvString:
setString(ref.s);
break;
default:
setConsoleData(ref.ct->consoleType, ref.ct->dataPtr, ref.ct->enumTable);
break;
}
ref.cleanupData();
return *this;
}
ConsoleValue(const ConsoleValue& ref) ConsoleValue(const ConsoleValue& ref)
{ {
switch (ref.type) switch (ref.type)