diff --git a/src/g_levellocals.h b/src/g_levellocals.h index 57fa440b9b..afa6dd454b 100644 --- a/src/g_levellocals.h +++ b/src/g_levellocals.h @@ -600,7 +600,6 @@ public: int airsupply; int DefaultEnvironment; // Default sound environment. - int ActiveSequences; DSeqNode *SequenceListHead; // [RH] particle globals diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index 63b3fe9a6d..55c04c944b 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -932,7 +932,6 @@ void FLevelLocals::Serialize(FSerializer &arc, bool hubload) Thinkers.DestroyAllThinkers(); interpolator.ClearInterpolations(); arc.ReadObjects(hubload); - ActiveSequences = 0; } arc("multiplayer", multiplayer); diff --git a/src/s_sndseq.cpp b/src/s_sndseq.cpp index 3d5b347e1f..a9bfda24e5 100644 --- a/src/s_sndseq.cpp +++ b/src/s_sndseq.cpp @@ -406,7 +406,6 @@ void DSeqNode::OnDestroy() m_Next->m_Prev = m_Prev; GC::WriteBarrier(m_Next, m_Prev); } - Level->ActiveSequences--; Super::OnDestroy(); } @@ -827,7 +826,6 @@ void DSeqNode::ActivateSequence (int sequence) m_CurrentSoundID = 0; m_Volume = 1; // Start at max volume... m_Atten = ATTN_IDLE; // ...and idle attenuation - Level->ActiveSequences++; } DSeqActorNode::DSeqActorNode (AActor *actor, int sequence, int modenum) @@ -1323,7 +1321,6 @@ void DSeqNode::Tick () int seqnum = FindSequence (ENamedName(m_SequencePtr[i*2+1])); if (seqnum >= 0) { // Found a match, and it's a good one too. - Level->ActiveSequences--; ActivateSequence (seqnum); break; } @@ -1358,7 +1355,7 @@ void SN_UpdateActiveSequences (FLevelLocals *Level) { DSeqNode *node; - if (!Level->ActiveSequences || paused) + if (paused) { // No sequences currently playing/game is paused return; }