mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-06 09:22:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clang

Browse Source
This commit is contained in:
kalaposfos13 2024-12-26 09:43:22 +01:00
parent 97e2f784cc
commit 346c5ccf03
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/input/input_handler.cpp
View File

@ -279,8 +279,8 @@ void ParseInputConfig(const std::string game_id = "") {
line); line);
continue; continue;
} }
ControllerOutput* toggle_out = ControllerOutput* toggle_out = &*std::ranges::find(
&*std::ranges::find(output_array, ControllerOutput((OrbisPadButtonDataOffset)KEY_TOGGLE)); output_array, ControllerOutput((OrbisPadButtonDataOffset)KEY_TOGGLE));
BindingConnection toggle_connection = BindingConnection toggle_connection =
BindingConnection(InputBinding(toggle_keys.key2), toggle_out, toggle_keys.key3); BindingConnection(InputBinding(toggle_keys.key2), toggle_out, toggle_keys.key3);
connections.insert(connections.end(), toggle_connection); connections.insert(connections.end(), toggle_connection);
@ -324,11 +324,11 @@ void ParseInputConfig(const std::string game_id = "") {
axis_it->second.axis == Axis::TriggerRight) axis_it->second.axis == Axis::TriggerRight)
? 127 ? 127
: axis_it->second.value; : axis_it->second.value;
connection = connection = BindingConnection(
BindingConnection(binding, binding,
&*std::ranges::find(output_array, ControllerOutput(OrbisPadButtonDataOffset::None, &*std::ranges::find(output_array, ControllerOutput(OrbisPadButtonDataOffset::None,
axis_it->second.axis)), axis_it->second.axis)),
value_to_set); value_to_set);
connections.insert(connections.end(), connection); connections.insert(connections.end(), connection);
} else { } else {
LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.", LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.",

4
src/sdl_window.cpp
View File

@ -231,8 +231,8 @@ void WindowSDL::OnKeyboardMouseInput(const SDL_Event* event) {
// get the event's id, if it's keyup or keydown // get the event's id, if it's keyup or keydown
const bool input_down = event->type == SDL_EVENT_KEY_DOWN || const bool input_down = event->type == SDL_EVENT_KEY_DOWN ||
event->type == SDL_EVENT_MOUSE_BUTTON_DOWN || event->type == SDL_EVENT_MOUSE_BUTTON_DOWN ||
event->type == SDL_EVENT_MOUSE_WHEEL; event->type == SDL_EVENT_MOUSE_WHEEL;
u32 input_id = Input::InputBinding::GetInputIDFromEvent(*event); u32 input_id = Input::InputBinding::GetInputIDFromEvent(*event);
// Handle window controls outside of the input maps // Handle window controls outside of the input maps