From 68aee1d2f2280182658c3b42fc8c82003c3f427d Mon Sep 17 00:00:00 2001 From: Catherine Reprobate Date: Sun, 14 Apr 2024 14:49:32 -0700 Subject: [PATCH] fix for rcp120 alt button behavior --- src/game/bondgun.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 67825c973..c2dbc993e 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -11781,6 +11781,19 @@ s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool trigpressed, bool fromac g_Vars.currentplayer->hands[HAND_RIGHT].activatesecondary = true; return (extcontrols ? USETIMER_STOP : USETIMER_REPEAT); case WEAPON_RCP120: + #ifndef PLATFORM_N64 + s32 cloaked = (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKRCP120) != 0; + // very special alt-button handling for RCP-120's cloaking + if (!trigpressed && extcontrols && fromdedicatedbutton) { + if (cloaked) { + g_Vars.currentplayer->devicesactive &= ~DEVICE_CLOAKRCP120; + } else { + g_Vars.currentplayer->devicesactive = (g_Vars.currentplayer->devicesactive & ~DEVICE_CLOAKRCP120) | DEVICE_CLOAKRCP120; + } + g_Vars.currentplayer->gunctrl.invertgunfunc = false; + return USETIMER_STOP; + } + #endif case WEAPON_LAPTOPGUN: case WEAPON_DRAGON: case WEAPON_REMOTEMINE: