TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more console refactor.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-03-31 21:09:23 -04:00
parent 5e81c021f5
commit 50df52ecfc
15 changed files with 150 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/console/test/ScriptTest.cpp
View file

@ -20,7 +20,6 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#ifdef 0
#ifdef TORQUE_TESTS_ENABLED
#include "testing/unitTesting.h"
#include "platform/platform.h"
@ -32,40 +31,40 @@
#include "console/stringStack.h"
template<typename T>
inline T Convert(ConsoleValueRef);
inline T Convert(ConsoleValue&);
template<>
inline U32 Convert(ConsoleValueRef val)
inline U32 Convert(ConsoleValue &val)
{
return val.getIntValue();
return val.getInt();
}
template<>
inline S32 Convert(ConsoleValueRef val)
inline S32 Convert(ConsoleValue &val)
{
return val.getSignedIntValue();
return val.getInt();
}
template<>
inline bool Convert(ConsoleValueRef val)
inline bool Convert(ConsoleValue &val)
{
return val.getBoolValue();
return val.getBool();
}
template<>
inline F32 Convert(ConsoleValueRef val)
inline F32 Convert(ConsoleValue &val)
{
return val.getFloatValue();
return val.getFloat();
}
template<>
inline const char* Convert(ConsoleValueRef val)
inline const char* Convert(ConsoleValue &val)
{
return val.getStringValue();
return val.getString();
}
template<>
inline SimObject* Convert(ConsoleValueRef val)
inline SimObject* Convert(ConsoleValue &val)
{
return Sim::findObject(val);
}
@ -73,7 +72,7 @@ inline SimObject* Convert(ConsoleValueRef val)
template<typename T>
inline T RunScript(const char* str)
{
return Convert<T>(Con::evaluate(str, false, NULL));
return Convert<T>(std::move(Con::evaluate(str, false, NULL)));
}
TEST(Script, Basic_Arithmetic)
@ -394,4 +393,3 @@ TEST(Script, Basic_Package)
}
#endif
#endif