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

compile fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-03-31 22:10:55 -04:00
parent 50df52ecfc
commit 02447f0996
20 changed files with 3207 additions and 3168 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/console/codeBlock.cpp
View file

@ -565,7 +565,7 @@ bool CodeBlock::compile(const char *codeFileName, StringTableEntry fileName, con
return true;
}
void CodeBlock::compileExec(StringTableEntry fileName, const char *inString, ConsoleValue &returnValue, bool noCalls, S32 setFrame)
ConsoleValue CodeBlock::compileExec(StringTableEntry fileName, const char *inString, bool noCalls, S32 setFrame)
{
AssertFatal(Con::isMainThread(), "Compiling code on a secondary thread");
@ -619,7 +619,7 @@ void CodeBlock::compileExec(StringTableEntry fileName, const char *inString, Con
if (!gStatementList)
{
delete this;
return;
return std::move(ConsoleValue());
}
resetTables();
@ -653,7 +653,7 @@ void CodeBlock::compileExec(StringTableEntry fileName, const char *inString, Con
if (lastIp + 1 != codeSize)
Con::warnf(ConsoleLogEntry::General, "precompile size mismatch, precompile: %d compile: %d", codeSize, lastIp);
exec(0, fileName, NULL, 0, 0, noCalls, NULL, returnValue, setFrame);
return std::move(exec(0, fileName, NULL, 0, 0, noCalls, NULL, setFrame));
}
//-------------------------------------------------------------------------