TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into aiSubsystem

Browse source
This commit is contained in:
AzaezelX 2025-05-03 15:25:36 -05:00
commit 4ba93dafc3
48 changed files with 2382 additions and 3705 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,15 @@ DefineEngineFunction( isObject, bool, (const char * objectName), ,"isObject(obje
if (!String::compare(objectName, "0") || !String::compare(objectName, ""))
return false;
else
return (Sim::findObject(objectName) != NULL);
{
SimObject* obj= Sim::findObject(objectName);
if (obj)
{
if (!obj->isProperlyAdded() || obj->isRemoved())
obj = NULL;
}
return obj != NULL;
}
}
ConsoleDocFragment _spawnObject1(

3
Engine/source/console/simObject.cpp
View file

@ -3296,6 +3296,9 @@ DefineEngineMethod( SimObject, getGroup, SimGroup*, (),,
DefineEngineMethod( SimObject, delete, void, (),,
"Delete and remove the object." )
{
if (!object->isProperlyAdded() || object->isRemoved())
return;
object->deleteObject();
}