TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #577 from JeffProgrammer/ts-objectcopyfailures

Browse source 
Reimplement object copy failures.
This commit is contained in:
Brian Roberts 2021-09-13 20:06:24 -05:00 • committed by GitHub
commit 328319b853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,6 +142,7 @@ namespace Con
// console variables. // console variables.
extern StringTableEntry gCurrentFile; extern StringTableEntry gCurrentFile;
extern StringTableEntry gCurrentRoot; extern StringTableEntry gCurrentRoot;
extern S32 gObjectCopyFailures;
} }
namespace Con namespace Con
@ -972,7 +973,11 @@ ConsoleValue CodeBlock::exec(U32 ip, const char* functionName, Namespace* thisNa
} }
else else
{ {
Con::errorf(ConsoleLogEntry::General, "%s: Unable to find parent object %s for %s.", getFileLine(ip - 1), objParent, callArgv[1].getString()); if (Con::gObjectCopyFailures == -1)
Con::errorf(ConsoleLogEntry::General, "%s: Unable to find parent object %s for %s.", getFileLine(ip - 1), objParent, callArgv[1].getString());
else
++Con::gObjectCopyFailures;
delete object; delete object;
currentNewObject = NULL; currentNewObject = NULL;
ip = failJump; ip = failJump;

4
Engine/source/console/console.cpp
View file

@ -300,6 +300,7 @@ Con::ConsoleInputEvent smConsoleInput;
/// ///
StringTableEntry gCurrentFile; StringTableEntry gCurrentFile;
StringTableEntry gCurrentRoot; StringTableEntry gCurrentRoot;
S32 gObjectCopyFailures = -1;
/// @} /// @}
bool alwaysUseDebugOutput = true; bool alwaysUseDebugOutput = true;
@ -373,6 +374,9 @@ void init()
"@ingroup Console\n"); "@ingroup Console\n");
addVariable( "instantGroup", TypeRealString, &gInstantGroup, "The group that objects will be added to when they are created.\n" addVariable( "instantGroup", TypeRealString, &gInstantGroup, "The group that objects will be added to when they are created.\n"
"@ingroup Console\n"); "@ingroup Console\n");
addVariable("Con::objectCopyFailures", TypeS32, &gObjectCopyFailures, "If greater than zero then it counts the number of object creation "
"failures based on a missing copy object and does not report an error..\n"
"@ingroup Console\n");
// Current script file name and root // Current script file name and root
addVariable( "Con::File", TypeString, &gCurrentFile, "The currently executing script file.\n" addVariable( "Con::File", TypeString, &gCurrentFile, "The currently executing script file.\n"