Mercurial Mercurial > sheepy-clone / 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.
merge
authorunC0Rr
Tue, 26 May 2015 12:00:39 +0300
changeset 10966 a8749503c130
parent 10964 493bd837dc2e (diff)
parent 10965 fb2b006ba476 (current diff)
child 10967 1434cec96ca3
merge
--- a/hedgewars/uGearsHandlersMess.pas	Tue May 26 10:42:17 2015 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Tue May 26 12:00:39 2015 +0300
@@ -1954,7 +1954,7 @@
     if land = 0 then land:= TestCollisionYwithGear(Gear, 2);
     if (land <> 0) and (land and lfBouncy = 0) then
         begin
-        if (not isZero(Gear^.dX)) or (not isZero(Gear^.dY)) then
+        if ((Gear^.State and gstMoving) <> 0) or (not isZero(Gear^.dX)) or (not isZero(Gear^.dY)) then
             begin
             PlaySound(sndRopeAttach);
             Gear^.dX:= _0;
sheepy-clone