From 8f51b0907a789ce50614851b8f5d5dbf51beddbb Mon Sep 17 00:00:00 2001 From: future-figs Date: Fri, 2 Aug 2024 17:59:51 -0400 Subject: [PATCH] change PSMove mouse button bindings (#15860) --- rpcs3/Emu/Cell/Modules/cellGem.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index 5efd3486ed..55b2feb309 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -918,24 +918,24 @@ static bool mouse_input_to_pad(const u32 mouse_no, be_t& digital_buttons, b if (is_pressed(CELL_MOUSE_BUTTON_2)) digital_buttons |= CELL_GEM_CTRL_MOVE; - if (is_pressed(CELL_MOUSE_BUTTON_3)) - digital_buttons |= CELL_GEM_CTRL_CROSS; - if (is_pressed(CELL_MOUSE_BUTTON_4)) digital_buttons |= CELL_GEM_CTRL_CIRCLE; if (is_pressed(CELL_MOUSE_BUTTON_5)) - digital_buttons |= CELL_GEM_CTRL_SQUARE; + digital_buttons |= CELL_GEM_CTRL_CROSS; - if (is_pressed(CELL_MOUSE_BUTTON_6) || (is_pressed(CELL_MOUSE_BUTTON_1) && is_pressed(CELL_MOUSE_BUTTON_2))) + if ((is_pressed(CELL_MOUSE_BUTTON_3) && is_pressed(CELL_MOUSE_BUTTON_1)) || is_pressed(CELL_MOUSE_BUTTON_6)) digital_buttons |= CELL_GEM_CTRL_SELECT; - if (is_pressed(CELL_MOUSE_BUTTON_7) || (is_pressed(CELL_MOUSE_BUTTON_1) && is_pressed(CELL_MOUSE_BUTTON_3))) + if ((is_pressed(CELL_MOUSE_BUTTON_3) && is_pressed(CELL_MOUSE_BUTTON_2)) || is_pressed(CELL_MOUSE_BUTTON_7)) digital_buttons |= CELL_GEM_CTRL_START; - if (is_pressed(CELL_MOUSE_BUTTON_8) || (is_pressed(CELL_MOUSE_BUTTON_2) && is_pressed(CELL_MOUSE_BUTTON_3))) + if ((is_pressed(CELL_MOUSE_BUTTON_3) && is_pressed(CELL_MOUSE_BUTTON_4)) || is_pressed(CELL_MOUSE_BUTTON_8)) digital_buttons |= CELL_GEM_CTRL_TRIANGLE; + if (is_pressed(CELL_MOUSE_BUTTON_3) && is_pressed(CELL_MOUSE_BUTTON_5)) + digital_buttons |= CELL_GEM_CTRL_SQUARE; + analog_t = (mouse_data.buttons & CELL_MOUSE_BUTTON_1) ? 0xFFFF : 0; return true;