From 7d61a98f807803a337fd12342c29eb0f5f69fc76 Mon Sep 17 00:00:00 2001
From: jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 20 Dec 2007 03:33:14 +0000
Subject: made USDX function when file paths differ from previous
 expectations.. ( most of the software was still using hard coded paths )

also added ability to have multiple song directories.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@735 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UThemes.pas | 179 +++++++++++++++++++++---------------------
 1 file changed, 91 insertions(+), 88 deletions(-)

(limited to 'Game/Code/Classes/UThemes.pas')

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 1c731ce0..bfffb26a 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -807,6 +807,8 @@ begin
 
   create_theme_objects();
   
+  writeln( 'TTheme.LoadTheme : '+ FileName );
+
   FileName := AdaptFilePaths( FileName );
 
   if not FileExists(FileName) then
@@ -828,7 +830,8 @@ begin
     ThemeIni := TMemIniFile.Create(FileName);
     {$ENDIF}
 
-    if ThemeIni.ReadString('Theme', 'Name', '') <> '' then begin
+    if ThemeIni.ReadString('Theme', 'Name', '') <> '' then
+    begin
 
       {Skin.SkinName := ThemeIni.ReadString('Theme', 'Name', 'Singstar');
       Skin.SkinPath := 'Skins\' + Skin.SkinName + '\';
@@ -2218,93 +2221,93 @@ begin
 end;
 
 procedure TTheme.create_theme_objects();
-begin
-  freeandnil( Loading       );
-  Loading       := TThemeLoading.Create;
-
-  freeandnil( Main      );
-  Main      := TThemeMain.Create;
-
-  freeandnil( Name      );
-  Name      := TThemeName.Create;
-
-  freeandnil( Level       );
-  Level       := TThemeLevel.Create;
-
-  freeandnil( Song      );
-  Song      := TThemeSong.Create;
-
-  freeandnil( Sing      );
-  Sing      := TThemeSing.Create;
-
-  freeandnil( Score       );
-  Score       := TThemeScore.Create;
-
-  freeandnil( Top5      );
-  Top5      := TThemeTop5.Create;
-
-  freeandnil( Options       );
-  Options       := TThemeOptions.Create;
-
-  freeandnil( OptionsGame       );
-  OptionsGame       := TThemeOptionsGame.Create;
-
-  freeandnil( OptionsGraphics       );
-  OptionsGraphics       := TThemeOptionsGraphics.Create;
-
-  freeandnil( OptionsSound      );
-  OptionsSound      := TThemeOptionsSound.Create;
-
-  freeandnil( OptionsLyrics       );
-  OptionsLyrics       := TThemeOptionsLyrics.Create;
-
-  freeandnil( OptionsThemes       );
-  OptionsThemes       := TThemeOptionsThemes.Create;
-
-  freeandnil( OptionsRecord       );
-  OptionsRecord       := TThemeOptionsRecord.Create;
-
-  freeandnil( OptionsAdvanced       );
-  OptionsAdvanced       := TThemeOptionsAdvanced.Create;
-
-
-  freeandnil( ErrorPopup      );
-  ErrorPopup      := TThemeError.Create;
-
-  freeandnil( CheckPopup      );
-  CheckPopup      := TThemeCheck.Create;
-
-
-  freeandnil( SongMenu      );
-  SongMenu      := TThemeSongMenu.Create;
-
-  freeandnil( SongJumpto      );
-  SongJumpto      := TThemeSongJumpto.Create;
-
-  //Party Screens
-  freeandnil( PartyNewRound       );
-  PartyNewRound       := TThemePartyNewRound.Create;
-
-  freeandnil( PartyWin      );
-  PartyWin      := TThemePartyWin.Create;
-
-  freeandnil( PartyScore      );
-  PartyScore      := TThemePartyScore.Create;
-
-  freeandnil( PartyOptions      );
-  PartyOptions      := TThemePartyOptions.Create;
-
-  freeandnil( PartyPlayer       );
-  PartyPlayer       := TThemePartyPlayer.Create;
-
-
-  //Stats Screens:
-  freeandnil( StatMain      );
-  StatMain :=        TThemeStatMain.Create;
-
-  freeandnil( StatDetail      );
-  StatDetail      := TThemeStatDetail.Create;
-
+begin
+  freeandnil( Loading       );
+  Loading       := TThemeLoading.Create;
+
+  freeandnil( Main      );
+  Main      := TThemeMain.Create;
+
+  freeandnil( Name      );
+  Name      := TThemeName.Create;
+
+  freeandnil( Level       );
+  Level       := TThemeLevel.Create;
+
+  freeandnil( Song      );
+  Song      := TThemeSong.Create;
+
+  freeandnil( Sing      );
+  Sing      := TThemeSing.Create;
+
+  freeandnil( Score       );
+  Score       := TThemeScore.Create;
+
+  freeandnil( Top5      );
+  Top5      := TThemeTop5.Create;
+
+  freeandnil( Options       );
+  Options       := TThemeOptions.Create;
+
+  freeandnil( OptionsGame       );
+  OptionsGame       := TThemeOptionsGame.Create;
+
+  freeandnil( OptionsGraphics       );
+  OptionsGraphics       := TThemeOptionsGraphics.Create;
+
+  freeandnil( OptionsSound      );
+  OptionsSound      := TThemeOptionsSound.Create;
+
+  freeandnil( OptionsLyrics       );
+  OptionsLyrics       := TThemeOptionsLyrics.Create;
+
+  freeandnil( OptionsThemes       );
+  OptionsThemes       := TThemeOptionsThemes.Create;
+
+  freeandnil( OptionsRecord       );
+  OptionsRecord       := TThemeOptionsRecord.Create;
+
+  freeandnil( OptionsAdvanced       );
+  OptionsAdvanced       := TThemeOptionsAdvanced.Create;
+
+
+  freeandnil( ErrorPopup      );
+  ErrorPopup      := TThemeError.Create;
+
+  freeandnil( CheckPopup      );
+  CheckPopup      := TThemeCheck.Create;
+
+
+  freeandnil( SongMenu      );
+  SongMenu      := TThemeSongMenu.Create;
+
+  freeandnil( SongJumpto      );
+  SongJumpto      := TThemeSongJumpto.Create;
+
+  //Party Screens
+  freeandnil( PartyNewRound       );
+  PartyNewRound       := TThemePartyNewRound.Create;
+
+  freeandnil( PartyWin      );
+  PartyWin      := TThemePartyWin.Create;
+
+  freeandnil( PartyScore      );
+  PartyScore      := TThemePartyScore.Create;
+
+  freeandnil( PartyOptions      );
+  PartyOptions      := TThemePartyOptions.Create;
+
+  freeandnil( PartyPlayer       );
+  PartyPlayer       := TThemePartyPlayer.Create;
+
+
+  //Stats Screens:
+  freeandnil( StatMain      );
+  StatMain :=        TThemeStatMain.Create;
+
+  freeandnil( StatDetail      );
+  StatDetail      := TThemeStatDetail.Create;
+
  end;
 
 end.
-- 
cgit v1.2.3