Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Commit b91068a

Browse files
authored
Fix soulswitcher when special active (#523)
This fixes the soul-switching gun so that if it is used while Michael's special ability is active, the ability will first turn off before the switch takes place.
1 parent cbcf6fb commit b91068a

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Solution/source/Menu/Routine.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,12 @@ void set_soulswitch_gun()
898898
if (soulswitchentity.IsPed() && soulswitchentity.IsAlive()
899899
&& (IS_DISABLED_CONTROL_JUST_PRESSED(0, INPUT_ATTACK) || (IS_PED_IN_ANY_VEHICLE(playerPed.Handle(), false) && IS_DISABLED_CONTROL_JUST_PRESSED(2, INPUT_VEH_ATTACK))))
900900
{
901+
if (IS_SPECIAL_ABILITY_ACTIVE(PLAYER_ID(), 0))
902+
{
903+
SPECIAL_ABILITY_DEACTIVATE_FAST(PLAYER_ID(), 0);
904+
WAIT(16);
905+
}
906+
901907
Game::Sound::PlayFrontend("Knuckle_Crack_Hard_Cel", "MP_SNACKS_SOUNDSET");
902908
ANIMPOSTFX_PLAY("MinigameEndNeutral", 0, 0); // FocusIn
903909
set_become_ped(soulswitchentity);

0 commit comments

Comments
 (0)