From 53e78c503e6e9c7d15e2eefc480755fe37dd7077 Mon Sep 17 00:00:00 2001 From: Joe Ludwig Date: Thu, 15 May 2014 13:59:18 -0700 Subject: General: * Upgraded Steamworks SDK to v1.29 * Fixed mod compatibility problem with Multiplayer Base that was introduced in September. * In Hammer, while using the Vertex Tool, pressing CTRL+B will snap selected vertices to the grid. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Virtual Reality: * Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled. * VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode. Windows: * Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line. OSX: * Upgraded to XCode 5. --- mp/src/game/client/c_baseanimating.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mp/src/game/client/c_baseanimating.cpp') 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() ) ); -- cgit v1.2.3