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.
Fix crash in DrawTunnel
authornemo
Wed, 03 Feb 2010 04:18:28 +0000
changeset 2741 7a84ce33f52f
parent 2740 03df0573a9fd
child 2742 21c0d2e69753
Fix crash in DrawTunnel
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uLandGraphics.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGears.pas	Wed Feb 03 03:01:44 2010 +0000
+++ b/hedgewars/uGears.pas	Wed Feb 03 04:18:28 2010 +0000
@@ -2066,7 +2066,7 @@
 *)
 i:= _1;
 if (CurrentHedgehog <> nil) and CurrentHedgehog^.King then i:= _1_5;
-if (PHedgehog(Gear^.Hedgehog) <> nil) and (PHedgehog(Gear^.Hedgehog)^.King) then
+if (Gear^.Hedgehog <> nil) and (PHedgehog(Gear^.Hedgehog)^.King) then
    ModifyDamage:= hwRound(_0_01 * cDamageModifier * dmg * i * cDamagePercent * _0_5)
 else
    ModifyDamage:= hwRound(_0_01 * cDamageModifier * dmg * i * cDamagePercent)
--- a/hedgewars/uLandGraphics.pas	Wed Feb 03 03:01:44 2010 +0000
+++ b/hedgewars/uLandGraphics.pas	Wed Feb 03 04:18:28 2010 +0000
@@ -394,7 +394,7 @@
         Y:= Y + dY;
         tx:= hwRound(X);
         ty:= hwRound(Y);
-        if (Land[ty, tx] <> COLOR_INDESTRUCTIBLE) and ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) then
+        if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (Land[ty, tx] <> COLOR_INDESTRUCTIBLE) then
             begin
             if Land[ty, tx] = COLOR_LAND then
                 LandPixels[ty, tx]:= LandBackPixel(tx, ty)
hedgewars