# HG changeset patch # User nemo # Date 1381725190 14400 # Node ID ab44d44a6177379b83216f15712975fa8cc84aea # Parent 1d72831311f6639a968b3e23a841819f65f4b3c6 don't kill rope if not extended diff -r 1d72831311f6 -r ab44d44a6177 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Sun Oct 13 23:23:43 2013 +0200 +++ b/hedgewars/uGearsHandlersMess.pas Mon Oct 14 00:33:10 2013 -0400 @@ -4092,7 +4092,8 @@ if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and (iterator = CurrentHedgehog^.Gear) and (CurAmmoGear <> nil) - and (CurAmmoGear^.Kind =gtRope) then + and (CurAmmoGear^.Kind = gtRope) + and (CurAmmoGear^.Elasticity <> _0) then CurAmmoGear^.PortalCounter:= 1; if not isbullet and (iterator^.State and gstInvisible = 0) diff -r 1d72831311f6 -r ab44d44a6177 hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Sun Oct 13 23:23:43 2013 +0200 +++ b/hedgewars/uGearsHedgehog.pas Mon Oct 14 00:33:10 2013 -0400 @@ -1281,7 +1281,7 @@ if WorldWrap(Gear) then begin if (WorldEdge <> weBounce) and (Gear = CurrentHedgehog^.Gear) and - (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) then + (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) and (CurAmmoGear^.Elasticity <> _0) then CurAmmoGear^.PortalCounter:= 1; if (WorldEdge = weWrap) and (TestCollisionXwithGear(Gear, 1) or TestCollisionXwithGear(Gear, -1)) then begin