tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

NSTrigger: ensure killtarget is transferred on delayed triggers. Also double check a target is specified before we attempt to search for entities to trigger.

This commit is contained in:
Marco Cawthorne 2024-03-04 18:42:48 -08:00
parent d405ff7e90
commit 86cfec6e6d
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/NSTrigger.qc
View File

@ -101,16 +101,24 @@ NSTrigger::UseTargets(entity act, int state, float triggerDelay)
if (triggerDelay > 0.0f) {
EntLog("Scheduling trigger of %S in %f seconds.", target, triggerDelay);
NSTrigger eTimer = spawn(NSTrigger);
eTimer.netname = sprintf("%s_%d_target_trigger", classname, num_for_edict(this));
eTimer.owner = act;
eTimer.think = Entities_UseTargets_Think;
eTimer.target = target;
eTimer.nextthink = time + triggerDelay;
eTimer.health = state; /* ugly */
if (m_strKillTarget) {
EntLog("Will kill %S before that happens.", m_strKillTarget);
}
eTimer.m_strKillTarget = m_strKillTarget;
eTimer.m_strMessage = m_strMessage;
} else {
if (m_strMessage) {
env_message_single(act, m_strMessage);
}
if (HasTriggerTarget() == true)
for (entity f = world; (f = find(f, ::targetname, target));) {
NSTrigger trigger = (NSTrigger)f;