# HG changeset patch # User nemo # Date 1361818305 18000 # Node ID d2bfe0683b9a76df5afbbe4b038ed9e0694d527b # Parent 286ebfcb3d97a5257637124d1948c47a6ed36b10 ice texture still needs moving to uLandGraphics and circle drawing diff -r 286ebfcb3d97 -r d2bfe0683b9a hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Mon Feb 25 12:54:50 2013 -0500 +++ b/hedgewars/GSHandlers.inc Mon Feb 25 13:51:45 2013 -0500 @@ -5148,6 +5148,7 @@ 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(LandPixels[y, x], icePixels^[iceSurface^.w * (y mod iceSurface^.h) + (x mod iceSurface^.w)]); Land[y, x] := land[y, x] or lfIce; end; diff -r 286ebfcb3d97 -r d2bfe0683b9a hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Mon Feb 25 12:54:50 2013 -0500 +++ b/hedgewars/uVariables.pas Mon Feb 25 13:51:45 2013 -0500 @@ -661,7 +661,7 @@ (FileName: 'star'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; Width: 12; Height: 12; imageWidth: 12; imageHeight: 12; saveSurf: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprStar (FileName: 'icetexture'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; - Width: 32; Height: 32; imageWidth: 32; imageHeight: 32; saveSurf: true; priority: tpLow; getDimensions: false; getImageDimensions: true), // sprIceTexture + Width: 128; Height: 128; imageWidth: 128; imageHeight: 128; saveSurf: true; priority: tpLow; getDimensions: false; getImageDimensions: true), // sprIceTexture (FileName: 'amIceGun'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; Width: 32; Height: 32; imageWidth: 32; imageHeight: 32; saveSurf: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprIceGun (FileName: 'amFrozenHog'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; diff -r 286ebfcb3d97 -r d2bfe0683b9a share/hedgewars/Data/Graphics/icetexture.png Binary file share/hedgewars/Data/Graphics/icetexture.png has changed