popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

fixup camspy bindings

Browse Source
This commit is contained in:
Catherine Reprobate committed 2023-08-26 16:14:43 -07:00
1 parent f88493870a
commit 077a091f7d
2 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

port/src/input.c
+2 -2
View File
@@ -78,8 +78,8 @@ void inputSetDefaultKeyBinds(void)
}; };
static const u32 joybinds[][2] = { static const u32 joybinds[][2] = {
{ CK_B, SDL_CONTROLLER_BUTTON_A }, { CK_A, SDL_CONTROLLER_BUTTON_A },
{ CK_A, SDL_CONTROLLER_BUTTON_B }, // { CK_A, SDL_CONTROLLER_BUTTON_B },
{ CK_X, SDL_CONTROLLER_BUTTON_X }, { CK_X, SDL_CONTROLLER_BUTTON_X },
{ CK_Y, SDL_CONTROLLER_BUTTON_Y }, { CK_Y, SDL_CONTROLLER_BUTTON_Y },
{ CK_DPAD_L, SDL_CONTROLLER_BUTTON_B, }, { CK_DPAD_L, SDL_CONTROLLER_BUTTON_B, },
src/game/bondeyespy.c
+7 -7
View File
@@ -741,8 +741,13 @@ void eyespyProcessInput(bool allowbuttons)
} else if (controlmode <= CONTROLMODE_14) { } else if (controlmode <= CONTROLMODE_14) {
aimpressed = c1buttons & (R_TRIG); aimpressed = c1buttons & (R_TRIG);
shootpressed = c1buttons & Z_TRIG; shootpressed = c1buttons & Z_TRIG;
exitpressed = c1buttons & A_BUTTON; #ifdef PLATFORM_N64
activatepressed = c1buttons & B_BUTTON; 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 { } else {
if (controlmode >= CONTROLMODE_23) { if (controlmode >= CONTROLMODE_23) {
aimpressed = c1buttons & Z_TRIG; aimpressed = c1buttons & Z_TRIG;
@@ -752,13 +757,8 @@ void eyespyProcessInput(bool allowbuttons)
shootpressed = c1buttons & Z_TRIG; shootpressed = c1buttons & Z_TRIG;
} }
#ifdef PLATFORM_N64
exitpressed = (c1buttons | c2buttons) & A_BUTTON; exitpressed = (c1buttons | c2buttons) & A_BUTTON;
activatepressed = (c1buttons | c2buttons) & B_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 // Apply safe zone for c1stickx