diff options
| author | LC <mathew1800@gmail.com> | 2020-12-01 09:40:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 09:40:46 -0500 |
| commit | d39dfdf45c1205b9afaf3927bcbe81b057995176 (patch) | |
| tree | 24a56c98498861abeab6c495e7d4b36c9450f576 /src/input_common/mouse/mouse_input.cpp | |
| parent | 7b4a213603a1d64083bfc8396ee32ea840b3f058 (diff) | |
| parent | ece0ae2bfb07a4576c31b0f2270883c53e1bff45 (diff) | |
Merge pull request #5047 from german77/MouseInput
InputCommon: Fix implicit conversion in mouse input
Diffstat (limited to 'src/input_common/mouse/mouse_input.cpp')
| -rw-r--r-- | src/input_common/mouse/mouse_input.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/input_common/mouse/mouse_input.cpp b/src/input_common/mouse/mouse_input.cpp index 3f4264caaf..d0ee64ad75 100644 --- a/src/input_common/mouse/mouse_input.cpp +++ b/src/input_common/mouse/mouse_input.cpp @@ -54,12 +54,13 @@ void Mouse::PressButton(int x, int y, int button_) { } int button = 1 << button_; + const auto button_index = static_cast<std::size_t>(button_); buttons |= static_cast<u16>(button); last_button = static_cast<MouseButton>(button_); - mouse_info[button_].mouse_origin = Common::MakeVec(x, y); - mouse_info[button_].last_mouse_position = Common::MakeVec(x, y); - mouse_info[button_].data.pressed = true; + mouse_info[button_index].mouse_origin = Common::MakeVec(x, y); + mouse_info[button_index].last_mouse_position = Common::MakeVec(x, y); + mouse_info[button_index].data.pressed = true; } void Mouse::MouseMove(int x, int y) { @@ -86,11 +87,12 @@ void Mouse::ReleaseButton(int button_) { } int button = 1 << button_; + const auto button_index = static_cast<std::size_t>(button_); buttons &= static_cast<u16>(0xFF - button); - mouse_info[button_].tilt_speed = 0; - mouse_info[button_].data.pressed = false; - mouse_info[button_].data.axis = {0, 0}; + mouse_info[button_index].tilt_speed = 0; + mouse_info[button_index].data.pressed = false; + mouse_info[button_index].data.axis = {0, 0}; } void Mouse::BeginConfiguration() { |