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.
MAFINS · Feb 26, 2023 · b91068a · b91068a · kucukoneralp · Dec 16, 2024
1 parent cbcf6fb
commit b91068a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Solution/source/Menu/Routine.cpp b/Solution/source/Menu/Routine.cpp
@@ -898,6 +898,12 @@ void set_soulswitch_gun()
 		if (soulswitchentity.IsPed() && soulswitchentity.IsAlive()
 			&& (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))))
 		{
+			if (IS_SPECIAL_ABILITY_ACTIVE(PLAYER_ID(), 0))
+			{
+				SPECIAL_ABILITY_DEACTIVATE_FAST(PLAYER_ID(), 0);
+				WAIT(16);
+			}
+
 			Game::Sound::PlayFrontend("Knuckle_Crack_Hard_Cel", "MP_SNACKS_SOUNDSET");
 			ANIMPOSTFX_PLAY("MinigameEndNeutral", 0, 0); // FocusIn
 			set_become_ped(soulswitchentity);