diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-07 08:43:03 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-08 21:30:48 +0100 |
| commit | 709fe557a3a5c2dc8675472dac9325f8efdff004 (patch) | |
| tree | fa257eae76fc50d3cbe7b69b5c423108c170af90 /dinput/win32-joystick.cpp | |
| parent | 788cfe69a1668dfd7e6bca16907de696e6063fbe (diff) | |
clean up a bit
Diffstat (limited to 'dinput/win32-joystick.cpp')
| -rw-r--r-- | dinput/win32-joystick.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dinput/win32-joystick.cpp b/dinput/win32-joystick.cpp index 71c93543..d1546df3 100644 --- a/dinput/win32-joystick.cpp +++ b/dinput/win32-joystick.cpp @@ -49,7 +49,7 @@ bool win32_joy_ctx::poll_axis(const QString &guid, int* axes) auto& joy_handle = j->joy_handle; bool ok = false; - HRESULT hr; + HRESULT hr = S_OK; (void)hr; if (SUCCEEDED(hr = joy_handle->Poll())) ok = true; @@ -84,7 +84,7 @@ bool win32_joy_ctx::poll_axis(const QString &guid, int* axes) js.rglSlider[1] }; - for (int i = 0; i < 8; i++) + for (unsigned i = 0; i < 8; i++) axes[i] = values[i]; return true; @@ -184,7 +184,7 @@ bool win32_joy_ctx::joy::poll(fn const& f) default: if (event.dwOfs >= BUTTON_OFFSET(0) && event.dwOfs <= BUTTON_OFFSET(max_buttons - 1)) { - i = event.dwOfs - BUTTON_OFFSET(0); + i = int(event.dwOfs - BUTTON_OFFSET(0)); i /= sizeof(DIJOYSTATE2().rgbButtons[0]); i %= max_buttons; // defensive programming } |