hedgewars/GSHandlers.inc
branchicegun
changeset 8584 ea20d9cc8515
parent 8583 f2edd6d5f958
child 8588 47084c6fcb4e
--- a/hedgewars/GSHandlers.inc	Tue Feb 26 15:15:20 2013 +0200
+++ b/hedgewars/GSHandlers.inc	Tue Feb 26 09:10:48 2013 -0500
@@ -5133,10 +5133,8 @@
     pictureX, pictureY: LongInt;
     w, c: LongWord;
 begin
+    if Land[y, x] and lfIce <> 0 then exit;
 // So. 3 parameters here. Ice colour, Ice opacity, and a bias on the greyscaled pixel towards lightness
-    c:= $7dc1ccff;
-    // FIXME should be a global value, not set every single pixel.  Just for test purposes
-    c:= ($44 shl RShift) or ($97 shl GShift) or ($A9 shl BShift) or ($A0 shl AShift);
     iceSurface:= SpritesData[sprIceTexture].Surface;
     pictureX := x mod iceSurface^.w;
     pictureY := y mod iceSurface^.h;
@@ -5149,10 +5147,10 @@
     if w > 255 then w:= 255;
     w:= (w shl RShift) or (w shl BShift) or (w shl GShift) or (LandPixels[y,x] and AMask);
     //LandPixels[y, x]:= w;
-    LandPixels[y, x]:= addBgColor(w, c);
+    LandPixels[y, x]:= addBgColor(w, IceColor);
     LandPixels[y, x]:= addBgColor(LandPixels[y, x], icePixels^[iceSurface^.w * (y mod iceSurface^.h) + (x mod iceSurface^.w)]);
 
-    Land[y, x] := land[y, x] or lfIce;
+    Land[y, x] := Land[y, x] or lfIce;
 end;
 
 procedure DrawIce(x, y: Longint);