Mercurial Mercurial > hedgewars-draft / 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.
merging in campaign updates - please test
authorsheepluva
Fri, 07 Sep 2012 12:13:38 +0200
changeset 7676 7e712605764c
parent 7674 aead327f1e1a (diff)
parent 7675 58620e9e5ed5 (current diff)
child 7677 f63c55db82eb
merging in campaign updates - please test
--- a/hedgewars/uGearsHandlersRope.pas	Wed Sep 05 16:54:13 2012 +0300
+++ b/hedgewars/uGearsHandlersRope.pas	Fri Sep 07 12:13:38 2012 +0200
@@ -323,9 +323,8 @@
 
     HHGear^.dX.QWordValue:= HHGear^.dX.QWordValue shr 2;
     HHGear^.dY.QWordValue:= HHGear^.dY.QWordValue shr 2;
-    if not haveCollision then
+    if (not haveCollision) and ((Gear^.State and gsttmpFlag) <> 0) then
         begin
-        if (Gear^.State and gsttmpFlag) <> 0 then
             begin
             PlaySound(sndRopeRelease);
             if Gear^.Hedgehog^.CurAmmoType <> amParachute then
hedgewars-draft