From 077a091f7d3a4ca854b106c3fdaff9ac1c611383 Mon Sep 17 00:00:00 2001 From: Catherine Reprobate Date: Sun, 20 Aug 2023 23:10:38 -0700 Subject: [PATCH] fixup camspy bindings --- port/src/input.c | 4 ++-- src/game/bondeyespy.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/port/src/input.c b/port/src/input.c index eb3c6d87e..2e57c2770 100644 --- a/port/src/input.c +++ b/port/src/input.c @@ -78,8 +78,8 @@ void inputSetDefaultKeyBinds(void) }; static const u32 joybinds[][2] = { - { CK_B, SDL_CONTROLLER_BUTTON_A }, - { CK_A, SDL_CONTROLLER_BUTTON_B }, + { CK_A, SDL_CONTROLLER_BUTTON_A }, + // { CK_A, SDL_CONTROLLER_BUTTON_B }, { CK_X, SDL_CONTROLLER_BUTTON_X }, { CK_Y, SDL_CONTROLLER_BUTTON_Y }, { CK_DPAD_L, SDL_CONTROLLER_BUTTON_B, }, diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 8ffe51e9a..e6f23fd10 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -741,8 +741,13 @@ void eyespyProcessInput(bool allowbuttons) } else if (controlmode <= CONTROLMODE_14) { aimpressed = c1buttons & (R_TRIG); shootpressed = c1buttons & Z_TRIG; - exitpressed = c1buttons & A_BUTTON; - activatepressed = c1buttons & B_BUTTON; + #ifdef PLATFORM_N64 + exitpressed = (c1buttons | c2buttons) & A_BUTTON; + activatepressed = (c1buttons | c2buttons) & B_BUTTON; + #else + exitpressed = (c1buttons | c2buttons) & (BUTTON_WPNBACK | BUTTON_RADIAL); + activatepressed = (c1buttons | c2buttons) & (BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE); + #endif } else { if (controlmode >= CONTROLMODE_23) { aimpressed = c1buttons & Z_TRIG; @@ -752,13 +757,8 @@ void eyespyProcessInput(bool allowbuttons) shootpressed = c1buttons & Z_TRIG; } - #ifdef PLATFORM_N64 exitpressed = (c1buttons | c2buttons) & A_BUTTON; activatepressed = (c1buttons | c2buttons) & B_BUTTON; - #else - exitpressed = (c1buttons | c2buttons) & BUTTON_ACCEPT_USE; - activatepressed = (c1buttons | c2buttons) & BUTTON_CANCEL_USE; - #endif } // Apply safe zone for c1stickx