FC: remove code that crashes the game.

TomGrobbe · Jun 6, 2018 · 7951d1a · 7951d1a
1 parent 33f26d8
commit 7951d1a
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/vMenu/FunctionsController.cs b/vMenu/FunctionsController.cs
@@ -795,15 +795,21 @@ private async Task WeaponOptions()
                 }
 
                 // Enable/disable infinite ammo.
-                SetPedInfiniteAmmoClip(PlayerPedId(), MainMenu.WeaponOptionsMenu.UnlimitedAmmo && cf.IsAllowed(Permission.WPUnlimitedAmmo));
-
-                // workaround for mk2 weapons (the infinite ammo doesn't seem to work all the time for mk2 weapons)
-                if (MainMenu.WeaponOptionsMenu.UnlimitedAmmo && cf.IsAllowed(Permission.WPUnlimitedAmmo) && Game.PlayerPed.Weapons.Current.IsMk2 &&
-                    Game.PlayerPed.Weapons.Current.Ammo != Game.PlayerPed.Weapons.Current.MaxAmmo)
+                //SetPedInfiniteAmmoClip(PlayerPedId(), MainMenu.WeaponOptionsMenu.UnlimitedAmmo && cf.IsAllowed(Permission.WPUnlimitedAmmo));
+                if (Game.PlayerPed.Weapons.Current != null && Game.PlayerPed.Weapons.Current.Hash != WeaponHash.Unarmed)
                 {
-                    Game.PlayerPed.Weapons.Current.Ammo = Game.PlayerPed.Weapons.Current.MaxAmmo;
+                    Game.PlayerPed.Weapons.Current.InfiniteAmmo = MainMenu.WeaponOptionsMenu.UnlimitedAmmo && cf.IsAllowed(Permission.WPUnlimitedAmmo);
                 }
 
+
+                /// THIS SOLUTION IS BUGGED AND CAUSES CRASHES
+                //// workaround for mk2 weapons (the infinite ammo doesn't seem to work all the time for mk2 weapons)
+                //if (MainMenu.WeaponOptionsMenu.UnlimitedAmmo && cf.IsAllowed(Permission.WPUnlimitedAmmo) && Game.PlayerPed.Weapons.Current.IsMk2 &&
+                //    Game.PlayerPed.Weapons.Current.Ammo != Game.PlayerPed.Weapons.Current.MaxAmmo)
+                //{
+                //    Game.PlayerPed.Weapons.Current.Ammo = Game.PlayerPed.Weapons.Current.MaxAmmo;
+                //}
+
                 if (MainMenu.WeaponOptionsMenu.AutoEquipChute)
                 {
                     if ((IsPedInAnyHeli(PlayerPedId()) || IsPedInAnyPlane(PlayerPedId())) && !HasPedGotWeapon(PlayerPedId(), (uint)WeaponHash.Parachute, false))