aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/client/c_baseanimating.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'mp/src/game/client/c_baseanimating.cpp')
-rw-r--r--mp/src/game/client/c_baseanimating.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/mp/src/game/client/c_baseanimating.cpp b/mp/src/game/client/c_baseanimating.cpp
index c7cc08b4..c41ff46b 100644
--- a/mp/src/game/client/c_baseanimating.cpp
+++ b/mp/src/game/client/c_baseanimating.cpp
@@ -3687,6 +3687,8 @@ void C_BaseAnimating::FireEvent( const Vector& origin, const QAngle& angles, int
if ( token )
{
const char* mtoken = ModifyEventParticles( token );
+ if ( !mtoken || mtoken[0] == '\0' )
+ return;
Q_strncpy( szParticleEffect, mtoken, sizeof(szParticleEffect) );
}
@@ -5298,8 +5300,8 @@ void C_BaseAnimating::ResetSequenceInfo( void )
m_bSequenceFinished = false;
m_flLastEventCheck = 0;
- m_nNewSequenceParity = ( ++m_nNewSequenceParity ) & EF_PARITY_MASK;
- m_nResetEventsParity = ( ++m_nResetEventsParity ) & EF_PARITY_MASK;
+ m_nNewSequenceParity = ( m_nNewSequenceParity + 1 ) & EF_PARITY_MASK;
+ m_nResetEventsParity = ( m_nResetEventsParity + 1 ) & EF_PARITY_MASK;
// FIXME: why is this called here? Nothing should have changed to make this nessesary
SetEventIndexForSequence( pStudioHdr->pSeqdesc( GetSequence() ) );