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.
don't kill rope if not extended
authornemo
Mon, 14 Oct 2013 00:33:10 -0400
changeset 9539 ab44d44a6177
parent 9537 1d72831311f6
child 9541 312bb4384f33
don't kill rope if not extended
hedgewars/uGearsHandlersMess.pas file | annotate | diff | comparison | revisions
hedgewars/uGearsHedgehog.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHandlersMess.pas	Sun Oct 13 23:23:43 2013 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Mon Oct 14 00:33:10 2013 -0400
@@ -4092,7 +4092,8 @@
         if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil)
         and (iterator = CurrentHedgehog^.Gear)
         and (CurAmmoGear <> nil)
-        and (CurAmmoGear^.Kind =gtRope) then
+        and (CurAmmoGear^.Kind = gtRope)
+        and (CurAmmoGear^.Elasticity <> _0) then
                CurAmmoGear^.PortalCounter:= 1;
 
         if not isbullet and (iterator^.State and gstInvisible = 0)
--- a/hedgewars/uGearsHedgehog.pas	Sun Oct 13 23:23:43 2013 +0200
+++ b/hedgewars/uGearsHedgehog.pas	Mon Oct 14 00:33:10 2013 -0400
@@ -1281,7 +1281,7 @@
 if WorldWrap(Gear) then
     begin
     if (WorldEdge <> weBounce) and (Gear = CurrentHedgehog^.Gear) and 
-       (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) then
+       (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) and (CurAmmoGear^.Elasticity <> _0) then
        CurAmmoGear^.PortalCounter:= 1;
     if (WorldEdge = weWrap) and (TestCollisionXwithGear(Gear, 1) or TestCollisionXwithGear(Gear, -1))  then
         begin
sheepy-clone