# HG changeset patch # User nemo # Date 1318864868 14400 # Node ID 2172330ad52a62b121db12f531bccda67752f4d6 # Parent bd7925eba0b80d203213469fe641fbab6c64df0d Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files. diff -r bd7925eba0b8 -r 2172330ad52a hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Mon Oct 17 02:07:58 2011 +0200 +++ b/hedgewars/uWorld.pas Mon Oct 17 11:21:08 2011 -0400 @@ -536,7 +536,7 @@ var i, w, h, lw, lh, rw, rh, sw: LongInt; begin sw:= round(cScreenWidth / cScaleFactor); - if ((SpritesData[sprL].Texture = nil) or (SpritesData[sprR].Texture = nil)) and (SpritesData[spr].Texture <> nil) then + if (SpritesData[sprL].Texture = nil) and (SpritesData[spr].Texture <> nil) then begin w:= SpritesData[spr].Width * SpritesData[spr].Texture^.Scale; h:= SpritesData[spr].Height * SpritesData[spr].Texture^.Scale; @@ -554,8 +554,11 @@ h:= SpritesData[spr].Height * SpritesData[spr].Texture^.Scale; lw:= SpritesData[sprL].Width * SpritesData[spr].Texture^.Scale; lh:= SpritesData[sprL].Height * SpritesData[spr].Texture^.Scale; - rw:= SpritesData[sprR].Width * SpritesData[spr].Texture^.Scale; - rh:= SpritesData[sprR].Height * SpritesData[spr].Texture^.Scale; + if SpritesData[sprR].Texture <> nil then + begin + rw:= SpritesData[sprR].Width * SpritesData[spr].Texture^.Scale; + rh:= SpritesData[sprR].Height * SpritesData[spr].Texture^.Scale + end; dec(Shift, w div 2); DrawTexture(Shift, WorldDy + LAND_HEIGHT + OffsetY - h, SpritesData[spr].Texture, SpritesData[spr].Texture^.Scale); @@ -567,11 +570,18 @@ end; i:= Shift + w; - while i <= sw do - begin - DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - rh, SpritesData[sprR].Texture, SpritesData[sprR].Texture^.Scale); - inc(i, rw) - end + if SpritesData[sprR].Texture <> nil then + while i <= sw do + begin + DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - rh, SpritesData[sprR].Texture, SpritesData[sprR].Texture^.Scale); + inc(i, rw) + end + else + while i <= sw do + begin + DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - lh, SpritesData[sprL].Texture, SpritesData[sprL].Texture^.Scale); + inc(i, lw) + end end end; diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/Bamboo/SkyR.png Binary file share/hedgewars/Data/Themes/Bamboo/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/CrazyMission/SkyR.png Binary file share/hedgewars/Data/Themes/CrazyMission/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/EarthRise/SkyR.png Binary file share/hedgewars/Data/Themes/EarthRise/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/Golf/SkyR.png Binary file share/hedgewars/Data/Themes/Golf/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/Halloween/SkyR.png Binary file share/hedgewars/Data/Themes/Halloween/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/Jungle/SkyR.png Binary file share/hedgewars/Data/Themes/Jungle/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/Sheep/SkyR.png Binary file share/hedgewars/Data/Themes/Sheep/SkyR.png has changed diff -r bd7925eba0b8 -r 2172330ad52a share/hedgewars/Data/Themes/Stage/SkyR.png Binary file share/hedgewars/Data/Themes/Stage/SkyR.png has changed