TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-09 05:34:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/development' into development

Browse source
This commit is contained in:
marauder2k7 2026-03-06 07:00:24 +00:00
commit d76b8bd5b0
14 changed files with 55 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/AI/AIController.h
View file

@ -74,7 +74,7 @@ public:
{
if (mCover && mCover->mPosSet && mCover->getPosition() == loc)
{
mCover->mRadius == rad;
mCover->mRadius = rad;
return;
}
delete(mCover); mCover = new AICover(this, loc, rad);
@ -83,7 +83,7 @@ public:
{
if (mCover && mCover->mObj == objIn)
{
mCover->mRadius == rad;
mCover->mRadius = rad;
return;
}
delete(mCover); mCover = new AICover(this, objIn, rad);

4
Engine/source/T3D/SubScene.cpp
View file

@ -229,12 +229,12 @@ bool SubScene::evaluateCondition()
if (objectName != NULL)
objectName = getIdString();
StringTableEntry groupName = getGroup()->getName();
StringTableEntry groupName = getGroup() ? getGroup()->getName() : NULL;
if (groupName != NULL)
groupName = getGroup()->getIdString();
String context = String::ToString("%s\nGroup: %s, Object: %s", getFilename(), groupName, objectName);
Con::evaluate(command.c_str(), false, context);
Con::evaluate(command.c_str(), false, context.c_str());
return Con::getBoolVariable(resVar.c_str());
}
return true;

4
Engine/source/T3D/missionMarker.cpp
View file

@ -372,12 +372,12 @@ bool SpawnSphere::testCondition()
if (objectName != NULL)
objectName = getIdString();
StringTableEntry groupName = getGroup()->getName();
StringTableEntry groupName = getGroup() ? getGroup()->getName() : NULL;
if (groupName != NULL)
groupName = getGroup()->getIdString();
String context = String::ToString("%s\nGroup: %s, Object: %s", getFilename(), groupName, objectName);
Con::evaluate(command.c_str(), false, context);
Con::evaluate(command.c_str(), false, context.c_str());
if (Con::getBoolVariable(resVar.c_str()) == 1)
{
return true;

6
Engine/source/T3D/trigger.cpp
View file

@ -711,12 +711,12 @@ bool Trigger::testCondition()
if (objectName != NULL)
objectName = getIdString();
StringTableEntry groupName = getGroup()->getName();
StringTableEntry groupName = getGroup() ? getGroup()->getName() : NULL;
if (groupName != NULL)
groupName = getGroup()->getIdString();
String context = String::ToString("%s\nGroup: %s, Object: %s", getFilename(), groupName, objectName);
Con::evaluate(command.c_str(), false, context);
Con::evaluate(command.c_str(), false, context.c_str());
if (Con::getBoolVariable(resVar.c_str()) == 1)
{
return true;
@ -817,7 +817,7 @@ void Trigger::processTick(const Move* move)
if (objectName != NULL)
objectName = getIdString();
StringTableEntry groupName = getGroup()->getName();
StringTableEntry groupName = getGroup() ? getGroup()->getName() : NULL;
if (groupName != NULL)
groupName = getGroup()->getIdString();

2
Engine/source/console/torquescript/codeBlock.cpp
View file

@ -611,7 +611,7 @@ Con::EvalResult CodeBlock::compileExec(StringTableEntry fileName, const char *in
Script::gStatementList = NULL;
// we are an eval compile if we don't have a file name associated (no exec)
gIsEvalCompile = fileName == NULL;
gIsEvalCompile = fileName == NULL || setFrame == 0;
gFuncVars = gIsEvalCompile ? &gEvalFuncVars : &gGlobalScopeFuncVars;
// Set up the parser.

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

@ -38,8 +38,10 @@ namespace TorqueScript
if (fileName)
fileName = StringTable->insert(fileName);
bool fileExec = Torque::FS::IsFile(fileName);
CodeBlock* newCodeBlock = new CodeBlock();
return (newCodeBlock->compileExec(fileName, string, false, fileName ? -1 : 0));
return (newCodeBlock->compileExec(fileName, string, false, fileExec ? -1 : 0));
}
Con::EvalResult TorqueScriptRuntime::evaluate(const char* script, S32 frame, bool echo, const char* fileName)

2
Engine/source/gui/controls/guiGameListMenuCtrl.cpp
View file

@ -976,7 +976,7 @@ void GuiGameListMenuCtrl::doScriptCommand(StringTableEntry command)
setThisControl();
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s\nObject: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
Con::evaluate(command, false, context);
Con::evaluate(command, false, context.c_str());
}
}

2
Engine/source/gui/controls/guiListBoxCtrl.cpp
View file

@ -1541,7 +1541,7 @@ StringTableEntry GuiListBoxCtrl::_makeMirrorItemName( SimObject *inObj )
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
outName = StringTable->insert( Con::evaluate( mMakeNameCallback, false, context).value, true );
outName = StringTable->insert( Con::evaluate( mMakeNameCallback, false, context.c_str()).value, true );
}
else if ( inObj->getName() )
outName = StringTable->insert( inObj->getName() );

15
Engine/source/gui/core/guiControl.cpp
View file

@ -2496,14 +2496,15 @@ const char* GuiControl::evaluate( const char* str )
{
smThisControl = this;
StringTableEntry objectName = getName();
if (getName() == NULL)
objectName = getInternalName();
StringTableEntry fileName = getFilename();
if (fileName != NULL)
fileName = Platform::makeRelativePathName(fileName, NULL);
if (objectName != NULL)
objectName = getIdString();
String context = String::ToString("%s\nObject: %s", fileName, objectName);
const char* result = Con::evaluate(str, false, context).value;
StringTableEntry groupName = getGroup() ? getGroup()->getName() : NULL;
if (groupName != NULL)
groupName = getGroup()->getIdString();
String context = String::ToString("%s\nGroup: %s, Object: %s", getFilename(), groupName, objectName);
const char* result = Con::evaluate(str, false, context.c_str()).value;
smThisControl = NULL;
return result;