aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-13 17:16:32 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-13 17:16:32 +0000
commitca12fbb41e2886ee23e95617f434742bb8be2dd1 (patch)
tree9c438bda9c3a75d2374faac28bc84bdee96223ac /src
parentf1566a45ac7de81f31a1b419d88e1742089ae56d (diff)
downloadusdx-ca12fbb41e2886ee23e95617f434742bb8be2dd1.tar.gz
usdx-ca12fbb41e2886ee23e95617f434742bb8be2dd1.tar.xz
usdx-ca12fbb41e2886ee23e95617f434742bb8be2dd1.zip
load type and typesbg from theme ini for selects
added type definitions to deluxe themes selects git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2235 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/base/UThemes.pas4
-rw-r--r--src/menu/UMenu.pas4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index 11598207..aa89af43 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -170,7 +170,9 @@ type
TThemeSelectSlide = record
Tex: string;
+ Typ: TTextureType;
TexSBG: string;
+ TypSBG: TTextureType;
X: integer;
Y: integer;
W: integer;
@@ -1790,7 +1792,9 @@ begin
ThemeSelectS.Text := Language.Translate(ThemeIni.ReadString(Name, 'Text', ''));
ThemeSelectS.Tex := {Skin.SkinPath + }ThemeIni.ReadString(Name, 'Tex', '');
+ ThemeSelectS.Typ := ParseTextureType(ThemeIni.ReadString(Name, 'Type', ''), TEXTURE_TYPE_PLAIN);
ThemeSelectS.TexSBG := {Skin.SkinPath + }ThemeIni.ReadString(Name, 'TexSBG', '');
+ ThemeSelectS.TypSBG := ParseTextureType(ThemeIni.ReadString(Name, 'TypeSBG', ''), TEXTURE_TYPE_PLAIN);
ThemeSelectS.X := ThemeIni.ReadInteger(Name, 'X', 0);
ThemeSelectS.Y := ThemeIni.ReadInteger(Name, 'Y', 0);
diff --git a/src/menu/UMenu.pas b/src/menu/UMenu.pas
index d30efaa7..b4ea3d00 100644
--- a/src/menu/UMenu.pas
+++ b/src/menu/UMenu.pas
@@ -1278,8 +1278,8 @@ begin
ThemeSelectS.SBGDColR, ThemeSelectS.SBGDColG, ThemeSelectS.SBGDColB, ThemeSelectS.SBGDInt,
ThemeSelectS.STColR, ThemeSelectS.STColG, ThemeSelectS.STColB, ThemeSelectS.STInt,
ThemeSelectS.STDColR, ThemeSelectS.STDColG, ThemeSelectS.STDColB, ThemeSelectS.STDInt,
- Skin.GetTextureFileName(ThemeSelectS.Tex), TEXTURE_TYPE_COLORIZED,
- Skin.GetTextureFileName(ThemeSelectS.TexSBG), TEXTURE_TYPE_COLORIZED,
+ Skin.GetTextureFileName(ThemeSelectS.Tex), ThemeSelectS.Typ,
+ Skin.GetTextureFileName(ThemeSelectS.TexSBG), ThemeSelectS.TypSBG,
ThemeSelectS.Text, Data);
for SO := 0 to High(Values) do
AddSelectSlideOption(Values[SO]);