ice texture still needs moving to uLandGraphics and circle drawing icegun
authornemo
Mon, 25 Feb 2013 13:51:45 -0500
branchicegun
changeset 8578 d2bfe0683b9a
parent 8576 286ebfcb3d97
child 8579 d18bc19d780a
ice texture still needs moving to uLandGraphics and circle drawing
hedgewars/GSHandlers.inc
hedgewars/uVariables.pas
share/hedgewars/Data/Graphics/icetexture.png
--- 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;
--- 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;
Binary file share/hedgewars/Data/Graphics/icetexture.png has changed