Merge 5a13e06f52

dlls/aflock.cpp

@@ -839,11 +839,11 @@ void CFlockingFlyer::SquadRemove( CFlockingFlyer *pRemove )
 		{
 			CFlockingFlyer *pLeader = m_pSquadNext;
 
+			if( pLeader )
+			{
 				// copy the enemy LKP to the new leader
 				pLeader->m_vecEnemyLKP = m_vecEnemyLKP;
 
-			if( pLeader )
-			{
 				CFlockingFlyer *pList = pLeader;
 
 				while( pList )

dlls/client.cpp

@@ -353,7 +353,7 @@ void Host_Say( edict_t *pEntity, int teamonly )
 	}
 
 	// remove quotes if present
-	if( *p == '"' )
+	if( p && *p == '"' )
 	{
 		p++;
 		p[strlen( p ) - 1] = 0;

dlls/plats.cpp

@@ -768,9 +768,11 @@ void CFuncTrain::Next( void )
 		// use CHAN_STATIC for their movement sounds to prevent sound field problems.
 		// this is not a hack or temporary fix, this is how things should be. (sjb).
 		if( pev->noiseMovement )
+		{
 			STOP_SOUND( edict(), CHAN_STATIC, (char*)STRING( pev->noiseMovement ) );
-		if ( pev->noiseMovement )
 			EMIT_SOUND( ENT( pev ), CHAN_STATIC, (char*)STRING( pev->noiseMovement ), m_volume, ATTN_NORM );
+		}
+
 		ClearBits( pev->effects, EF_NOINTERP );
 		SetMoveDone( &CFuncTrain::Wait );
 		LinearMove( pTarg->pev->origin - ( pev->mins + pev->maxs )* 0.5, pev->speed );