Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix a1010b83d3 and 8f8996e338

Browse Source 
Fix wrong renaming done in a1010b83d3
Fix missed structure change in 453fe486de

Reported by: SciGuy42 on forum
https://wildfiregames.com/forum/topic/62269-onrange-triggers-in-a25/
Tested by: SciGuy42
Differential revision: D4335
This was SVN commit r25989.
This commit is contained in:
Angen 2021-11-06 11:07:28 +00:00
parent c1cd28c878
commit dc361048aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/simulation/components/Trigger.js
View File

@ -192,7 +192,7 @@ Trigger.prototype.EnableTrigger = function(event, name)
}
const cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
triggerData.timer = cmpTimer.SetInterval(this.entity, IID_Trigger, "DoAction",
triggerData.delay || 0, triggerData.interval, { "name": name });
triggerData.delay || 0, triggerData.interval, { "action": name });
}
else if (event == "OnRange")
{
@ -343,7 +343,7 @@ Trigger.prototype.CallEvent = function(event, eventData)
*/
Trigger.prototype.CallTrigger = function(event, name, eventData, evenIfDisabled = true)
{
if (!this?.[event]?.[name])
if (!this.triggers[event]?.[name])
{
warn(`Trigger.js: called a trigger '${name}' for event '${event}' that wasn't found`);
return;