diff --git a/src/game/bondgun.c b/src/game/bondgun.c index c2dbc993e..8c99e39c1 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -11735,6 +11735,7 @@ s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool trigpressed, bool fromac { #ifndef PLATFORM_N64 const bool extcontrols = PLAYER_EXTCFG().extcontrols; + bool docontinue; #endif switch (bgunGetWeaponNum(HAND_RIGHT)) { case WEAPON_SNIPERRIFLE: @@ -11759,7 +11760,6 @@ s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool trigpressed, bool fromac } #ifndef PLATFORM_N64 - bool docontinue; if (extcontrols) { docontinue = (ABS(usedowntime) < 0); } else { @@ -11781,19 +11781,18 @@ 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; +#ifndef PLATFORM_N64 // very special alt-button handling for RCP-120's cloaking if (!trigpressed && extcontrols && fromdedicatedbutton) { - if (cloaked) { + if (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKRCP120) { 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; + g_Vars.currentplayer->gunctrl.invertgunfunc = false; return USETIMER_STOP; } - #endif +#endif case WEAPON_LAPTOPGUN: case WEAPON_DRAGON: case WEAPON_REMOTEMINE: