Restore CurAmmoType check as well, that was removed in r8f317ba10675 when trying to fix aiming during alt attack.
authornemo
Wed, 05 Jun 2013 12:47:33 -0400
changeset 9139 2ae44c4381cd
parent 9137 d987230b85ed
child 9141 e391e9a19b1c
Restore CurAmmoType check as well, that was removed in r8f317ba10675 when trying to fix aiming during alt attack. This probably fixes bug #657
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;