# HG changeset patch # User nemo # Date 1364568852 14400 # Node ID 8f317ba10675004893e2f7033bd85772f5ec9315 # Parent 6f93822e0b2eec7b1a567e3c1dce84cec3cedfca This should ensure rope can still be aimed quickly when an alt weapon is active. diff -r 6f93822e0b2e -r 8f317ba10675 hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Fri Mar 29 14:47:01 2013 +0100 +++ b/hedgewars/uGearsHedgehog.pas Fri Mar 29 10:54:12 2013 -0400 @@ -793,7 +793,7 @@ var da: LongWord; begin with HHGear^.Hedgehog^ do - if ((CurAmmoType = amRope) and ((HHGear^.State and (gstMoving or gstHHJumping)) = gstMoving)) + if ((CurAmmoGear <> nil) and (CurAmmoGear^.AmmoType = amRope) and ((HHGear^.State and (gstMoving or gstHHJumping)) = gstMoving)) or ((CurAmmoType = amPortalGun) and ((HHGear^.State and gstMoving) <> 0)) then da:= 2 else da:= 1;