# HG changeset patch
# User nemo
# Date 1370450853 14400
# Node ID 2ae44c4381cd01f80aa8f94644e609f79b7d6a30
# Parent  d987230b85ed96a6cec67dedc0baae0500408085
Restore CurAmmoType check as well, that was removed in r8f317ba10675 when trying to fix aiming during alt attack.
This probably fixes bug #657

diff -r d987230b85ed -r 2ae44c4381cd hedgewars/uGearsHedgehog.pas
--- a/hedgewars/uGearsHedgehog.pas	Wed Jun 05 16:28:30 2013 +0200
+++ b/hedgewars/uGearsHedgehog.pas	Wed Jun 05 12:47:33 2013 -0400
@@ -808,7 +808,8 @@
 var da: LongWord;
 begin
 with HHGear^.Hedgehog^ do
-    if ((CurAmmoGear <> nil) and (CurAmmoGear^.AmmoType = amRope) and ((HHGear^.State and (gstMoving or gstHHJumping)) = gstMoving))
+    if (((CurAmmoType = amRope) or ((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;