vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

NSIO: Prevent firing an output when no activator is set

Browse source
This commit is contained in:
Marco Cawthorne 2023-09-27 00:14:44 -07:00
parent d7ddfc1c87
commit 9518a23f03
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/NSOutput.h
View file

@ -36,6 +36,8 @@ public:
/** Call to trigger the NSOutput's target. */
virtual void TriggerOutput(void);
virtual void ScheduleOutput(entity);
/** Internal use only. */
virtual void Init(void);
/** Internal use only. */

10
src/server/NSOutput.qc
View file

@ -31,6 +31,14 @@ NSOutput::TriggerOutput(void)
m_iCount--;
}
void
NSOutput::ScheduleOutput(entity activatorEnt)
{
m_eActivator = activatorEnt;
think = TriggerOutput;
nextthink = time + m_flDelay;
}
void
NSOutput::Init(void)
{
@ -44,6 +52,8 @@ NSOutput::Respawn(void)
{
/* gotta reset our counter */
m_iCount = m_iOldCount;
nextthink = 0.0f;
think = __NULL__;
}
void

9
src/shared/NSIO.qc
View file

@ -101,7 +101,10 @@ NSIO::Spawned(void)
void
NSIO::UseOutput(entity act, string outname)
{
if (!outname)
if (!outname || outname == "")
return;
if (!act)
return;
for (entity f = world; (f = find(f, ::targetname, outname));) {
@ -112,9 +115,7 @@ NSIO::UseOutput(entity act, string outname)
return;
}
op.m_eActivator = act;
op.think = NSOutput::TriggerOutput;
op.nextthink = time + op.m_flDelay;
op.ScheduleOutput(act);
}
}