From fd2b7ab6495da7942c69d5a0ac490ceedb3ddf94 Mon Sep 17 00:00:00 2001 From: Sour Date: Wed, 23 Jan 2019 23:59:59 -0500 Subject: [PATCH] Fixed compilation warnings --- Core/EmulationSettings.h | 1 + Windows/DirectInputManager.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/EmulationSettings.h b/Core/EmulationSettings.h index 952eb2bb..92d84874 100644 --- a/Core/EmulationSettings.h +++ b/Core/EmulationSettings.h @@ -1342,6 +1342,7 @@ public: case 3: return 1.25; case 4: return 1.5; } + return 1; } void SetZapperDetectionRadius(uint32_t detectionRadius) diff --git a/Windows/DirectInputManager.cpp b/Windows/DirectInputManager.cpp index 7cc282b8..96006b8f 100644 --- a/Windows/DirectInputManager.cpp +++ b/Windows/DirectInputManager.cpp @@ -354,7 +354,7 @@ bool DirectInputManager::IsPressed(int port, int button) DIJOYSTATE2& state = _joysticks[port].state; DIJOYSTATE2& defaultState = _joysticks[port].defaultState; - int deadRange = 500 * _console->GetSettings()->GetControllerDeadzoneRatio(); + int deadRange = (int)(500 * _console->GetSettings()->GetControllerDeadzoneRatio()); int povDirection = state.rgdwPOV[0] / 4500; bool povCentered = (LOWORD(state.rgdwPOV[0]) == 0xFFFF) || povDirection >= 8;