fixed song loading in Lazarus..

cant assume variables are initialized as 0 :)
in UFile "Done: byte;" was no initialized on lazarus compiler.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@431 b956fd51-792f-4845-bead-9b4dfca2ff2c

8 files changed, 866 insertions, 819 deletions

diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index e8d5e878..5ce3ebf7 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -119,6 +119,9 @@ var
 begin

   ActFont := 0;

 

+  Log.LogStatus( '' , '---------------------------');

+

+  Log.LogStatus( 'Font' , '---------------------------');

   SetLength(Fonts, 5);

   Fonts[0].Tex := Texture.LoadTexture(true, 'Font', 'PNG', 'Font', 0);

   Fonts[0].Tex.H := 30;

@@ -126,18 +129,22 @@ begin
   Fonts[0].Done := -1;

   Fonts[0].Outline := 0;

 

+  Log.LogStatus( 'FontB' , '---------------------------');

+

   Fonts[1].Tex := Texture.LoadTexture(true, 'FontB', 'PNG', 'Font', 0);

   Fonts[1].Tex.H := 30;

   Fonts[1].AspectW := 1;

   Fonts[1].Done := -1;

   Fonts[1].Outline := 0;

 

+  Log.LogStatus( 'FontO' , '---------------------------');

   Fonts[2].Tex := Texture.LoadTexture(true, 'FontO', 'PNG', 'Font Outline', 0);

   Fonts[2].Tex.H := 30;

   Fonts[2].AspectW := 0.95;

   Fonts[2].Done := -1;

   Fonts[2].Outline := 5;

 

+  Log.LogStatus( 'FontO2' , '---------------------------');

   Fonts[3].Tex := Texture.LoadTexture(true, 'FontO2', 'PNG', 'Font Outline 2', 0);

   Fonts[3].Tex.H := 30;

   Fonts[3].AspectW := 0.95;

@@ -212,41 +219,48 @@ var
   PR, PB:       real;

   XItal:        real; // X shift for italic type letter

 begin

-  with Fonts[ActFont].Tex do begin

-  FWidth := Fonts[ActFont].Width[Ord(Letter)];

-

-  W := FWidth * (H/30) * Fonts[ActFont].AspectW;

-//  H := 30;

-

-  // set texture positions

-  TexX := (ord(Letter) mod 16) * 1/16 + 1/32 - FWidth/1024 - Fonts[ActFont].Outline/1024;

-  TexY := (ord(Letter) div 16) * 1/16 + 2/1024; // 2/1024

-  TexR := (ord(Letter) mod 16) * 1/16 + 1/32 + FWidth/1024 + Fonts[ActFont].Outline/1024;

-  TexB := (1 + ord(Letter) div 16) * 1/16 - 2/1024;

-

-  // set vector positions

-  PL := X - Fonts[ActFont].Outline * (H/30) * Fonts[ActFont].AspectW /2;

-  PT := Y;

-  PR := PL + W + Fonts[ActFont].Outline * (H/30) * Fonts[ActFont].AspectW;

-  PB := PT + H;

-  if Fonts[ActFont].Italic = false then

-    XItal := 0

-  else

-    XItal := 12;

+  with Fonts[ActFont].Tex do

+  begin

+    FWidth := Fonts[ActFont].Width[Ord(Letter)];

+

+    W := FWidth * (H/30) * Fonts[ActFont].AspectW;

+  //  H := 30;

+

+    // set texture positions

+    TexX := (ord(Letter) mod 16) * 1/16 + 1/32 - FWidth/1024 - Fonts[ActFont].Outline/1024;

+    TexY := (ord(Letter) div 16) * 1/16 + 2/1024; // 2/1024

+    TexR := (ord(Letter) mod 16) * 1/16 + 1/32 + FWidth/1024 + Fonts[ActFont].Outline/1024;

+    TexB := (1 + ord(Letter) div 16) * 1/16 - 2/1024;

+

+    // set vector positions

+    PL := X - Fonts[ActFont].Outline * (H/30) * Fonts[ActFont].AspectW /2;

+    PT := Y;

+    PR := PL + W + Fonts[ActFont].Outline * (H/30) * Fonts[ActFont].AspectW;

+    PB := PT + H;

+

+    if Fonts[ActFont].Italic = false then

+      XItal := 0

+    else

+      XItal := 12;

+

+    glEnable(GL_TEXTURE_2D);

+    glEnable(GL_BLEND);

+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

+    glBindTexture(GL_TEXTURE_2D, TexNum);

+

+    glBegin(GL_QUADS);

+    try

+      glTexCoord2f(TexX, TexY); glVertex2f(PL+XItal,  PT);

+      glTexCoord2f(TexX, TexB); glVertex2f(PL,        PB);

+      glTexCoord2f(TexR, TexB); glVertex2f(PR,        PB);

+      glTexCoord2f(TexR, TexY); glVertex2f(PR+XItal,  PT);

+    finally

+      glEnd;

+    end;

 

-  glEnable(GL_TEXTURE_2D);

-  glEnable(GL_BLEND);

-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-  glBindTexture(GL_TEXTURE_2D, TexNum);

-  glBegin(GL_QUADS);

-    glTexCoord2f(TexX, TexY); glVertex2f(PL+XItal,  PT);

-    glTexCoord2f(TexX, TexB); glVertex2f(PL,        PB);

-    glTexCoord2f(TexR, TexB); glVertex2f(PR,        PB);

-    glTexCoord2f(TexR, TexY); glVertex2f(PR+XItal,  PT);

-  glEnd;

-  X := X + W;

-  glDisable(GL_BLEND);

-  glDisable(GL_TEXTURE_2D);

+    X := X + W;

+    glDisable(GL_BLEND);

+    glDisable(GL_TEXTURE_2D);

   end; // with

 end;

 

@@ -307,19 +321,33 @@ end;
 

 procedure glPrint(text: pchar);	                // Custom GL "Print" Routine

 var

-  Letter:       char;

+//  Letter :       char;

+  iPos   : Integer;

 begin

-  if (Text = '') then   			        // If There's No Text

-                Exit;					        // Do Nothing

+  if (Text = '') then     // If There's No Text

+    Exit;					        // Do Nothing

 

-  while (length(text) > 0) do begin

+(*

+  while (length(text) > 0) do

+  begin

     // cut

     Letter := Text[0];

-    Text := pchar(Copy(Text, 2, Length(Text)-1));

+    Text   := pchar(Copy(Text, 2, Length(Text)-1));

 

     // print

     glPrintLetter(Letter);

   end; // while

+*)

+

+  // This code is better, because doing a Copy of for every

+  // letter in a string is a waste of CPU & Memory resources.

+  // Copy operations are quite memory intensive, and this simple

+  // code achieves the same result.

+  for iPos := 0 to length( text ) - 1 do

+  begin

+    glPrintLetter( Text[iPos] );

+  end;

+

 end;

 

 procedure glPrintCut(text: pchar);

diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas
index 34342e26..565c5ee3 100644
--- a/Game/Code/Classes/UFiles.pas
+++ b/Game/Code/Classes/UFiles.pas
@@ -137,11 +137,12 @@ end;
 //--------------------

 function ReadTXTHeader(var Song: TSong): boolean;

 var

-Line, Identifier, Value: String;

-Temp: word;

-Done: byte;

+  Line, Identifier, Value: String;

+  Temp: word;

+  Done: byte;

 begin

   Result := true;

+  Done   := 0;

 

   //Read first Line

   ReadLn (SongFile, Line);

@@ -167,6 +168,8 @@ begin
       Identifier  := Uppercase(Trim(Copy(Line, 2, Temp - 2))); //Uppercase is for Case Insensitive Checks

       Value       := Trim(Copy(Line, Temp + 1,Length(Line) - Temp));

 

+      Log.LogError('Identifier: '+Identifier+' - '+ Value );

+

       //Check the Identifier (If Value is given)

       if (Length(Value) <> 0) then

       begin

@@ -332,7 +335,7 @@ begin
     else

     begin

       Result := False;

-      Log.LogError('File Incomplete or not Ultrastar TxT: ' + Song.FileName);

+      Log.LogError('File Incomplete or not Ultrastar TxT (A): ' + Song.FileName);

       break;

     end;

 

@@ -354,7 +357,7 @@ begin
     else if (Done and 1) = 0 then //No Title Flag

     Log.LogError('Title Tag Missing: ' + Song.FileName)

     else //unknown Error

-    Log.LogError('File Incomplete or not Ultrastar TxT: ' + Song.FileName);

+    Log.LogError('File Incomplete or not Ultrastar TxT (B - '+ inttostr(Done) +'): ' + Song.FileName);

   end;

 

 end;

diff --git a/Game/Code/Classes/USingScores.pas b/Game/Code/Classes/USingScores.pas
index 27a65b32..881a5515 100644
--- a/Game/Code/Classes/USingScores.pas
+++ b/Game/Code/Classes/USingScores.pas
@@ -1,7 +1,14 @@
 unit USingScores;

 

 interface

-uses UThemes, OpenGl12, UTexture;

+

+{$IFDEF FPC}

+  {$MODE Delphi}

+{$ENDIF}

+

+uses UThemes,

+     OpenGl12,

+     UTexture;

 

 //Some Constances containing Options that could change by time

 const

@@ -158,7 +165,12 @@ type
 

 

 implementation

-uses SDL, SysUtils, ULog, UGraphic, TextGL;

+

+uses SDL,

+     SysUtils,

+     ULog,

+     UGraphic,

+     TextGL;

 

 //-----------

 //Constructor just sets some standard Settings

diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index 301eb15c..e236abf0 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -1,753 +1,756 @@
-unit USongs;
-
-interface
-
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
-
-
-uses SysUtils, ULog, UTexture, UCatCovers;
-
-type
-  TBPM = record
-    BPM:        real;
-    StartBeat:  real;
-  end;
-
-  TScore = record
-    Name:       string;
-    Score:      integer;
-    Length:     string;
-  end;
-
-  TSong = record
-    Path:       string;
-    Folder:     string; // for sorting by folder
-    FileName:   string;
-
-    // sorting methods
-    Category:   array of string; // I think I won't need this
-    Genre:      string;
-    Edition:    string;
-    Language:   string; // 0.5.0: new
-
-    Title:      string;
-    Artist:     string;
-
-    Text:       string;
-    Creator:    string;
-
-    Cover:      string;
-    CoverTex:   TTexture;
-    Mp3:        string;
-    Background: string;
-    Video:      string;
-    VideoGAP:   real;
-    VideoLoaded: boolean; // 0.5.0: true if the video has been loaded 
-    NotesGAP:   integer;
-    Start:      real; // in seconds
-    Finish:     integer; // in miliseconds
-    Relative:   boolean;
-    Resolution: integer;
-    BPM:        array of TBPM;
-    GAP:        real; // in miliseconds
-
-    Score:      array[0..2] of array of TScore;
-
-    // these are used when sorting is enabled
-    Visible:    boolean; // false if hidden, true if visible
-    Main:       boolean; // false for songs, true for category buttons
-    OrderNum:   integer; // has a number of category for category buttons and songs
-    OrderTyp:   integer; // type of sorting for this button (0=name)
-    CatNumber:  integer; // Count of Songs in Category for Cats and Number of Song in Category for Songs
-  end;
-
-  TSongs = class
-  private
-    BrowsePos: Cardinal; //Actual Pos in Song Array
-  public
-    Song:       array of TSong; // array of songs
-    Selected:   integer; // selected song index
-    procedure LoadSongList; // load all songs
-    procedure BrowseDir(Dir: string); // should return number of songs in the future
-    procedure Sort(Order: integer);
-    function FindSongFile(Dir, Mask: string): string;
-  end;
-
-  TCatSongs = class
-    Song:       array of TSong; // array of categories with songs
-    Selected:   integer; // selected song index
-    Order:      integer; // order type (0=title)
-    CatNumShow: integer; // Category Number being seen
-    CatCount:   integer; //Number of Categorys
-
-    procedure Refresh; // refreshes arrays by recreating them from Songs array
-//    procedure Sort(Order: integer);
-    procedure ShowCategory(Index: integer); // expands all songs in category
-    procedure HideCategory(Index: integer); // hides all songs in category
-    procedure ClickCategoryButton(Index: integer); // uses ShowCategory and HideCategory when needed
-    procedure ShowCategoryList; //Hides all Songs And Show the List of all Categorys
-    function FindNextVisible(SearchFrom:integer): integer; //Find Next visible Song
-    function VisibleSongs: integer; // returns number of visible songs (for tabs)
-    function VisibleIndex(Index: integer): integer; // returns visible song index (skips invisible)
-
-    function SetFilter(FilterStr: String; const fType: Byte): Cardinal;
-  end;
-
-var
-  Songs:      TSongs; // all songs
-  CatSongs:   TCatSongs; // categorized songs
-  AktSong:    TSong; // one song *unknown use)
-
-implementation
-
-uses StrUtils,
-     UFiles,
-     UMain,
-     UIni;
-
-
-procedure TSongs.LoadSongList;
-begin
-  Log.LogStatus('Initializing', 'LoadSongList');
-
-  // clear
-  Setlength(Song, 50);
-
-  BrowsePos := 0;
-  // browse directories
-  BrowseDir(SongPath);
-
-  //Set Correct SongArray Length
-  SetLength(Song, BrowsePos);
-//  if Ini.Debug = 1 then BrowseDir('D:\Extract\Songs\');
-end;
-
-procedure TSongs.BrowseDir(Dir: string);
-var
-  SR:     TSearchRec;   // for parsing Songs Directory
-  SLen:   integer;
-begin
-  if FindFirst(Dir + '*', faDirectory, SR) = 0 then begin
-    repeat
-      if (SR.Name <> '.') and (SR.Name <> '..') then
-        BrowseDir(Dir + Sr.Name + PathDelim);
-    until FindNext(SR) <> 0;
-  end; // if
-  FindClose(SR);
-
-//        Log.LogStatus('Parsing directory: ' + Dir + SR.Name, 'LoadSongList');
-
- if FindFirst(Dir + '*.txt', 0, SR) = 0 then begin
-//          Log.LogStatus('Parsing file:      ' + Dir + SR.Name + '\' + SRD.Name, 'LoadSongList');
-    repeat
-      //New Mod for better Memory Management
-
-      SLen := BrowsePos;
-      {//Old
-      SLen := Length(Song);
-      SetLength(Song, SLen + 1);//}
-
-      Song[SLen].Path := Dir;
-      Song[SLen].Folder := Copy(Dir, Length(SongPath)+1, 10000);
-      Song[SLen].Folder := Copy(Song[SLen].Folder, 1, Pos( PathDelim , Song[SLen].Folder)-1);
-      Song[SLen].FileName := SR.Name;
-
-      if (AnalyseFile(Song[SLen]) = false) then Dec(BrowsePos)
-      else begin
-        // scanning complete, file is good
-        // if there is no cover then try to find it
-        if Song[SLen].Cover = '' then Song[SLen].Cover := FindSongFile(Dir, '*[CO].jpg');
-//        if Song[SLen].Background = '' then begin
-//          Song[SLen].Background := FindSongFile(Dir, '*[BG].jpg');
-//        end; // no needed here}
-
-        // fix by adding path. no, don't fix it.
-//        if Song[SLen].Cover <> '' then
-//          Song[SLen].Cover := Song[SLen].Path + Song[SLen].Cover;
-      end;
-
-      //Change Length Only every 50 Entrys
-      Inc(BrowsePos);
-      
-      if (BrowsePos mod 50 = 0) AND (BrowsePos <> 0) then
-      begin
-          SetLength(Song, Length(Song) + 50);
-      end;
-
-    until FindNext(SR) <> 0;
-    end; // if FindFirst
-  FindClose(SR);
-end;
-
-procedure TSongs.Sort(Order: integer);
-var
-  S:    integer;
-  S2:   integer;
-  TempSong:   TSong;
-begin
-  case Order of
-    sEdition: // by edition
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Edition, Song[S-1].Edition) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-      end;
-    sGenre: // by genre
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Genre, Song[S-1].Genre) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-      end;
-    sTitle: // by title
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-
-      end;
-    sArtist: // by artist
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-      end;
-    sFolder: // by folder
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Folder, Song[S-1].Folder) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-      end;
-    sTitle2: // by title2
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-
-      end;
-    sArtist2: // by artist2
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin
-              // zamiana miejscami
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-      end;
-    sLanguage: // by Language
-      begin
-        for S2 := 0 to Length(Song)-1 do
-          for S := 1 to Length(Song)-1 do
-            if CompareText(Song[S].Language, Song[S-1].Language) < 0 then begin
-              TempSong := Song[S-1];
-              Song[S-1] := Song[S];
-              Song[S] := TempSong;
-            end;
-      end;
-
-  end; // case
-end;
-
-function TSongs.FindSongFile(Dir, Mask: string): string;
-var
-  SR:     TSearchRec;   // for parsing song directory
-begin
-  Result := '';
-  if FindFirst(Dir + Mask, faDirectory, SR) = 0 then begin
-    Result := SR.Name;
-  end; // if
-  FindClose(SR);
-end;
-
-procedure TCatSongs.Refresh;
-var
-  S:        integer; // temporary song index
-  CatLen:   integer; // length of CatSongs.Song
-  Letter:   char; // current letter for sorting using letter
-  SS:       string; // current edition for sorting using edition, genre etc.
-  Order:    integer; // number used for ordernum
-  Letter2:  char; //
-  CatNumber:integer; // Number of Song in Category
-begin
-  CatNumShow := -1;
-//  Songs.Sort(0); // by title
-
-case Ini.Sorting of
-    sEdition: begin
-          Songs.Sort(sArtist);
-          Songs.Sort(sEdition);
-        end;
-    sGenre: begin
-          Songs.Sort(sArtist);
-          Songs.Sort(sGenre);
-        end;
-    sLanguage: begin
-          Songs.Sort(sArtist);
-          Songs.Sort(sLanguage);
-        end;
-    sFolder:  begin
-          Songs.Sort(sArtist);
-          Songs.Sort(sFolder);
-        end;
-    sTitle:  Songs.Sort(sTitle);
-    sArtist:  Songs.Sort(sArtist);
-    sTitle2:  Songs.Sort(sTitle2); // by title2
-    sArtist2:  Songs.Sort(sArtist2); // by artist2
-
-  end; // case
-
-
-  Letter := ' ';
-  SS := '';
-  Order := 0;
-  CatNumber := 0;
-
-  //Songs leeren
-  SetLength (Song, 0);
-
-  for S := Low(Songs.Song) to High(Songs.Song) do begin
-    if (Ini.Tabs = 1) then
-    if (Ini.Sorting = sEdition) and (CompareText(SS, Songs.Song[S].Edition) <> 0) then begin
-      // add Category Button
-      Inc(Order);
-      SS := Songs.Song[S].Edition;
-      CatLen := Length(CatSongs.Song);
-      SetLength(CatSongs.Song, CatLen+1);
-      CatSongs.Song[CatLen].Artist := '[' + SS + ']';
-      CatSongs.Song[CatLen].Main := true;
-      CatSongs.Song[CatLen].OrderTyp := 0;
-      CatSongs.Song[CatLen].OrderNum := Order;
-
-
-
-      // 0.4.3
-      // if SS = 'Singstar' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
-      // if SS = 'Singstar Part 2' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
-      // if SS = 'Singstar German' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
-      // if SS = 'Singstar Spanish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
-      // if SS = 'Singstar Italian' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
-      // if SS = 'Singstar French' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
-      // if SS = 'Singstar Party' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Party.jpg';
-      // if SS = 'Singstar Popworld' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Popworld.jpg';
-      // if SS = 'Singstar 80s' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';
-      // if SS = 'Singstar 80s Polish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';
-      // if SS = 'Singstar Rocks' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Rocks.jpg';
-      // if SS = 'Singstar Anthems' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Anthems.jpg';
-
-      {// cover-patch
-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';//}
-
-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
-
-      //CatNumber Patch
-      if (SS <> '') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-      CatSongs.Song[CatLen].Visible := true;
-    end
-
-    else if (Ini.Sorting = sGenre) and (CompareText(SS, Songs.Song[S].Genre) <> 0) then begin
-      // add Genre Button
-      Inc(Order);
-      SS := Songs.Song[S].Genre;
-      CatLen := Length(CatSongs.Song);
-      SetLength(CatSongs.Song, CatLen+1);
-      CatSongs.Song[CatLen].Artist := SS;
-      CatSongs.Song[CatLen].Main := true;
-      CatSongs.Song[CatLen].OrderTyp := 0;
-      CatSongs.Song[CatLen].OrderNum := Order;
-
-      {// cover-patch
-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
-
-      //CatNumber Patch
-      if (SS <> '') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-      CatSongs.Song[CatLen].Visible := true;
-    end
-
-    else if (Ini.Sorting = sLanguage) and (CompareText(SS, Songs.Song[S].Language) <> 0) then begin
-      // add Language Button
-      Inc(Order);
-      SS := Songs.Song[S].Language;
-      CatLen := Length(CatSongs.Song);
-      SetLength(CatSongs.Song, CatLen+1);
-      CatSongs.Song[CatLen].Artist := SS;
-      CatSongs.Song[CatLen].Main := true;
-      CatSongs.Song[CatLen].OrderTyp := 0;
-      CatSongs.Song[CatLen].OrderNum := Order;
-
-      {// cover-patch
-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
-
-      //CatNumber Patch
-      if (SS <> '') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-      CatSongs.Song[CatLen].Visible := true;
-    end
-
-    else if (Ini.Sorting = sTitle) and (Length(Songs.Song[S].Title)>=1) and (Letter <> UpCase(Songs.Song[S].Title[1])) then begin
-      // add a letter Category Button
-      Inc(Order);
-      Letter := UpCase(Songs.Song[S].Title[1]);
-      CatLen := Length(CatSongs.Song);
-      SetLength(CatSongs.Song, CatLen+1);
-      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
-      CatSongs.Song[CatLen].Main := true;
-      CatSongs.Song[CatLen].OrderTyp := 0;
-//      Order := ord(Letter);
-      CatSongs.Song[CatLen].OrderNum := Order;
-
-
-      {// cover-patch
-      if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'
-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
-
-      //CatNumber Patch
-      if (Letter <> ' ') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-      CatSongs.Song[CatLen].Visible := true;
-    end
-
-    else if (Ini.Sorting = sArtist) and (Length(Songs.Song[S].Artist)>=1) and (Letter <> UpCase(Songs.Song[S].Artist[1])) then begin
-      // add a letter Category Button
-      Inc(Order);
-      Letter := UpCase(Songs.Song[S].Artist[1]);
-      CatLen := Length(CatSongs.Song);
-      SetLength(CatSongs.Song, CatLen+1);
-      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
-      CatSongs.Song[CatLen].Main := true;
-      CatSongs.Song[CatLen].OrderTyp := 0;
-//      Order := ord(Letter);
-      CatSongs.Song[CatLen].OrderNum := Order;
-
-      {// cover-patch
-      if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'
-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
-
-      //CatNumber Patch
-      if (Letter <> ' ') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-      CatSongs.Song[CatLen].Visible := true;
-    end
-
-    else if (Ini.Sorting = sFolder) and (CompareText(SS, Songs.Song[S].Folder) <> 0) then begin
-      // 0.5.0: add folder tab
-      Inc(Order);
-      SS := Songs.Song[S].Folder;
-      CatLen := Length(CatSongs.Song);
-      SetLength(CatSongs.Song, CatLen+1);
-      CatSongs.Song[CatLen].Artist := SS;
-      CatSongs.Song[CatLen].Main := true;
-      CatSongs.Song[CatLen].OrderTyp := 0;
-      CatSongs.Song[CatLen].OrderNum := Order;
-
-      {// cover-patch
-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
-
-      //CatNumber Patch
-      if (SS <> '') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-      CatSongs.Song[CatLen].Visible := true;
-    end
-
-    else if (Ini.Sorting = sTitle2) AND (Length(Songs.Song[S].Title)>=1) then begin
-      if (ord(Songs.Song[S].Title[1]) > 47) and (ord(Songs.Song[S].Title[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Title[1]);
-      if (Letter <> Letter2) then begin
-        // add a letter Category Button
-        Inc(Order);
-        Letter := Letter2;
-        CatLen := Length(CatSongs.Song);
-        SetLength(CatSongs.Song, CatLen+1);
-        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
-        CatSongs.Song[CatLen].Main := true;
-        CatSongs.Song[CatLen].OrderTyp := 0;
-//      Order := ord(Letter);
-        CatSongs.Song[CatLen].OrderNum := Order;
-
-        {// cover-patch
-        if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'
-        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
-
-        //CatNumber Patch
-      if (Letter <> ' ') then
-      begin
-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-        CatNumber := 0;
-      end;
-
-        CatSongs.Song[CatLen].Visible := true;
-      end;
-    end
-
-    else if (Ini.Sorting = sArtist2) AND (Length(Songs.Song[S].Artist)>=1) then begin
-     if (ord(Songs.Song[S].Artist[1]) > 47) and (ord(Songs.Song[S].Artist[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Artist[1]);
-       if (Letter <> Letter2) then begin
-        // add a letter Category Button
-        Inc(Order);
-        Letter := Letter2;
-        CatLen := Length(CatSongs.Song);
-        SetLength(CatSongs.Song, CatLen+1);
-        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
-        CatSongs.Song[CatLen].Main := true;
-        CatSongs.Song[CatLen].OrderTyp := 0;
-//      Order := ord(Letter);
-        CatSongs.Song[CatLen].OrderNum := Order;
-
-        {// cover-patch
-        if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'
-        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
-        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
-
-        //CatNumber Patch
-        if (Letter <> ' ') then
-        begin
-          Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
-          CatNumber := 0;
-        end;
-        
-        CatSongs.Song[CatLen].Visible := true;
-      end;
-    end;
-
-
-    CatLen := Length(CatSongs.Song);
-    SetLength(CatSongs.Song, CatLen+1);
-
-    Inc (CatNumber); //Increase Number in Cat
-
-    CatSongs.Song[CatLen] := Songs.Song[S];
-    CatSongs.Song[CatLen].OrderNum := Order; // assigns category
-    CatSongs.Song[CatLen].CatNumber := CatNumber;
-
-    if (Ini.Tabs = 0) then CatSongs.Song[CatLen].Visible := true
-    else if (Ini.Tabs = 1) then CatSongs.Song[CatLen].Visible := false;
-//    if (Ini.Tabs = 1) and (Order = 1) then CatSongs.Song[CatLen].Visible := true; // open first tab
-//CatSongs.Song[CatLen].Visible := true;
-
-  end;
-//CatNumber Patch - Set CatNumber of Last Category
-if (ini.Tabs_at_startup = 1) And (high(Song) >=1) then
-  Song[CatLen - CatNumber].CatNumber := CatNumber;//Set CatNumber of Categroy
-//CatCount Patch
-CatCount := Order;
-end;
-
-procedure TCatSongs.ShowCategory(Index: integer);
-var
-  S:    integer; // song
-begin
-  CatNumShow := Index;
-  for S := 0 to high(CatSongs.Song) do
-  begin
-    if (CatSongs.Song[S].OrderNum = Index) AND (Not CatSongs.Song[S].Main) then
-      CatSongs.Song[S].Visible := true
-    else
-      CatSongs.Song[S].Visible := false;
-  end;
-end;
-
-procedure TCatSongs.HideCategory(Index: integer); // hides all songs in category
-var
-  S:    integer; // song
-begin
-  for S := 0 to high(CatSongs.Song) do begin
-    if not CatSongs.Song[S].Main then
-      CatSongs.Song[S].Visible := false // hides all at now
-  end;
-end;
-
-procedure TCatSongs.ClickCategoryButton(Index: integer);
-var
-  Num, S:    integer;
-begin
-  Num := CatSongs.Song[Index].OrderNum;
-  if Num <> CatNumShow then
-    begin
-    ShowCategory(Num);
-    end
-  else begin
-    ShowCategoryList;
-  end;
-end;
-
-//Hide Categorys when in Category Hack
-procedure TCatSongs.ShowCategoryList;
-var
-  Num, S:    integer;
-begin
-  //Hide All Songs Show All Cats
-  for S := 0 to high(CatSongs.Song) do begin
-    if CatSongs.Song[S].Main then
-      CatSongs.Song[S].Visible := true
-    else
-      CatSongs.Song[S].Visible := false
-  end;
-  CatSongs.Selected := CatNumShow; //Show last shown Category
-  CatNumShow := -1;
-end;
-//Hide Categorys when in Category Hack End
-
-//Wrong song selected when tabs on bug
-function TCatSongs.FindNextVisible(SearchFrom:integer): integer;//Find next Visible Song
-var
-  I: Integer;
-  begin
-  Result := -1;
-  I := SearchFrom + 1;
-  while not CatSongs.Song[I].Visible do
-    begin
-    Inc (I);
-    if (I>high(CatSongs.Song)) then
-      I := low(CatSongs.Song);
-    if (I = SearchFrom) then //Make One Round and no song found->quit
-      break;
-    end;
-  end;
-//Wrong song selected when tabs on bug End
-
-function TCatSongs.VisibleSongs: integer;
-var
-  S:    integer; // song
-begin
-  Result := 0;
-  for S := 0 to high(CatSongs.Song) do
-    if CatSongs.Song[S].Visible = true then Inc(Result);
-end;
-
-function TCatSongs.VisibleIndex(Index: integer): integer;
-var
-  S:    integer; // song
-begin
-  Result := 0;
-  for S := 0 to Index-1 do
-    if CatSongs.Song[S].Visible = true then Inc(Result);
-end;
-
-function TCatSongs.SetFilter(FilterStr: String; const fType: Byte): Cardinal;
-var
-  I, J: Integer;
-  cString: String;
-  SearchStr: Array of String;
-begin
-  {fType: 0: All
-          1: Title
-          2: Artist}
-  FilterStr := Trim(FilterStr);
-  if FilterStr<>'' then begin
-    Result := 0;
-    //Create Search Array
-    SetLength(SearchStr, 1);
-    I := Pos (' ', FilterStr);
-    While (I <> 0) do
-    begin
-      SetLength (SearchStr, Length(SearchStr) + 1);
-      cString := Copy(FilterStr, 1, I-1);
-      if (cString <> ' ') AND (cString <> '') then
-        SearchStr[High(SearchStr)-1] := cString;
-      Delete (FilterStr, 1, I);
-
-      I := Pos (' ', FilterStr);
-    end;
-    //Copy last Word
-    if (FilterStr <> ' ') AND (FilterStr <> '') then
-      SearchStr[High(SearchStr)] := FilterStr;
-
-    for I:=0 to High(Song) do begin
-      if not Song[i].Main then
-      begin
-        case fType of
-          0: cString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;
-          1: cString := Song[I].Title;
-          2: cString := Song[I].Artist;
-        end;
-        Song[i].Visible:=True;
-        //Look for every Searched Word
-        For J := 0 to High(SearchStr) do
-        begin
-          Song[i].Visible := Song[i].Visible AND AnsiContainsText(cString, SearchStr[J])
-        end;
-        if Song[i].Visible then
-          Inc(Result);
-      end
-      else
-        Song[i].Visible:=False;
-    end;
-    CatNumShow := -2;
-  end
-  else begin
-    for i:=0 to High(Song) do begin
-      Song[i].Visible:=(Ini.Tabs=1)=Song[i].Main;
-      CatNumShow := -1;
-    end;
-    Result := 0;
-  end;
-end;
-
-end.
+unit USongs;

+

+interface

+

+{$IFDEF FPC}

+  {$MODE DELPHI}

+{$ENDIF}

+

+

+uses SysUtils, ULog, UTexture, UCatCovers;

+

+type

+  TBPM = record

+    BPM:        real;

+    StartBeat:  real;

+  end;

+

+  TScore = record

+    Name:       string;

+    Score:      integer;

+    Length:     string;

+  end;

+

+  TSong = record

+    Path:       string;

+    Folder:     string; // for sorting by folder

+    FileName:   string;

+

+    // sorting methods

+    Category:   array of string; // I think I won't need this

+    Genre:      string;

+    Edition:    string;

+    Language:   string; // 0.5.0: new

+

+    Title:      string;

+    Artist:     string;

+

+    Text:       string;

+    Creator:    string;

+

+    Cover:      string;

+    CoverTex:   TTexture;

+    Mp3:        string;

+    Background: string;

+    Video:      string;

+    VideoGAP:   real;

+    VideoLoaded: boolean; // 0.5.0: true if the video has been loaded 

+    NotesGAP:   integer;

+    Start:      real; // in seconds

+    Finish:     integer; // in miliseconds

+    Relative:   boolean;

+    Resolution: integer;

+    BPM:        array of TBPM;

+    GAP:        real; // in miliseconds

+

+    Score:      array[0..2] of array of TScore;

+

+    // these are used when sorting is enabled

+    Visible:    boolean; // false if hidden, true if visible

+    Main:       boolean; // false for songs, true for category buttons

+    OrderNum:   integer; // has a number of category for category buttons and songs

+    OrderTyp:   integer; // type of sorting for this button (0=name)

+    CatNumber:  integer; // Count of Songs in Category for Cats and Number of Song in Category for Songs

+  end;

+

+  TSongs = class

+  private

+    BrowsePos: Cardinal; //Actual Pos in Song Array

+  public

+    Song:       array of TSong; // array of songs

+    Selected:   integer; // selected song index

+    procedure LoadSongList; // load all songs

+    procedure BrowseDir(Dir: string); // should return number of songs in the future

+    procedure Sort(Order: integer);

+    function FindSongFile(Dir, Mask: string): string;

+  end;

+

+  TCatSongs = class

+    Song:       array of TSong; // array of categories with songs

+    Selected:   integer; // selected song index

+    Order:      integer; // order type (0=title)

+    CatNumShow: integer; // Category Number being seen

+    CatCount:   integer; //Number of Categorys

+

+    procedure Refresh; // refreshes arrays by recreating them from Songs array

+//    procedure Sort(Order: integer);

+    procedure ShowCategory(Index: integer); // expands all songs in category

+    procedure HideCategory(Index: integer); // hides all songs in category

+    procedure ClickCategoryButton(Index: integer); // uses ShowCategory and HideCategory when needed

+    procedure ShowCategoryList; //Hides all Songs And Show the List of all Categorys

+    function FindNextVisible(SearchFrom:integer): integer; //Find Next visible Song

+    function VisibleSongs: integer; // returns number of visible songs (for tabs)

+    function VisibleIndex(Index: integer): integer; // returns visible song index (skips invisible)

+

+    function SetFilter(FilterStr: String; const fType: Byte): Cardinal;

+  end;

+

+var

+  Songs:      TSongs; // all songs

+  CatSongs:   TCatSongs; // categorized songs

+  AktSong:    TSong; // one song *unknown use)

+

+implementation

+

+uses StrUtils,

+     UFiles,

+     UMain,

+     UIni;

+

+

+procedure TSongs.LoadSongList;

+begin

+  Log.LogStatus('Initializing', 'LoadSongList');

+

+  // clear

+  Setlength(Song, 50);

+

+  BrowsePos := 0;

+  // browse directories

+  BrowseDir(SongPath);

+

+  //Set Correct SongArray Length

+  SetLength(Song, BrowsePos);

+//  if Ini.Debug = 1 then BrowseDir('D:\Extract\Songs\');

+end;

+

+procedure TSongs.BrowseDir(Dir: string);

+var

+  SR:     TSearchRec;   // for parsing Songs Directory

+  SLen:   integer;

+begin

+  if FindFirst(Dir + '*', faDirectory, SR) = 0 then begin

+    repeat

+      if (SR.Name <> '.') and (SR.Name <> '..') then

+        BrowseDir(Dir + Sr.Name + PathDelim);

+    until FindNext(SR) <> 0;

+  end; // if

+  FindClose(SR);

+

+//  Log.LogStatus('Parsing directory: ' + Dir + SR.Name, 'LoadSongList');

+

+ if FindFirst(Dir + '*.txt', 0, SR) = 0 then

+ begin

+    repeat

+      //New Mod for better Memory Management

+

+//          Log.LogStatus('Parsing file:      ' + Dir + SR.Name, 'LoadSongList');

+

+

+      SLen := BrowsePos;

+      {//Old

+      SLen := Length(Song);

+      SetLength(Song, SLen + 1);//}

+

+      Song[SLen].Path     := Dir;

+      Song[SLen].Folder   := Copy(Dir, Length(SongPath)+1, 10000);

+      Song[SLen].Folder   := Copy(Song[SLen].Folder, 1, Pos( PathDelim , Song[SLen].Folder)-1);

+      Song[SLen].FileName := SR.Name;

+

+      if (AnalyseFile(Song[SLen]) = false) then Dec(BrowsePos)

+      else begin

+        // scanning complete, file is good

+        // if there is no cover then try to find it

+        if Song[SLen].Cover = '' then Song[SLen].Cover := FindSongFile(Dir, '*[CO].jpg');

+//        if Song[SLen].Background = '' then begin

+//          Song[SLen].Background := FindSongFile(Dir, '*[BG].jpg');

+//        end; // no needed here}

+

+        // fix by adding path. no, don't fix it.

+//        if Song[SLen].Cover <> '' then

+//          Song[SLen].Cover := Song[SLen].Path + Song[SLen].Cover;

+      end;

+

+      //Change Length Only every 50 Entrys

+      Inc(BrowsePos);

+      

+      if (BrowsePos mod 50 = 0) AND (BrowsePos <> 0) then

+      begin

+          SetLength(Song, Length(Song) + 50);

+      end;

+

+    until FindNext(SR) <> 0;

+    end; // if FindFirst

+  FindClose(SR);

+end;

+

+procedure TSongs.Sort(Order: integer);

+var

+  S:    integer;

+  S2:   integer;

+  TempSong:   TSong;

+begin

+  case Order of

+    sEdition: // by edition

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Edition, Song[S-1].Edition) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+      end;

+    sGenre: // by genre

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Genre, Song[S-1].Genre) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+      end;

+    sTitle: // by title

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+

+      end;

+    sArtist: // by artist

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+      end;

+    sFolder: // by folder

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Folder, Song[S-1].Folder) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+      end;

+    sTitle2: // by title2

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+

+      end;

+    sArtist2: // by artist2

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin

+              // zamiana miejscami

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+      end;

+    sLanguage: // by Language

+      begin

+        for S2 := 0 to Length(Song)-1 do

+          for S := 1 to Length(Song)-1 do

+            if CompareText(Song[S].Language, Song[S-1].Language) < 0 then begin

+              TempSong := Song[S-1];

+              Song[S-1] := Song[S];

+              Song[S] := TempSong;

+            end;

+      end;

+

+  end; // case

+end;

+

+function TSongs.FindSongFile(Dir, Mask: string): string;

+var

+  SR:     TSearchRec;   // for parsing song directory

+begin

+  Result := '';

+  if FindFirst(Dir + Mask, faDirectory, SR) = 0 then begin

+    Result := SR.Name;

+  end; // if

+  FindClose(SR);

+end;

+

+procedure TCatSongs.Refresh;

+var

+  S:        integer; // temporary song index

+  CatLen:   integer; // length of CatSongs.Song

+  Letter:   char; // current letter for sorting using letter

+  SS:       string; // current edition for sorting using edition, genre etc.

+  Order:    integer; // number used for ordernum

+  Letter2:  char; //

+  CatNumber:integer; // Number of Song in Category

+begin

+  CatNumShow := -1;

+//  Songs.Sort(0); // by title

+

+case Ini.Sorting of

+    sEdition: begin

+          Songs.Sort(sArtist);

+          Songs.Sort(sEdition);

+        end;

+    sGenre: begin

+          Songs.Sort(sArtist);

+          Songs.Sort(sGenre);

+        end;

+    sLanguage: begin

+          Songs.Sort(sArtist);

+          Songs.Sort(sLanguage);

+        end;

+    sFolder:  begin

+          Songs.Sort(sArtist);

+          Songs.Sort(sFolder);

+        end;

+    sTitle:  Songs.Sort(sTitle);

+    sArtist:  Songs.Sort(sArtist);

+    sTitle2:  Songs.Sort(sTitle2); // by title2

+    sArtist2:  Songs.Sort(sArtist2); // by artist2

+

+  end; // case

+

+

+  Letter := ' ';

+  SS := '';

+  Order := 0;

+  CatNumber := 0;

+

+  //Songs leeren

+  SetLength (Song, 0);

+

+  for S := Low(Songs.Song) to High(Songs.Song) do begin

+    if (Ini.Tabs = 1) then

+    if (Ini.Sorting = sEdition) and (CompareText(SS, Songs.Song[S].Edition) <> 0) then begin

+      // add Category Button

+      Inc(Order);

+      SS := Songs.Song[S].Edition;

+      CatLen := Length(CatSongs.Song);

+      SetLength(CatSongs.Song, CatLen+1);

+      CatSongs.Song[CatLen].Artist := '[' + SS + ']';

+      CatSongs.Song[CatLen].Main := true;

+      CatSongs.Song[CatLen].OrderTyp := 0;

+      CatSongs.Song[CatLen].OrderNum := Order;

+

+

+

+      // 0.4.3

+      // if SS = 'Singstar' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

+      // if SS = 'Singstar Part 2' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

+      // if SS = 'Singstar German' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

+      // if SS = 'Singstar Spanish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

+      // if SS = 'Singstar Italian' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

+      // if SS = 'Singstar French' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

+      // if SS = 'Singstar Party' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Party.jpg';

+      // if SS = 'Singstar Popworld' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Popworld.jpg';

+      // if SS = 'Singstar 80s' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';

+      // if SS = 'Singstar 80s Polish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';

+      // if SS = 'Singstar Rocks' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Rocks.jpg';

+      // if SS = 'Singstar Anthems' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Anthems.jpg';

+

+      {// cover-patch

+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';//}

+

+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

+

+      //CatNumber Patch

+      if (SS <> '') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+      CatSongs.Song[CatLen].Visible := true;

+    end

+

+    else if (Ini.Sorting = sGenre) and (CompareText(SS, Songs.Song[S].Genre) <> 0) then begin

+      // add Genre Button

+      Inc(Order);

+      SS := Songs.Song[S].Genre;

+      CatLen := Length(CatSongs.Song);

+      SetLength(CatSongs.Song, CatLen+1);

+      CatSongs.Song[CatLen].Artist := SS;

+      CatSongs.Song[CatLen].Main := true;

+      CatSongs.Song[CatLen].OrderTyp := 0;

+      CatSongs.Song[CatLen].OrderNum := Order;

+

+      {// cover-patch

+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

+

+      //CatNumber Patch

+      if (SS <> '') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+      CatSongs.Song[CatLen].Visible := true;

+    end

+

+    else if (Ini.Sorting = sLanguage) and (CompareText(SS, Songs.Song[S].Language) <> 0) then begin

+      // add Language Button

+      Inc(Order);

+      SS := Songs.Song[S].Language;

+      CatLen := Length(CatSongs.Song);

+      SetLength(CatSongs.Song, CatLen+1);

+      CatSongs.Song[CatLen].Artist := SS;

+      CatSongs.Song[CatLen].Main := true;

+      CatSongs.Song[CatLen].OrderTyp := 0;

+      CatSongs.Song[CatLen].OrderNum := Order;

+

+      {// cover-patch

+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

+

+      //CatNumber Patch

+      if (SS <> '') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+      CatSongs.Song[CatLen].Visible := true;

+    end

+

+    else if (Ini.Sorting = sTitle) and (Length(Songs.Song[S].Title)>=1) and (Letter <> UpCase(Songs.Song[S].Title[1])) then begin

+      // add a letter Category Button

+      Inc(Order);

+      Letter := UpCase(Songs.Song[S].Title[1]);

+      CatLen := Length(CatSongs.Song);

+      SetLength(CatSongs.Song, CatLen+1);

+      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

+      CatSongs.Song[CatLen].Main := true;

+      CatSongs.Song[CatLen].OrderTyp := 0;

+//      Order := ord(Letter);

+      CatSongs.Song[CatLen].OrderNum := Order;

+

+

+      {// cover-patch

+      if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'

+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

+

+      //CatNumber Patch

+      if (Letter <> ' ') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+      CatSongs.Song[CatLen].Visible := true;

+    end

+

+    else if (Ini.Sorting = sArtist) and (Length(Songs.Song[S].Artist)>=1) and (Letter <> UpCase(Songs.Song[S].Artist[1])) then begin

+      // add a letter Category Button

+      Inc(Order);

+      Letter := UpCase(Songs.Song[S].Artist[1]);

+      CatLen := Length(CatSongs.Song);

+      SetLength(CatSongs.Song, CatLen+1);

+      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

+      CatSongs.Song[CatLen].Main := true;

+      CatSongs.Song[CatLen].OrderTyp := 0;

+//      Order := ord(Letter);

+      CatSongs.Song[CatLen].OrderNum := Order;

+

+      {// cover-patch

+      if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'

+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

+

+      //CatNumber Patch

+      if (Letter <> ' ') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+      CatSongs.Song[CatLen].Visible := true;

+    end

+

+    else if (Ini.Sorting = sFolder) and (CompareText(SS, Songs.Song[S].Folder) <> 0) then begin

+      // 0.5.0: add folder tab

+      Inc(Order);

+      SS := Songs.Song[S].Folder;

+      CatLen := Length(CatSongs.Song);

+      SetLength(CatSongs.Song, CatLen+1);

+      CatSongs.Song[CatLen].Artist := SS;

+      CatSongs.Song[CatLen].Main := true;

+      CatSongs.Song[CatLen].OrderTyp := 0;

+      CatSongs.Song[CatLen].OrderNum := Order;

+

+      {// cover-patch

+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

+

+      //CatNumber Patch

+      if (SS <> '') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+      CatSongs.Song[CatLen].Visible := true;

+    end

+

+    else if (Ini.Sorting = sTitle2) AND (Length(Songs.Song[S].Title)>=1) then begin

+      if (ord(Songs.Song[S].Title[1]) > 47) and (ord(Songs.Song[S].Title[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Title[1]);

+      if (Letter <> Letter2) then begin

+        // add a letter Category Button

+        Inc(Order);

+        Letter := Letter2;

+        CatLen := Length(CatSongs.Song);

+        SetLength(CatSongs.Song, CatLen+1);

+        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

+        CatSongs.Song[CatLen].Main := true;

+        CatSongs.Song[CatLen].OrderTyp := 0;

+//      Order := ord(Letter);

+        CatSongs.Song[CatLen].OrderNum := Order;

+

+        {// cover-patch

+        if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'

+        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

+

+        //CatNumber Patch

+      if (Letter <> ' ') then

+      begin

+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+        CatNumber := 0;

+      end;

+

+        CatSongs.Song[CatLen].Visible := true;

+      end;

+    end

+

+    else if (Ini.Sorting = sArtist2) AND (Length(Songs.Song[S].Artist)>=1) then begin

+     if (ord(Songs.Song[S].Artist[1]) > 47) and (ord(Songs.Song[S].Artist[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Artist[1]);

+       if (Letter <> Letter2) then begin

+        // add a letter Category Button

+        Inc(Order);

+        Letter := Letter2;

+        CatLen := Length(CatSongs.Song);

+        SetLength(CatSongs.Song, CatLen+1);

+        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

+        CatSongs.Song[CatLen].Main := true;

+        CatSongs.Song[CatLen].OrderTyp := 0;

+//      Order := ord(Letter);

+        CatSongs.Song[CatLen].OrderNum := Order;

+

+        {// cover-patch

+        if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'

+        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

+        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

+

+        //CatNumber Patch

+        if (Letter <> ' ') then

+        begin

+          Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

+          CatNumber := 0;

+        end;

+        

+        CatSongs.Song[CatLen].Visible := true;

+      end;

+    end;

+

+

+    CatLen := Length(CatSongs.Song);

+    SetLength(CatSongs.Song, CatLen+1);

+

+    Inc (CatNumber); //Increase Number in Cat

+

+    CatSongs.Song[CatLen] := Songs.Song[S];

+    CatSongs.Song[CatLen].OrderNum := Order; // assigns category

+    CatSongs.Song[CatLen].CatNumber := CatNumber;

+

+    if (Ini.Tabs = 0) then CatSongs.Song[CatLen].Visible := true

+    else if (Ini.Tabs = 1) then CatSongs.Song[CatLen].Visible := false;

+//    if (Ini.Tabs = 1) and (Order = 1) then CatSongs.Song[CatLen].Visible := true; // open first tab

+//CatSongs.Song[CatLen].Visible := true;

+

+  end;

+//CatNumber Patch - Set CatNumber of Last Category

+if (ini.Tabs_at_startup = 1) And (high(Song) >=1) then

+  Song[CatLen - CatNumber].CatNumber := CatNumber;//Set CatNumber of Categroy

+//CatCount Patch

+CatCount := Order;

+end;

+

+procedure TCatSongs.ShowCategory(Index: integer);

+var

+  S:    integer; // song

+begin

+  CatNumShow := Index;

+  for S := 0 to high(CatSongs.Song) do

+  begin

+    if (CatSongs.Song[S].OrderNum = Index) AND (Not CatSongs.Song[S].Main) then

+      CatSongs.Song[S].Visible := true

+    else

+      CatSongs.Song[S].Visible := false;

+  end;

+end;

+

+procedure TCatSongs.HideCategory(Index: integer); // hides all songs in category

+var

+  S:    integer; // song

+begin

+  for S := 0 to high(CatSongs.Song) do begin

+    if not CatSongs.Song[S].Main then

+      CatSongs.Song[S].Visible := false // hides all at now

+  end;

+end;

+

+procedure TCatSongs.ClickCategoryButton(Index: integer);

+var

+  Num, S:    integer;

+begin

+  Num := CatSongs.Song[Index].OrderNum;

+  if Num <> CatNumShow then

+    begin

+    ShowCategory(Num);

+    end

+  else begin

+    ShowCategoryList;

+  end;

+end;

+

+//Hide Categorys when in Category Hack

+procedure TCatSongs.ShowCategoryList;

+var

+  Num, S:    integer;

+begin

+  //Hide All Songs Show All Cats

+  for S := 0 to high(CatSongs.Song) do begin

+    if CatSongs.Song[S].Main then

+      CatSongs.Song[S].Visible := true

+    else

+      CatSongs.Song[S].Visible := false

+  end;

+  CatSongs.Selected := CatNumShow; //Show last shown Category

+  CatNumShow := -1;

+end;

+//Hide Categorys when in Category Hack End

+

+//Wrong song selected when tabs on bug

+function TCatSongs.FindNextVisible(SearchFrom:integer): integer;//Find next Visible Song

+var

+  I: Integer;

+  begin

+  Result := -1;

+  I := SearchFrom + 1;

+  while not CatSongs.Song[I].Visible do

+    begin

+    Inc (I);

+    if (I>high(CatSongs.Song)) then

+      I := low(CatSongs.Song);

+    if (I = SearchFrom) then //Make One Round and no song found->quit

+      break;

+    end;

+  end;

+//Wrong song selected when tabs on bug End

+

+function TCatSongs.VisibleSongs: integer;

+var

+  S:    integer; // song

+begin

+  Result := 0;

+  for S := 0 to high(CatSongs.Song) do

+    if CatSongs.Song[S].Visible = true then Inc(Result);

+end;

+

+function TCatSongs.VisibleIndex(Index: integer): integer;

+var

+  S:    integer; // song

+begin

+  Result := 0;

+  for S := 0 to Index-1 do

+    if CatSongs.Song[S].Visible = true then Inc(Result);

+end;

+

+function TCatSongs.SetFilter(FilterStr: String; const fType: Byte): Cardinal;

+var

+  I, J: Integer;

+  cString: String;

+  SearchStr: Array of String;

+begin

+  {fType: 0: All

+          1: Title

+          2: Artist}

+  FilterStr := Trim(FilterStr);

+  if FilterStr<>'' then begin

+    Result := 0;

+    //Create Search Array

+    SetLength(SearchStr, 1);

+    I := Pos (' ', FilterStr);

+    While (I <> 0) do

+    begin

+      SetLength (SearchStr, Length(SearchStr) + 1);

+      cString := Copy(FilterStr, 1, I-1);

+      if (cString <> ' ') AND (cString <> '') then

+        SearchStr[High(SearchStr)-1] := cString;

+      Delete (FilterStr, 1, I);

+

+      I := Pos (' ', FilterStr);

+    end;

+    //Copy last Word

+    if (FilterStr <> ' ') AND (FilterStr <> '') then

+      SearchStr[High(SearchStr)] := FilterStr;

+

+    for I:=0 to High(Song) do begin

+      if not Song[i].Main then

+      begin

+        case fType of

+          0: cString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;

+          1: cString := Song[I].Title;

+          2: cString := Song[I].Artist;

+        end;

+        Song[i].Visible:=True;

+        //Look for every Searched Word

+        For J := 0 to High(SearchStr) do

+        begin

+          Song[i].Visible := Song[i].Visible AND AnsiContainsText(cString, SearchStr[J])

+        end;

+        if Song[i].Visible then

+          Inc(Result);

+      end

+      else

+        Song[i].Visible:=False;

+    end;

+    CatNumShow := -2;

+  end

+  else begin

+    for i:=0 to High(Song) do begin

+      Song[i].Visible:=(Ini.Tabs=1)=Song[i].Main;

+      CatNumShow := -1;

+    end;

+    Result := 0;

+  end;

+end;

+

+end.

diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas
index 3d746813..40a3a30b 100644
--- a/Game/Code/Classes/UTexture.pas
+++ b/Game/Code/Classes/UTexture.pas
@@ -262,7 +262,7 @@ begin
   if ( FileExists(Identifier) ) then

   begin

     // load from file

-//    Log.LogStatus( 'Is File', '  LoadImage' );

+    Log.LogStatus( 'Is File', '  LoadImage' );

     try

       Result:=IMG_Load(Identifier);

     except

@@ -273,7 +273,7 @@ begin
   end

   else

   begin

-//    Log.LogStatus( 'NOT File', '  LoadImage' );

+    Log.LogStatus( 'IS Resource', '  LoadImage' );

   

     // load from resource stream

     {$IFNDEF FPC}

@@ -296,6 +296,7 @@ begin
       end;

 

       try

+        TexStream.position := 0;

         try

           TexRWops         := SDL_AllocRW;

           TexRWops.unknown := TUnknown(TexStream);

@@ -309,7 +310,8 @@ begin
           beep;

           Exit;

         end;

-        

+

+        Log.LogStatus( 'resource Assigned....' , Identifier);        

         Result:=IMG_Load_RW(TexRWops,0);

         SDL_FreeRW(TexRWops);

         

@@ -340,9 +342,8 @@ begin
             Exit;

           end;

         

-          Result:=IMG_Load_RW(TexRWops,0);

+          Result := IMG_Load_RW(TexRWops,0);

           SDL_FreeRW(TexRWops);

-        

         finally

           freeandnil( lResData );

         end;

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 1e102987..9da176df 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -7,6 +7,7 @@ interface
 {$ENDIF}

 

 uses

+    ULog,

     IniFiles,

     SysUtils,

     Classes;

@@ -1426,24 +1427,20 @@ var
   C:    integer;

 begin

   DecimalSeparator := '.';

-  ThemeText.X := ThemeIni.ReadInteger(Name, 'X', 0);

-  ThemeText.Y := ThemeIni.ReadInteger(Name, 'Y', 0);

-  ThemeText.W := ThemeIni.ReadInteger(Name, 'W', 0);

+  

+  ThemeText.X     := ThemeIni.ReadInteger(Name, 'X', 0);

+  ThemeText.Y     := ThemeIni.ReadInteger(Name, 'Y', 0);

+  ThemeText.W     := ThemeIni.ReadInteger(Name, 'W', 0);

 

-  ThemeText.ColR := ThemeIni.ReadFloat(Name, 'ColR', 0);

-  ThemeText.ColG := ThemeIni.ReadFloat(Name, 'ColG', 0);

-  ThemeText.ColB := ThemeIni.ReadFloat(Name, 'ColB', 0);

+  ThemeText.ColR  := ThemeIni.ReadFloat(Name, 'ColR', 0);

+  ThemeText.ColG  := ThemeIni.ReadFloat(Name, 'ColG', 0);

+  ThemeText.ColB  := ThemeIni.ReadFloat(Name, 'ColB', 0);

 

-  ThemeText.Font := ThemeIni.ReadInteger(Name, 'Font', 0);

-  ThemeText.Size := ThemeIni.ReadInteger(Name, 'Size', 0);

+  ThemeText.Font  := ThemeIni.ReadInteger(Name, 'Font', 0);

+  ThemeText.Size  := ThemeIni.ReadInteger(Name, 'Size', 0);

   ThemeText.Align := ThemeIni.ReadInteger(Name, 'Align', 0);

 

-  {{$IFDEF TRANSLATE}

-  ThemeText.Text := Language.Translate(ThemeIni.ReadString(Name, 'Text', ''));

-  {{$ELSE}{

-  ThemeText.Text := ThemeIni.ReadString(Name, 'Text', '');

-  {$ENDIF}

-

+  ThemeText.Text  := Language.Translate(ThemeIni.ReadString(Name, 'Text', ''));

   ThemeText.Color := ThemeIni.ReadString(Name, 'Color', '');

 

   C := ColorExists(ThemeText.Color);

diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas
index 16bc4ab2..291dc201 100644
--- a/Game/Code/Menu/UMenu.pas
+++ b/Game/Code/Menu/UMenu.pas
@@ -764,6 +764,7 @@ begin
   for J := 0 to Length(Text) - 1 do

     Text[J].Draw;

 

+

   //  Draw all ButtonCollections

   For J := 0 to High(ButtonCollection) do

     ButtonCollection[J].Draw;

diff --git a/Game/Code/Menu/UMenuText.pas b/Game/Code/Menu/UMenuText.pas
index d1c8b7b1..19adef03 100644
--- a/Game/Code/Menu/UMenuText.pas
+++ b/Game/Code/Menu/UMenuText.pas
@@ -237,10 +237,12 @@ var
   Text2:  string;
   I:      Integer;
 begin
-  if Visible then begin
+  if Visible then
+  begin
     SetFontStyle(Style);
     SetFontSize(Size);
     SetFontItalic(False);
+
     glColor4f(ColR*Int, ColG*Int, ColB*Int, Alpha);
 
     //If Selected Set Blink...