zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-22 03:11:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the ActiveSequences counter.

Browse source 
It was only used to avoid traversing the list if all sequences were paused which is an exceptional situation.
On the other hand, the way it counted was not correct so rather than fixing it it seemed more appropriate to remove it entirely.

# Conflicts:
#	src/g_levellocals.h
#	src/s_sndseq.cpp
This commit is contained in:
Christoph Oelckers 2019-02-10 20:30:40 +01:00 committed by drfrag
parent 9a4959c82e
commit 15cf157877
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/s_sndseq.cpp
View file

@ -222,7 +222,6 @@ static bool TwiddleSeqNum (int &sequence, seqtype_t type);
// PUBLIC DATA DEFINITIONS ------------------------------------------------- // PUBLIC DATA DEFINITIONS -------------------------------------------------
FSoundSequencePtrArray Sequences; FSoundSequencePtrArray Sequences;
int ActiveSequences;
DSeqNode *DSeqNode::SequenceListHead; DSeqNode *DSeqNode::SequenceListHead;
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -415,7 +414,6 @@ void DSeqNode::OnDestroy()
m_Next->m_Prev = m_Prev; m_Next->m_Prev = m_Prev;
GC::WriteBarrier(m_Next, m_Prev); GC::WriteBarrier(m_Next, m_Prev);
} }
ActiveSequences--;
Super::OnDestroy(); Super::OnDestroy();
} }
@ -835,8 +833,6 @@ void DSeqNode::ActivateSequence (int sequence)
m_CurrentSoundID = 0; m_CurrentSoundID = 0;
m_Volume = 1; // Start at max volume... m_Volume = 1; // Start at max volume...
m_Atten = ATTN_IDLE; // ...and idle attenuation m_Atten = ATTN_IDLE; // ...and idle attenuation
ActiveSequences++;
} }
DSeqActorNode::DSeqActorNode (AActor *actor, int sequence, int modenum) DSeqActorNode::DSeqActorNode (AActor *actor, int sequence, int modenum)
@ -1331,7 +1327,6 @@ void DSeqNode::Tick ()
int seqnum = FindSequence (ENamedName(m_SequencePtr[i*2+1])); int seqnum = FindSequence (ENamedName(m_SequencePtr[i*2+1]));
if (seqnum >= 0) if (seqnum >= 0)
{ // Found a match, and it's a good one too. { // Found a match, and it's a good one too.
ActiveSequences--;
ActivateSequence (seqnum); ActivateSequence (seqnum);
break; break;
} }
@ -1366,7 +1361,7 @@ void SN_UpdateActiveSequences (void)
{ {
DSeqNode *node; DSeqNode *node;
if (!ActiveSequences || paused) if (paused)
{ // No sequences currently playing/game is paused { // No sequences currently playing/game is paused
return; return;
} }