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

Merge pull request #665 from Azaezel/alpha40/TriggerSelfReferencing

Browse source 
fill out a %this variable for trigger callbacks
This commit is contained in:
Brian Roberts 2021-11-08 14:37:39 -06:00 • committed by GitHub
commit 721f14a284
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -731,7 +731,8 @@ void Trigger::potentialEnterObject(GameBase* enter)
if(evalCmD(&mEnterCommand)) if(evalCmD(&mEnterCommand))
{ {
String command = String("%obj = ") + enter->getIdString() + ";" + mEnterCommand; String command = String("%obj = ") + enter->getIdString() + ";";
command = command + String("%this = ") + getIdString() + ";" + mEnterCommand;
Con::evaluate(command.c_str()); Con::evaluate(command.c_str());
} }
@ -779,7 +780,8 @@ void Trigger::processTick(const Move* move)
if (evalCmD(&mLeaveCommand)) if (evalCmD(&mLeaveCommand))
{ {
String command = String("%obj = ") + remove->getIdString() + ";" + mLeaveCommand; String command = String("%obj = ") + remove->getIdString() + ";";
command = command + String("%this = ") + getIdString() + ";" + mLeaveCommand;
Con::evaluate(command.c_str()); Con::evaluate(command.c_str());
} }
if (testTrippable() && testCondition()) if (testTrippable() && testCondition())