Resolve baseviewmodel_shared.cpp.rej

mp/src/game/shared/baseviewmodel_shared.cpp

@@ -407,7 +407,7 @@ void CBaseViewModel::CalcViewModelView( CBasePlayer *owner, const Vector& eyePos
 	}
 	// Add model-specific bob even if no weapon associated (for head bob for off hand models)
 	AddViewModelBob( owner, vmorigin, vmangles );
-#if !defined ( CSTRIKE_DLL )
+#if !defined ( CSTRIKE_DLL ) || !defined ( HL2SB )
 	// This was causing weapon jitter when rotating in updated CS:S; original Source had this in above InPrediction block  07/14/10
 	// Add lag
 	CalcViewModelLag( vmorigin, vmangles, vmangoriginal );
@@ -416,6 +416,11 @@ void CBaseViewModel::CalcViewModelView( CBasePlayer *owner, const Vector& eyePos
 #if defined( CLIENT_DLL )
 	if ( !prediction->InPrediction() )
 	{
+#if defined( HL2SB )
+		//Andrew; See https://developer.valvesoftware.com/wiki/Viewmodel_Prediction_Fix
+		// Add lag
+		CalcViewModelLag( vmorigin, vmangles, vmangoriginal );
+#endif
 		// Let the viewmodel shake at about 10% of the amplitude of the player's view
 		vieweffects->ApplyShake( vmorigin, vmangles, 0.1 );	
 	}