diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-01-02 01:38:02 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-01-02 01:38:02 +0000 |
commit | 8b1898e992b4247e640f4449667bfb6a780d3de7 (patch) | |
tree | 3dd63d9855ea0d99db4478e8d4b7a83a0c8f426e /src/base/USkins.pas | |
parent | b4e12810394d8b1c024ba81ebb0810ab425bdc45 (diff) | |
download | usdx-8b1898e992b4247e640f4449667bfb6a780d3de7.tar.gz usdx-8b1898e992b4247e640f4449667bfb6a780d3de7.tar.xz usdx-8b1898e992b4247e640f4449667bfb6a780d3de7.zip |
GetSkinNumber and LoadSkin
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3170 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/base/USkins.pas')
-rw-r--r-- | src/base/USkins.pas | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/base/USkins.pas b/src/base/USkins.pas index 6d8c2ebf..0492fb7a 100644 --- a/src/base/USkins.pas +++ b/src/base/USkins.pas @@ -62,9 +62,9 @@ type procedure LoadList; procedure ParseDir(Dir: IPath); procedure LoadHeader(FileName: IPath); - procedure LoadSkin(Name: string); + procedure LoadSkin(Name, Theme: string); function GetTextureFileName(TextureName: string): IPath; - function GetSkinNumber(Name: string): integer; + function GetSkinNumber(Name, Theme: string): integer; function GetDefaultColor(SkinNo: integer): integer; procedure GetSkinsByTheme(Theme: string; out Skins: TUTF8StringDynArray); @@ -143,14 +143,14 @@ begin SkinIni.Free; end; -procedure TSkin.LoadSkin(Name: string); +procedure TSkin.LoadSkin(Name, Theme: string); var SkinIni: TMemIniFile; SL: TStringList; T: integer; S: integer; begin - S := GetSkinNumber(Name); + S := GetSkinNumber(Name, Theme); SkinPath := Skin[S].Path; SkinIni := TMemIniFile.Create(SkinPath.Append(Skin[S].FileName).ToNative); @@ -191,13 +191,13 @@ begin end; end; -function TSkin.GetSkinNumber(Name: string): integer; +function TSkin.GetSkinNumber(Name, Theme: string): integer; var S: integer; begin Result := 0; // set default to the first available skin for S := 0 to High(Skin) do - if CompareText(Skin[S].Name, Name) = 0 then + if (CompareText(Skin[S].Name, Name) = 0) and (CompareText(Skin[S].Theme, Theme) = 0) then Result := S; end; |