summaryrefslogtreecommitdiff
path: root/src/common/key_map.cpp
diff options
context:
space:
mode:
authorGravatar Subv2016-11-29 16:51:53 -0500
committerGravatar Subv2016-11-29 16:51:53 -0500
commitaea9a91100e4b80edc8c70d610c102eb2d76dd1f (patch)
treea0258781fb72ee27758442eff3d6b6634cf3b1ee /src/common/key_map.cpp
parentMerge pull request #2196 from Subv/system_mode (diff)
downloadyuzu-aea9a91100e4b80edc8c70d610c102eb2d76dd1f.tar.gz
yuzu-aea9a91100e4b80edc8c70d610c102eb2d76dd1f.tar.xz
yuzu-aea9a91100e4b80edc8c70d610c102eb2d76dd1f.zip
Build: Fixed a few warnings.
Diffstat (limited to 'src/common/key_map.cpp')
-rw-r--r--src/common/key_map.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index 79b3fcb18..97cafe9c9 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -49,7 +49,7 @@ static bool circle_pad_right = false;
49static bool circle_pad_modifier = false; 49static bool circle_pad_modifier = false;
50 50
51static void UpdateCirclePad(EmuWindow& emu_window) { 51static void UpdateCirclePad(EmuWindow& emu_window) {
52 constexpr float SQRT_HALF = 0.707106781; 52 constexpr float SQRT_HALF = 0.707106781f;
53 int x = 0, y = 0; 53 int x = 0, y = 0;
54 54
55 if (circle_pad_right) 55 if (circle_pad_right)
@@ -61,9 +61,9 @@ static void UpdateCirclePad(EmuWindow& emu_window) {
61 if (circle_pad_down) 61 if (circle_pad_down)
62 --y; 62 --y;
63 63
64 float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0; 64 float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0f;
65 emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0 : SQRT_HALF), 65 emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0f : SQRT_HALF),
66 y * modifier * (x == 0 ? 1.0 : SQRT_HALF)); 66 y * modifier * (x == 0 ? 1.0f : SQRT_HALF));
67} 67}
68 68
69int NewDeviceId() { 69int NewDeviceId() {