diff options
| author | bunnei <bunneidev@gmail.com> | 2016-11-29 23:23:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 23:23:22 -0500 |
| commit | 6cb2b20a6bbf9f2e9f7b8e18d5b4b5ee31f5a872 (patch) | |
| tree | 53ec57b3f82f9326fb629836b99f267b6c421ba1 /src/common/key_map.cpp | |
| parent | be6a3efb017aed766f22c5a8c6a3ae330d384017 (diff) | |
| parent | d16be9bdbd13cf7a2d3ef08dc3eb663b27472e20 (diff) | |
Merge pull request #2233 from Subv/warnings
Build: Fixed a few warnings.
Diffstat (limited to 'src/common/key_map.cpp')
| -rw-r--r-- | src/common/key_map.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp index 79b3fcb18e..97cafe9c92 100644 --- a/src/common/key_map.cpp +++ b/src/common/key_map.cpp @@ -49,7 +49,7 @@ static bool circle_pad_right = false; static bool circle_pad_modifier = false; static void UpdateCirclePad(EmuWindow& emu_window) { - constexpr float SQRT_HALF = 0.707106781; + constexpr float SQRT_HALF = 0.707106781f; int x = 0, y = 0; if (circle_pad_right) @@ -61,9 +61,9 @@ static void UpdateCirclePad(EmuWindow& emu_window) { if (circle_pad_down) --y; - float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0; - emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0 : SQRT_HALF), - y * modifier * (x == 0 ? 1.0 : SQRT_HALF)); + float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0f; + emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0f : SQRT_HALF), + y * modifier * (x == 0 ? 1.0f : SQRT_HALF)); } int NewDeviceId() { |