Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 28210d2a9a36 (fixes bug 553)
authorWuzzy <Wuzzy2@mail.ru>
Fri, 03 Nov 2017 02:23:41 +0100
changeset 12819 3fc7569c1203
parent 12818 d3113a4cba36
child 12820 4c1c468725ff
Backed out changeset 28210d2a9a36 (fixes bug #553) This fixes a desync when you take fall damage while roping and having a secondary ammo selected.
hedgewars/uGearsHandlersRope.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHandlersRope.pas	Wed Nov 01 22:49:54 2017 -0400
+++ b/hedgewars/uGearsHandlersRope.pas	Fri Nov 03 02:23:41 2017 +0100
@@ -66,8 +66,6 @@
     or (TestCollisionYwithGear(HHGear, 1) <> 0) then
         begin
         DeleteGear(Gear);
-        if (TestCollisionYwithGear(HHGear, 1) <> 0) and (GetAmmoEntry(HHGear^.Hedgehog^, amRope)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) then
-            SetWeapon(amRope);
         isCursorVisible := false;
         ApplyAmmoChanges(HHGear^.Hedgehog^);
         exit
hedgewars