CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix implicit conversion in mouse input

master
german 2020-11-30 17:53:43 +07:00
parent e46f0e084c
commit ece0ae2bfb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/input_common/mouse/mouse_input.cpp
Unescape Escape View File

@ -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() {