From 9b2f4976c980621142bbddaac97818cc2e0560ca Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Sat, 4 Sep 2021 22:00:32 -0400 Subject: [PATCH] small regression fix. --- Engine/source/console/compiledEval.cpp | 4 ++-- Engine/source/console/test/ScriptTest.cpp | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Engine/source/console/compiledEval.cpp b/Engine/source/console/compiledEval.cpp index c8b1547a1..378afd290 100644 --- a/Engine/source/console/compiledEval.cpp +++ b/Engine/source/console/compiledEval.cpp @@ -2002,7 +2002,7 @@ ConsoleValue CodeBlock::exec(U32 ip, const char* functionName, Namespace* thisNa break; } - stack[_STK + 1].setInt(result); + stack[_STK + 1].setFloat(result); _STK++; break; } @@ -2139,7 +2139,7 @@ ConsoleValue CodeBlock::exec(U32 ip, const char* functionName, Namespace* thisNa { bool isGlobal = code[ip]; - U32 failIp = code[ip + isGlobal ? 3 : 2]; + U32 failIp = code[ip + (isGlobal ? 3 : 2)]; IterStackRecord& iter = iterStack[_ITER]; iter.mIsGlobalVariable = isGlobal; diff --git a/Engine/source/console/test/ScriptTest.cpp b/Engine/source/console/test/ScriptTest.cpp index d42c4fe73..a2295f774 100644 --- a/Engine/source/console/test/ScriptTest.cpp +++ b/Engine/source/console/test/ScriptTest.cpp @@ -950,6 +950,24 @@ TEST(Script, MiscRegressions) )"); ASSERT_STREQ(regression3.getString(), "120 20"); + + ConsoleValue regression4 = RunScript(R"( + function doTest() + { + %slider = new GuiSliderCtrl() + { + range = "0 2"; + ticks = 5; + active = true; + }; + + %slider.setValue(0.5); + return %slider.getValue(); + } + return doTest(); + )"); + + ASSERT_EQ(regression4.getFloat(), 0.5); } #endif