diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index c00da4351..3612bb0bf 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.h @@ -168,7 +168,7 @@ class ConsoleValue } else if (type == ConsoleValueType::cvString) { - if (s && s[0]) + if (s != StringTable->EmptyString()) dFree(s); } type = ConsoleValueType::cvNULL; @@ -181,63 +181,6 @@ public: s = const_cast(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) { switch (ref.type)