Merge e7b5c6be51

dlls/bigmomma.cpp

@@ -411,7 +411,7 @@ void CBigMomma::SetYawSpeed( void )
 {
 	int ys;
 
-	switch ( m_Activity )
+	switch( m_Activity )
 	{
 	case ACT_IDLE:
 		ys = 100;

dlls/crowbar.cpp

@@ -219,6 +219,12 @@ int CCrowbar::Swing( int fFirst )
 		fDidHit = TRUE;
 		CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
 
+		// play thwack, smack, or dong sound
+                float flVol = 1.0;
+                int fHitWorld = TRUE;
+
+		if( pEntity )
+		{
 			ClearMultiDamage();
 			// If building with the clientside weapon prediction system,
 			// UTIL_WeaponTimeBase() is always 0 and m_flNextPrimaryAttack is >= -1.0f, thus making
@@ -239,12 +245,6 @@ int CCrowbar::Swing( int fFirst )
 			}
 			ApplyMultiDamage( m_pPlayer->pev, m_pPlayer->pev );
 
-		// play thwack, smack, or dong sound
-		float flVol = 1.0;
-		int fHitWorld = TRUE;
-
-		if( pEntity )
-		{
 			if( pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE )
 			{
 				// play thwack or smack sound