# HG changeset patch # User Wuzzy # Date 1509678873 -3600 # Node ID 4c1c468725ff9d37aae72a5c8b730197df0cdbbc # Parent 3fc7569c1203cf43e38df96275da09d8dca2cefe Fix desync when dropping weapon from parachute or jetpack diff -r 3fc7569c1203 -r 4c1c468725ff hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Fri Nov 03 02:23:41 2017 +0100 +++ b/hedgewars/uGearsHandlersMess.pas Fri Nov 03 04:14:33 2017 +0100 @@ -2628,7 +2628,7 @@ end; DeleteGear(Gear); if (GetAmmoEntry(HHGear^.Hedgehog^, amParachute)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) then - SetWeapon(amParachute); + HHGear^.Hedgehog^.CurAmmoType:= amParachute; isCursorVisible := false; ApplyAmmoChanges(HHGear^.Hedgehog^); exit @@ -4051,7 +4051,7 @@ end; DeleteGear(Gear); if (GetAmmoEntry(HHGear^.Hedgehog^, amJetpack)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) then - SetWeapon(amJetpack); + HHGear^.Hedgehog^.CurAmmoType:= amJetpack; isCursorVisible := false; ApplyAmmoChanges(HHGear^.Hedgehog^); // if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);