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

scripted_sequence: Further fixes involving changing of trigger-targets mid triggering.

Browse source
This commit is contained in:
Marco Cawthorne 2020-09-10 20:24:51 +02:00
parent 0f4b31c5f1
commit 9d2a561782
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gs-entbase/server/basemonster.cpp
View file

@ -334,19 +334,24 @@ CBaseMonster::ClearRoute(void)
void
CBaseMonster::FreeState(void)
{
string to_trigger;
m_flSequenceEnd = 0;
m_iSequenceState = SEQUENCESTATE_NONE;
/* we're clearing m_strRouteEnded early, because m_strRouteEnded
might change when .Trigger is executed. It could be another scripted
sequence triggering another sequence. Hence the caching */
to_trigger = m_strRouteEnded;
m_strRouteEnded = __NULL__;
/* trigger when required */
if (m_strRouteEnded) {
for (entity f = world; (f = find(f, ::targetname, m_strRouteEnded));) {
if (to_trigger) {
for (entity f = world; (f = find(f, ::targetname, to_trigger));) {
CBaseTrigger trigger = (CBaseTrigger)f;
if (trigger.Trigger != __NULL__) {
trigger.Trigger(this, TRIG_TOGGLE);
}
}
/* we're done triggering things! give it up! */
m_strRouteEnded = "";
}
if (m_iSequenceRemove) {

30
src/gs-entbase/server/scripted_sequence.cpp
View file

@ -108,6 +108,13 @@ scripted_sequence::RunOnEntity(entity targ)
f = (CBaseMonster)targ;
if (!m_iEnabled)
return;
/* aaaaand it's gone */
if (!(spawnflags & SSFL_REPEATABLE))
m_iEnabled = FALSE;
dprint(sprintf("\tName: %s\n", targetname));
dprint(sprintf("\tTarget: %s\n", m_strMonster));
dprint(sprintf("\tStarted: %f\n", time));
@ -125,6 +132,9 @@ scripted_sequence::RunOnEntity(entity targ)
if (target) {
dprint(sprintf("\tTrigger when finished: %s\n", target));
f.m_strRouteEnded = target;
} else {
/* make sure we're not about to trigger _anything_ */
f.m_strRouteEnded = __NULL__;
}
/* mark us as having been used, for multisources. */
@ -190,9 +200,6 @@ scripted_sequence::Trigger(entity act, int unused)
{
CBaseMonster f;
if (!m_iEnabled)
return;
dprint(sprintf("^2scripted_sequence::^3Trigger^7: with spawnflags %d\n", spawnflags));
f = (CBaseMonster)find(world, ::targetname, m_strMonster);
@ -212,9 +219,9 @@ scripted_sequence::Trigger(entity act, int unused)
}
}
/* aaaaand it's gone */
if (!(spawnflags & SSFL_REPEATABLE))
m_iEnabled = FALSE;
/* we already ARE on a sequence. */
if (f.m_iSequenceState != SEQUENCESTATE_NONE)
return;
RunOnEntity((entity)f);
}
@ -254,15 +261,16 @@ scripted_sequence::InitIdle(void)
void
scripted_sequence::touch(void)
{
CBaseMonster f;
if (other.classname != m_strMonster)
return;
if (!m_iEnabled)
return;
f = (CBaseMonster)other;
/* aaaaand it's gone */
if (!(spawnflags & SSFL_REPEATABLE))
m_iEnabled = FALSE;
/* we already ARE on a sequence. */
if (f.m_iSequenceState != SEQUENCESTATE_NONE)
return;
RunOnEntity(other);
}