diff -r 286afe079117 -r cb6b70392459 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Wed Oct 11 20:16:00 2017 +0200 +++ b/hedgewars/uGearsHandlersMess.pas Wed Oct 11 23:01:07 2017 +0200 @@ -2616,6 +2616,8 @@ State := State or gstMoving; end; DeleteGear(Gear); + if (GetAmmoEntry(HHGear^.Hedgehog^, TAmmoType(amParachute))^.Count >= 1) and (HHGear^.Hedgehog^.CurAmmoType <> amParachute) then + SetWeapon(amParachute); isCursorVisible := false; ApplyAmmoChanges(HHGear^.Hedgehog^); exit @@ -4017,6 +4019,8 @@ State := State or gstMoving end; DeleteGear(Gear); + if (GetAmmoEntry(HHGear^.Hedgehog^, TAmmoType(amJetpack))^.Count >= 1) and (HHGear^.Hedgehog^.CurAmmoType <> amJetpack) then + SetWeapon(amJetpack); isCursorVisible := false; ApplyAmmoChanges(HHGear^.Hedgehog^); // if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);