diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-09-30 08:22:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 08:22:14 -0500 |
| commit | a3de996ae7c41bb8d475b47dcd08abdd571cfc73 (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/service/hid/hid.cpp | |
| parent | b07af7dda822898e9c8f231c5ddcd1741d93dbef (diff) | |
| parent | a13ab958cbba75bc9abd1ca50f3030a10a75784e (diff) | |
Merge pull request #2962 from huwpascoe/static_cast
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index aa5d821f9..379fbd71c 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -251,7 +251,7 @@ static void UpdateGyroscopeCallback(u64 userdata, int cycles_late) { Math::Vec3<float> gyro; std::tie(std::ignore, gyro) = motion_device->GetStatus(); double stretch = Core::System::GetInstance().perf_stats.GetLastFrameTimeScale(); - gyro *= gyroscope_coef * stretch; + gyro *= gyroscope_coef * static_cast<float>(stretch); gyroscope_entry.x = static_cast<s16>(gyro.x); gyroscope_entry.y = static_cast<s16>(gyro.y); gyroscope_entry.z = static_cast<s16>(gyro.z); |