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

scripted_sequence & multi_manager: Mark both their return values as positive once they've triggered their targets only.

Browse source
This commit is contained in:
Marco Cawthorne 2022-05-04 13:59:10 -07:00
parent f9c7807c1f
commit 299b2eed72
Signed by: eukara
GPG key ID: C196CD8BA993248A
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gs-entbase/server/multi_manager.qc
View file

@ -198,6 +198,7 @@ multi_manager::Trigger(entity act, int state)
dprint(sprintf("^2%s::^3Trigger^7: %s (%s)\n", dprint(sprintf("^2%s::^3Trigger^7: %s (%s)\n",
this.classname, wow.target, eFind.classname)); this.classname, wow.target, eFind.classname));
m_iValue = TRUE;
UseTargets(wow.m_eActivator, TRIG_TOGGLE, 0.0f); UseTargets(wow.m_eActivator, TRIG_TOGGLE, 0.0f);
} }
@ -221,8 +222,8 @@ multi_manager::Trigger(entity act, int state)
continue; continue;
m_eTriggers[i].think = mm_enttrigger; m_eTriggers[i].think = mm_enttrigger;
m_eTriggers[i].m_iValue = FALSE;
m_eTriggers[i].nextthink = time + m_eTriggers[i].m_flUntilTriggered; m_eTriggers[i].nextthink = time + m_eTriggers[i].m_flUntilTriggered;
m_eTriggers[i].m_iValue = TRUE;
m_eTriggers[i].m_eActivator = act; m_eTriggers[i].m_eActivator = act;
} }
} }

7
src/gs-entbase/server/scripted_sequence.qc
View file

@ -187,13 +187,16 @@ scripted_sequence::RunOnEntity(entity targ)
if (target) { if (target) {
dprint(sprintf("\tTrigger when finished: %s\n", target)); dprint(sprintf("\tTrigger when finished: %s\n", target));
f.m_strRouteEnded = target; f.m_strRouteEnded = target;
f.m_ssLast = this;
m_iValue = FALSE; /* will be marked as used once triggered */
} else { } else {
/* make sure we're not about to trigger _anything_ */ /* make sure we're not about to trigger _anything_ */
f.m_strRouteEnded = __NULL__; f.m_strRouteEnded = __NULL__;
f.m_ssLast = __NULL__;
/* mark us as having been used, for multisources. */
m_iValue = TRUE;
} }
/* mark us as having been used, for multisources. */
m_iValue = TRUE;
/* mark the state */ /* mark the state */
f.m_iSequenceState = SEQUENCESTATE_ACTIVE; f.m_iSequenceState = SEQUENCESTATE_ACTIVE;

1
src/gs-entbase/shared/NSMonster.h
View file

@ -183,6 +183,7 @@ typedef enum
class NSMonster:NSSurfacePropEntity class NSMonster:NSSurfacePropEntity
{ {
#ifdef SERVER #ifdef SERVER
entity m_ssLast;
vector oldnet_velocity; vector oldnet_velocity;
float m_flPitch; float m_flPitch;
int m_iFlags; int m_iFlags;

6
src/gs-entbase/shared/NSMonster.qc
View file

@ -338,11 +338,17 @@ NSMonster::FreeState(void)
m_iSequenceState = SEQUENCESTATE_NONE; m_iSequenceState = SEQUENCESTATE_NONE;
m_iSequenceFlags = 0; m_iSequenceFlags = 0;
if (m_ssLast) {
scripted_sequence seq = (scripted_sequence)m_ssLast;
seq.m_iValue = TRUE;
}
/* we're clearing m_strRouteEnded early, because m_strRouteEnded /* we're clearing m_strRouteEnded early, because m_strRouteEnded
might change when .Trigger is executed. It could be another scripted might change when .Trigger is executed. It could be another scripted
sequence triggering another sequence. Hence the caching */ sequence triggering another sequence. Hence the caching */
to_trigger = m_strRouteEnded; to_trigger = m_strRouteEnded;
m_strRouteEnded = __NULL__; m_strRouteEnded = __NULL__;
m_ssLast = __NULL__;
/* trigger when required */ /* trigger when required */
if (to_trigger) { if (to_trigger) {