# HG changeset patch
# User unc0rr
# Date 1218227906 0
# Node ID 852f8872da1aad679c9c037b8ef2e3253310b8f6
# Parent  540cea85939559f90ad3746bb65e176a54ad4d2d
Allow theme-customizable water and girder

diff -r 540cea859395 -r 852f8872da1a hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Fri Aug 08 20:33:57 2008 +0000
+++ b/hedgewars/uConsts.pas	Fri Aug 08 20:38:26 2008 +0000
@@ -275,7 +275,7 @@
                      Width, Height: LongInt;
                      saveSurf: boolean;
                      end = (
-                     (FileName:  'BlueWater'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+                     (FileName:  'BlueWater'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
                       Width: 256; Height: 32; saveSurf: false),// sprWater
                      (FileName:     'Clouds'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
                       Width: 256; Height:128; saveSurf: false),// sprCloud
diff -r 540cea859395 -r 852f8872da1a hedgewars/uLandObjects.pas
--- a/hedgewars/uLandObjects.pas	Fri Aug 08 20:33:57 2008 +0000
+++ b/hedgewars/uLandObjects.pas	Fri Aug 08 20:38:26 2008 +0000
@@ -182,7 +182,9 @@
 if x1 > 0 then
 	begin
 	Result:= true;
-	tmpsurf:= LoadImage(Pathz[ptGraphics] + '/Girder', false, true, true);
+	tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/Girder', false, false, true);
+	if tmpsurf = nil then LoadImage(Pathz[ptGraphics] + '/Girder', false, true, true);
+	
 	rr.x:= x1;
 	while rr.x < x2 do
 		begin