TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc warn fixes

Browse source 
parser had a few spots where it was throwing int compares to ints instead of bools for logical and/ors. not bitwise ones.
_dumpDirectories had a stray itterator dupe
This commit is contained in:
AzaezelX 2023-04-08 12:39:09 -05:00
parent c6a1a42cf0
commit a956264bbc
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/console/compiledEval.cpp
View file

@ -564,9 +564,9 @@ TORQUE_NOINLINE void doSlowIntegerOp()
// Logical Op
if constexpr (Op == IntegerOperation::LogicalAnd)
stack[_STK - 1].setInt(a.getInt() && b.getInt());
stack[_STK - 1].setBool(a.getInt() && b.getInt());
if constexpr (Op == IntegerOperation::LogicalOr)
stack[_STK - 1].setInt(a.getInt() || b.getInt());
stack[_STK - 1].setBool(a.getInt() || b.getInt());
_STK--;
}
@ -593,9 +593,9 @@ TORQUE_FORCEINLINE void doIntOperation()
// Logical Op
if constexpr (Op == IntegerOperation::LogicalAnd)
stack[_STK - 1].setFastInt(a.getFastInt() && b.getFastInt());
stack[_STK - 1].setBool(a.getFastInt() && b.getFastInt());
if constexpr (Op == IntegerOperation::LogicalOr)
stack[_STK - 1].setFastInt(a.getFastInt() || b.getFastInt());
stack[_STK - 1].setBool(a.getFastInt() || b.getFastInt());
_STK--;
}
@ -1344,7 +1344,7 @@ ConsoleValue CodeBlock::exec(U32 ip, const char* functionName, Namespace* thisNa
break;
case OP_NOT:
stack[_STK].setInt(!stack[_STK].getInt());
stack[_STK].setBool(!stack[_STK].getInt());
break;
case OP_NOTF: