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.
This should ensure rope can still be aimed quickly when an alt weapon is active.
authornemo
Fri, 29 Mar 2013 10:54:12 -0400
changeset 8818 8f317ba10675
parent 8816 6f93822e0b2e
child 8820 9cc4a057473f
This should ensure rope can still be aimed quickly when an alt weapon is active.
hedgewars/uGearsHedgehog.pas file | annotate | diff | comparison | revisions 
--- 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;
hedgewars