# HG changeset patch
# User unc0rr
# Date 1225461686 0
# Node ID 340c47ad5600648ebf07cb6d9c84c14c6c3fe134
# Parent  b1cb4381a1e030c7daa5d087ad7723dc45ff5310
 - Add a bunch of hats
 - Fix water sprites rendering

diff -r b1cb4381a1e0 -r 340c47ad5600 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Fri Oct 31 13:02:04 2008 +0000
+++ b/hedgewars/uConsts.pas	Fri Oct 31 14:01:26 2008 +0000
@@ -285,7 +285,7 @@
 			saveSurf: boolean;
 			end = (
 			(FileName:  'BlueWater'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
-			Width: 256; Height: 32; saveSurf: false),// sprWater
+			Width: 125; Height: 32; saveSurf: false),// sprWater
 			(FileName:     'Clouds'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
 			Width: 256; Height:128; saveSurf: false),// sprCloud
 			(FileName:       'Bomb'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
diff -r b1cb4381a1e0 -r 340c47ad5600 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Fri Oct 31 13:02:04 2008 +0000
+++ b/hedgewars/uWorld.pas	Fri Oct 31 14:01:26 2008 +0000
@@ -196,8 +196,8 @@
 
 // Waves
 {$WARNINGS OFF}
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6)      ) and $FF), cWaterLine + WorldDy - 64, 0);
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (RealTicks shr 6) + 192) and $FF), cWaterLine + WorldDy - 48, 0);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 125  + ((WorldDx + (RealTicks shr 6)      ) mod 125), cWaterLine + WorldDy - 64, 0);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 125  + ((WorldDx - (RealTicks shr 6) + 100) mod 125), cWaterLine + WorldDy - 48, 0);
 {$WARNINGS ON}
 
 DrawLand(WorldDx, WorldDy);
@@ -226,9 +226,9 @@
 
 // Waves
 {$WARNINGS OFF}
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6) +  64) and $FF), cWaterLine + WorldDy - 32, 0);
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx - (RealTicks shr 6) + 128) and $FF), cWaterLine + WorldDy - 16, 0);
-for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 256  + ((WorldDx + (RealTicks shr 6)      ) and $FF), cWaterLine + WorldDy     , 0);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 125  + ((WorldDx + (RealTicks shr 6) +  25) mod 125), cWaterLine + WorldDy - 32, 0);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 125  + ((WorldDx - (RealTicks shr 6) +  50) mod 125), cWaterLine + WorldDy - 16, 0);
+for i:= -1 to cWaterSprCount do DrawSprite(sprWater,  i * 125  + ((WorldDx + (RealTicks shr 6) +  75) mod 125), cWaterLine + WorldDy     , 0);
 {$WARNINGS ON}
 
 // Turn time
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/IndianChief.png
Binary file share/hedgewars/Data/Graphics/Hats/IndianChief.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/beefeater.png
Binary file share/hedgewars/Data/Graphics/Hats/beefeater.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/royalguard.png
Binary file share/hedgewars/Data/Graphics/Hats/royalguard.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/slowpoke.png
Binary file share/hedgewars/Data/Graphics/Hats/slowpoke.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/stormtrooper.png
Binary file share/hedgewars/Data/Graphics/Hats/stormtrooper.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/ushanka.png
Binary file share/hedgewars/Data/Graphics/Hats/ushanka.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/Hats/venom.png
Binary file share/hedgewars/Data/Graphics/Hats/venom.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Graphics/SmokeTrace.png
Binary file share/hedgewars/Data/Graphics/SmokeTrace.png has changed
diff -r b1cb4381a1e0 -r 340c47ad5600 share/hedgewars/Data/Themes/hell/theme.cfg
--- a/share/hedgewars/Data/Themes/hell/theme.cfg	Fri Oct 31 13:02:04 2008 +0000
+++ b/share/hedgewars/Data/Themes/hell/theme.cfg	Fri Oct 31 14:01:26 2008 +0000
@@ -1,7 +1,7 @@
 10 10 10
 100 0 0
-$CA $18 $0D
-$AA $08 $00
+$A7 $0B $0C
+$91 $0A $0A
 hell.ogg
 9
 4