Mac OS X version compiles and links. I hope I didn't break too many files on windows/linux.

Added switches.inc to all files.
Changed many IFDEFs.
For Windows-only code please use MSWINDOWS instead of WIN32 now. WIN32 is also used by the Mac port.

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

34 files changed, 503 insertions, 507 deletions

diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas
index a24997d4..e60b9fb9 100644
--- a/Game/Code/Screens/UScreenCredits.pas
+++ b/Game/Code/Screens/UScreenCredits.pas
@@ -2,10 +2,6 @@ unit UScreenCredits;
 
 interface
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
-
 {$I switches.inc}
 
 
diff --git a/Game/Code/Screens/UScreenEdit.pas b/Game/Code/Screens/UScreenEdit.pas
index a58756e6..49adb994 100644
--- a/Game/Code/Screens/UScreenEdit.pas
+++ b/Game/Code/Screens/UScreenEdit.pas
@@ -2,6 +2,8 @@ unit UScreenEdit;
 

 interface

 

+{$I switches.inc}

+

 uses UMenu, SDL, UThemes;

 

 type

diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index 1878337b..0c8244ab 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -2,10 +2,6 @@ unit UScreenEditConvert;
 

 interface

 

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-

 {$I switches.inc}

 

 uses UMenu,

diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas
index a7105b0e..7c8b2d56 100644
--- a/Game/Code/Screens/UScreenEditHeader.pas
+++ b/Game/Code/Screens/UScreenEditHeader.pas
@@ -2,6 +2,8 @@ unit UScreenEditHeader;
 

 interface

 

+{$I switches.inc}

+

 uses UMenu, SDL, USongs, UThemes;

 

 type

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 1dd3fb24..d24fdede 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -2,10 +2,6 @@ unit UScreenEditSub;
 

 interface

 

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-

 {$I switches.inc}

 

 uses

diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas
index df23d340..d4b528b5 100644
--- a/Game/Code/Screens/UScreenLevel.pas
+++ b/Game/Code/Screens/UScreenLevel.pas
@@ -2,6 +2,8 @@ unit UScreenLevel;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenLoading.pas b/Game/Code/Screens/UScreenLoading.pas
index 2ccc5c79..989461f2 100644
--- a/Game/Code/Screens/UScreenLoading.pas
+++ b/Game/Code/Screens/UScreenLoading.pas
@@ -4,10 +4,6 @@ interface
 

 {$I switches.inc}

 

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-

 uses

   UMenu,

   SDL,

diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index cb7390cc..38f58bf1 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -2,9 +2,7 @@ unit UScreenMain;
 

 interface

 

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

+{$I switches.inc}

 

 uses

   UMenu,

diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index 5363d2a2..76e79a3b 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -2,6 +2,8 @@ unit UScreenName;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas
index edf684db..30404d6e 100644
--- a/Game/Code/Screens/UScreenOpen.pas
+++ b/Game/Code/Screens/UScreenOpen.pas
@@ -2,6 +2,8 @@ unit UScreenOpen;
 

 interface

 

+{$I switches.inc}

+

 uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, UTexture, UMenuText,

   ULyrics, Math, OpenGL12, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas
index 1867d03b..bcd781cc 100644
--- a/Game/Code/Screens/UScreenOptions.pas
+++ b/Game/Code/Screens/UScreenOptions.pas
@@ -2,6 +2,8 @@ unit UScreenOptions;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, SysUtils, UDisplay, UMusic, UFiles, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index 271ff972..0d40b7ec 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsAdvanced;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas
index 1d94ffa6..6cd0a20c 100644
--- a/Game/Code/Screens/UScreenOptionsGame.pas
+++ b/Game/Code/Screens/UScreenOptionsGame.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsGame;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes, USongs;

 

diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index c0ea90ff..947d506b 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsGraphics;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index 7ef7c207..8d70eec9 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsLyrics;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index d497c637..4be16e70 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsRecord;
 
 interface
 
+{$I switches.inc}
+
 uses
   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;
 
diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas
index 1777228b..867a10b6 100644
--- a/Game/Code/Screens/UScreenOptionsSound.pas
+++ b/Game/Code/Screens/UScreenOptionsSound.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsSound;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index cf89ac3f..750e8859 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -2,6 +2,8 @@ unit UScreenOptionsThemes;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index ee534781..17f3b2b5 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -2,10 +2,7 @@ unit UScreenPartyNewRound;
 

 interface

 

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-

+{$I switches.inc}

 

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;

diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 714e0d99..7be4d1c0 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -2,9 +2,7 @@ unit UScreenPartyOptions;
 

 interface

 

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

+{$I switches.inc}

 

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;

diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas
index 24534599..4aaa5a3e 100644
--- a/Game/Code/Screens/UScreenPartyPlayer.pas
+++ b/Game/Code/Screens/UScreenPartyPlayer.pas
@@ -2,6 +2,8 @@ unit UScreenPartyPlayer;
 

 Interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 6af835f2..ea9b944b 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -2,6 +2,8 @@ unit UScreenPartyScore;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index 3c7ad921..9806159a 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -2,6 +2,8 @@ unit UScreenPartyWin;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index cc1b4492..402857a9 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -2,6 +2,8 @@ unit UScreenPopup;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UMusic, UFiles, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index 97d31541..36e3b43b 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -2,9 +2,7 @@ unit UScreenScore;
 
 interface
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
+{$I switches.inc}
 
 uses
   UMenu,
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 8cba8f36..60cab0a4 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -4,10 +4,6 @@ interface
 
 {$I switches.inc}
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
-
 
 uses UMenu,
      UMusic,
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index e2d53f0a..7f692af5 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -1,12 +1,9 @@
-unit UScreenSingModi;

+unit UScreenSingModi;
 
 interface
 
 {$I switches.inc}
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
 
 uses UMenu,
      UMusic,
@@ -156,456 +153,456 @@ begin
 end;
 
 procedure TScreenSingModi.onShow;
-var

-  I: Integer;

-begin

-

-  PlayersPlay := TeamInfo.NumTeams;

-

-  if DLLMan.Selected.LoadSong then //Start with Song

-  begin

-    inherited;

-  end

-  else //Start Without Song

-  begin

-    AudioInput.CaptureStart;

-  end;

-

-//Set Playerinfo

-  PlayerInfo.NumPlayers := PlayersPlay;

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    PlayerInfo.Playerinfo[I].Name    := PChar(Ini.Name[I]);

-    PlayerInfo.Playerinfo[I].Score   := 0;

-    PlayerInfo.Playerinfo[I].Bar     := 50;

-    PlayerInfo.Playerinfo[I].Enabled := True;

-  end;

-

-  for I := PlayerInfo.NumPlayers to high(PlayerInfo.Playerinfo) do

-  begin

-    PlayerInfo.Playerinfo[I].Score:=  0;

-    PlayerInfo.Playerinfo[I].Bar :=  0;

-    PlayerInfo.Playerinfo[I].Enabled := False;

-  end;

-

-  {Case PlayersPlay of

-    1: begin

-      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ScoreBG].Texture.Y + Static[StaticP1ScoreBG].Texture.H;

-    end;

-    2,4: begin

-      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1TwoPScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[2].PosX := Static[StaticP1TwoPScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[2].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[3].PosX := Static[StaticP2RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[3].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;

-    end;

-    3,6: begin

-      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ThreePScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[3].PosX := Static[StaticP1ThreePScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[3].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2MScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[4].PosX := Static[StaticP2MScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[4].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[2].PosX := Static[StaticP3RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[2].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[5].PosX := Static[StaticP3RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[5].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;

-    end;

-  end;       }

-

-  // play music (I)

-  //Music.CaptureStart;

-  //Music.MoveTo(AktSong.Start);

-

-  //Init Plugin

-  if not DLLMan.PluginInit(TeamInfo, PlayerInfo, ToSentences(Czesci[0]), LoadTex, Print, LoadSound, PlaySound) then

-  begin

-    //Fehler

-    Log.LogError('Could not Init Plugin');

-    Halt;

-  end;

-

-  // Set Background (Little Workaround, maybe change sometime)

-  if (DLLMan.Selected.LoadBack) AND (DLLMan.Selected.LoadSong) then

-    ScreenSing.Tex_Background := Tex_Background;

-

-  Winner := 0;

-

-  //Set Score Visibility

-  {if PlayersPlay = 1 then begin

-    Text[TextP1Score].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP1ScoreBG].Visible := DLLMan.Selected.ShowScore;

-  end;

-

-  if (PlayersPlay = 2) OR (PlayersPlay = 4) then begin

-    Text[TextP1TwoPScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP1TwoPScoreBG].Visible := DLLMan.Selected.ShowScore;

-

-    Text[TextP2RScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP2RScoreBG].Visible := DLLMan.Selected.ShowScore;

-  end;

-

-  if (PlayersPlay = 3) OR (PlayersPlay = 6) then begin

-    Text[TextP1ThreePScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP1ThreePScoreBG].Visible := DLLMan.Selected.ShowScore;

-

-    Text[TextP2MScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP2MScoreBG].Visible := DLLMan.Selected.ShowScore;

-

-    Text[TextP3RScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP3RScoreBG].Visible := DLLMan.Selected.ShowScore;

-  end; }

-end;

-

-function TScreenSingModi.Draw: boolean;

-var

-  Min:    integer;

-  Sec:    integer;

-  Tekst:  string;

-  S, I:      integer;

-  T:      integer;

-begin

-//Set Playerinfo

-  PlayerInfo.NumPlayers := PlayersPlay;

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    PlayerInfo.Playerinfo[I].Name := PChar(Player[I].Name);

-    if PlayerInfo.Playerinfo[I].Enabled then

-    begin

-      if (Player[I].ScoreTotalI<=10000) then

-        PlayerInfo.Playerinfo[I].Score:=  Player[I].ScoreTotalI;

-      PlayerInfo.Playerinfo[I].Bar :=  Round(Scores.Players[I].RBPos * 100);

-    end;

-  end;

-

-//Show Score

-if DLLMan.Selected.ShowScore then

-begin

-  {//ScoreBG Mod

-  // set player colors

-  if PlayersPlay = 4 then begin

-    if ScreenAct = 1 then begin

-      LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,

-      Static[StaticP1TwoP].Texture.ColB, 'P1Dark');

-      LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,

-      Static[StaticP2R].Texture.ColB, 'P2Dark');

-

-

-

-      LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,

-      Static[StaticP1TwoPScoreBG].Texture.ColB, 'P1Dark');

-      LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,

-      Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');

-

-

-

-    end;

-    if ScreenAct = 2 then begin

-      LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,

-        Static[StaticP1TwoP].Texture.ColB, 'P3Dark');

-      LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,

-        Static[StaticP2R].Texture.ColB, 'P4Dark');

-

-

-

-      LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,

-        Static[StaticP1TwoPScoreBG].Texture.ColB, 'P3Dark');

-      LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,

-        Static[StaticP2RScoreBG].Texture.ColB, 'P4Dark');

-

-

-

-     end;

-  end;

-

-  if PlayersPlay = 6 then begin

-    if ScreenAct = 1 then begin

-      LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,

-        Static[StaticP1ThreeP].Texture.ColB, 'P1Dark');

-      LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,

-        Static[StaticP2R].Texture.ColB, 'P2Dark');

-      LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,

-        Static[StaticP3R].Texture.ColB, 'P3Dark');

-

-

-

-      LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,

-        Static[StaticP1ThreePScoreBG].Texture.ColB, 'P1Dark');

-      LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,

-        Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');

-      LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,

-        Static[StaticP3RScoreBG].Texture.ColB, 'P3Dark');

-

-

-

-    end;

-    if ScreenAct = 2 then begin

-      LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,

-        Static[StaticP1ThreeP].Texture.ColB, 'P4Dark');

-      LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,

-        Static[StaticP2R].Texture.ColB, 'P5Dark');

-      LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,

-        Static[StaticP3R].Texture.ColB, 'P6Dark');

-

-

-

-

-      LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,

-        Static[StaticP1ThreePScoreBG].Texture.ColB, 'P4Dark');

-      LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,

-        Static[StaticP2RScoreBG].Texture.ColB, 'P5Dark');

-      LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,

-        Static[StaticP3RScoreBG].Texture.ColB, 'P6Dark');

-

-

-

-

-    end;

-  end;

-  //end ScoreBG Mod }

-

-// set player names (for 2 screens and only Singstar skin)

-  if ScreenAct = 1 then begin

-    Text[TextP1].Text       := 'P1';

-    Text[TextP1TwoP].Text   := 'P1'; // added for ps3 skin

-    Text[TextP1ThreeP].Text := 'P1'; // added for ps3 skin

-    Text[TextP2R].Text      := 'P2';

-    Text[TextP2M].Text      := 'P2';

-    Text[TextP3R].Text      := 'P3';

-  end;

-

-  if ScreenAct = 2 then begin

-    case PlayersPlay of

-      4:  begin

-            Text[TextP1TwoP].Text := 'P3';

-            Text[TextP2R].Text := 'P4';

-          end;

-      6:  begin

-            Text[TextP1ThreeP].Text := 'P4';

-            Text[TextP2M].Text := 'P5';

-            Text[TextP3R].Text := 'P6';

-          end;

-    end; // case

-  end; // if

-

-

-  // stereo   <- and where iss P2M? or P3?

-  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10*ScreenX;

-  Text[TextP1].X := Text[TextP1].X + 10*ScreenX;

-

-  {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X + 10*ScreenX;

-  Text[TextP1Score].X := Text[TextP1Score].X + 10*ScreenX;}

-

-  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10*ScreenX;

-  Text[TextP2R].X := Text[TextP2R].X + 10*ScreenX;

-

-  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X + 10*ScreenX;

-  Text[TextP2RScore].X := Text[TextP2RScore].X + 10*ScreenX;}

-

-  // .. and scores

-  {if PlayersPlay = 1 then begin

-    Tekst := IntToStr(Player[0].ScoreTotalI);

-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-    Text[TextP1Score].Text := Tekst;

-  end;

-

-  if PlayersPlay = 2 then begin

-    Tekst := IntToStr(Player[0].ScoreTotalI);

-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-    Text[TextP1TwoPScore].Text := Tekst;

-

-    Tekst := IntToStr(Player[1].ScoreTotalI);

-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-    Text[TextP2RScore].Text := Tekst;

-  end;

-

-  if PlayersPlay = 3 then begin

-    Tekst := IntToStr(Player[0].ScoreTotalI);

-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-    Text[TextP1ThreePScore].Text := Tekst;

-

-    Tekst := IntToStr(Player[1].ScoreTotalI);

-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-    Text[TextP2MScore].Text := Tekst;

-

-    Tekst := IntToStr(Player[2].ScoreTotalI);

-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-    Text[TextP3RScore].Text := Tekst;

-  end;

-

-  if PlayersPlay = 4 then begin

-    if ScreenAct = 1 then begin

-      Tekst := IntToStr(Player[0].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1TwoPScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[1].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP2RScore].Text := Tekst;

-    end;

-    if ScreenAct = 2 then begin

-      Tekst := IntToStr(Player[2].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1TwoPScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[3].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP2RScore].Text := Tekst;

-    end;

-  end;

-

-  if PlayersPlay = 6 then begin

-    if ScreenAct = 1 then begin

-      Tekst := IntToStr(Player[0].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1ThreePScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[1].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP2MScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[2].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP3RScore].Text := Tekst;

-    end;

-    if ScreenAct = 2 then begin

-      Tekst := IntToStr(Player[3].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1ThreePScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[4].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP2MScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[5].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP3RScore].Text := Tekst;

-    end;

-  end;   }

-

-end; //ShowScore

-

-  for S := 1 to 1 do

-    Static[S].Texture.X := Static[S].Texture.X + 10*ScreenX;

-

-  for T := 0 to 1 do

-    Text[T].X := Text[T].X + 10*ScreenX;

-

-if DLLMan.Selected.LoadSong then

-begin

-  // update static menu with time ...

-  Min := Round(Czas.Teraz) div 60;

-  Sec := Round(Czas.Teraz) mod 60;

-  Text[TextTimeText].Text := '';

-  if Min < 10 then Text[TextTimeText].Text := '0';

-  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Min) + ':';

-  if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';

-  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);

-end;

-

-  // draw static menu (BG)

-  DrawBG;

-

-  //Draw Background

-  if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then

-    SingDrawBackground;

-

-  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?

-  // update and draw movie

-  // <mog> wie wo wadd? also in der selben funktion in der uscreensing kommt des video in der zeile 995, oder was wollteste wissen? :X

-{  if ShowFinish and AktSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin

-    UpdateSmpeg; // this only draws

-  end;}

-

-  // draw static menu (FG)

-  DrawFG;

-

-  if ShowFinish then begin

-    if DllMan.Selected.LoadSong then

-    begin

-      if (not AudioPlayback.Finished) and ((AktSong.Finish = 0) or (Czas.Teraz*1000 <= AktSong.Finish)) then begin

-        //Pause Mod:

-        if not Paused then

-          Sing(Self);       // analyze song

-      end else begin

-        if not FadeOut then begin

-          Finish;

-          FadeOut := true;

-          FadeTo(@ScreenPartyScore);

-        end;

-      end;

-    end;

-  end;

-

-  // draw custom items

-  SingModiDraw(PlayerInfo);  // always draw

-

-  //GoldenNoteStarsTwinkle Mod

-    GoldenRec.SpawnRec;

-  //GoldenNoteStarsTwinkle Mod

-

-  //Update PlayerInfo

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    if PlayerInfo.Playerinfo[I].Enabled then

-    begin

-      //PlayerInfo.Playerinfo[I].Bar :=  Player[I].ScorePercent;

-      PlayerInfo.Playerinfo[I].Score := Player[I].ScoreTotalI;

-    end;

-  end;

-

-  if ((ShowFinish) AND (NOT Paused)) then

-  begin

-    if not DLLMan.PluginDraw(Playerinfo, Czesci[0].Akt) then

-    begin

-      if not FadeOut then begin

-          Finish;

-          FadeOut := true;

-          FadeTo(@ScreenPartyScore);

-      end;

-    end;   

-  end;

-

-  //Change PlayerInfo/Changeables

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    if (Player[I].ScoreTotalI <> PlayerInfo.Playerinfo[I].Score) then

-    begin

-      //Player[I].ScoreTotal   := Player[I].ScoreTotal + (PlayerInfo.Playerinfo[I].Score - Player[I].ScoreTotalI);

-      Player[I].ScoreTotalI := PlayerInfo.Playerinfo[I].Score;

-    end;

-    {if (PlayerInfo.Playerinfo[I].Bar <> Player[I].ScorePercent) then

-      Player[I].ScorePercentTarget := PlayerInfo.Playerinfo[I].Bar; }

-  end;

-

-  // back stereo

-  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10*ScreenX;

-  Text[TextP1].X := Text[TextP1].X - 10*ScreenX;

-

-  {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X - 10*ScreenX;

-  Text[TextP1Score].X := Text[TextP1Score].X - 10*ScreenX;}

-

-

-  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X - 10*ScreenX;

-  Text[TextP2R].X := Text[TextP2R].X - 10*ScreenX;

-

-  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X - 10*ScreenX;

-  Text[TextP2RScore].X := Text[TextP2RScore].X - 10*ScreenX;}

-

-

-  for S := 1 to 1 do

-    Static[S].Texture.X := Static[S].Texture.X - 10*ScreenX;

-

-  for T := 0 to 1 do

-    Text[T].X := Text[T].X - 10*ScreenX;

-

-

+var
+  I: Integer;
+begin
+
+  PlayersPlay := TeamInfo.NumTeams;
+
+  if DLLMan.Selected.LoadSong then //Start with Song
+  begin
+    inherited;
+  end
+  else //Start Without Song
+  begin
+    AudioInput.CaptureStart;
+  end;
+
+//Set Playerinfo
+  PlayerInfo.NumPlayers := PlayersPlay;
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    PlayerInfo.Playerinfo[I].Name    := PChar(Ini.Name[I]);
+    PlayerInfo.Playerinfo[I].Score   := 0;
+    PlayerInfo.Playerinfo[I].Bar     := 50;
+    PlayerInfo.Playerinfo[I].Enabled := True;
+  end;
+
+  for I := PlayerInfo.NumPlayers to high(PlayerInfo.Playerinfo) do
+  begin
+    PlayerInfo.Playerinfo[I].Score:=  0;
+    PlayerInfo.Playerinfo[I].Bar :=  0;
+    PlayerInfo.Playerinfo[I].Enabled := False;
+  end;
+
+  {Case PlayersPlay of
+    1: begin
+      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ScoreBG].Texture.Y + Static[StaticP1ScoreBG].Texture.H;
+    end;
+    2,4: begin
+      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1TwoPScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[2].PosX := Static[StaticP1TwoPScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[2].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[3].PosX := Static[StaticP2RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[3].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;
+    end;
+    3,6: begin
+      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ThreePScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[3].PosX := Static[StaticP1ThreePScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[3].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2MScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[4].PosX := Static[StaticP2MScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[4].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[2].PosX := Static[StaticP3RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[2].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[5].PosX := Static[StaticP3RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[5].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;
+    end;
+  end;       }
+
+  // play music (I)
+  //Music.CaptureStart;
+  //Music.MoveTo(AktSong.Start);
+
+  //Init Plugin
+  if not DLLMan.PluginInit(TeamInfo, PlayerInfo, ToSentences(Czesci[0]), LoadTex, Print, LoadSound, PlaySound) then
+  begin
+    //Fehler
+    Log.LogError('Could not Init Plugin');
+    Halt;
+  end;
+
+  // Set Background (Little Workaround, maybe change sometime)
+  if (DLLMan.Selected.LoadBack) AND (DLLMan.Selected.LoadSong) then
+    ScreenSing.Tex_Background := Tex_Background;
+
+  Winner := 0;
+
+  //Set Score Visibility
+  {if PlayersPlay = 1 then begin
+    Text[TextP1Score].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP1ScoreBG].Visible := DLLMan.Selected.ShowScore;
+  end;
+
+  if (PlayersPlay = 2) OR (PlayersPlay = 4) then begin
+    Text[TextP1TwoPScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP1TwoPScoreBG].Visible := DLLMan.Selected.ShowScore;
+
+    Text[TextP2RScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP2RScoreBG].Visible := DLLMan.Selected.ShowScore;
+  end;
+
+  if (PlayersPlay = 3) OR (PlayersPlay = 6) then begin
+    Text[TextP1ThreePScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP1ThreePScoreBG].Visible := DLLMan.Selected.ShowScore;
+
+    Text[TextP2MScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP2MScoreBG].Visible := DLLMan.Selected.ShowScore;
+
+    Text[TextP3RScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP3RScoreBG].Visible := DLLMan.Selected.ShowScore;
+  end; }
+end;
+
+function TScreenSingModi.Draw: boolean;
+var
+  Min:    integer;
+  Sec:    integer;
+  Tekst:  string;
+  S, I:      integer;
+  T:      integer;
+begin
+//Set Playerinfo
+  PlayerInfo.NumPlayers := PlayersPlay;
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    PlayerInfo.Playerinfo[I].Name := PChar(Player[I].Name);
+    if PlayerInfo.Playerinfo[I].Enabled then
+    begin
+      if (Player[I].ScoreTotalI<=10000) then
+        PlayerInfo.Playerinfo[I].Score:=  Player[I].ScoreTotalI;
+      PlayerInfo.Playerinfo[I].Bar :=  Round(Scores.Players[I].RBPos * 100);
+    end;
+  end;
+
+//Show Score
+if DLLMan.Selected.ShowScore then
+begin
+  {//ScoreBG Mod
+  // set player colors
+  if PlayersPlay = 4 then begin
+    if ScreenAct = 1 then begin
+      LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,
+      Static[StaticP1TwoP].Texture.ColB, 'P1Dark');
+      LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,
+      Static[StaticP2R].Texture.ColB, 'P2Dark');
+
+
+
+      LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,
+      Static[StaticP1TwoPScoreBG].Texture.ColB, 'P1Dark');
+      LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,
+      Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');
+
+
+
+    end;
+    if ScreenAct = 2 then begin
+      LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,
+        Static[StaticP1TwoP].Texture.ColB, 'P3Dark');
+      LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,
+        Static[StaticP2R].Texture.ColB, 'P4Dark');
+
+
+
+      LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,
+        Static[StaticP1TwoPScoreBG].Texture.ColB, 'P3Dark');
+      LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,
+        Static[StaticP2RScoreBG].Texture.ColB, 'P4Dark');
+
+
+
+     end;
+  end;
+
+  if PlayersPlay = 6 then begin
+    if ScreenAct = 1 then begin
+      LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,
+        Static[StaticP1ThreeP].Texture.ColB, 'P1Dark');
+      LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,
+        Static[StaticP2R].Texture.ColB, 'P2Dark');
+      LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,
+        Static[StaticP3R].Texture.ColB, 'P3Dark');
+
+
+
+      LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,
+        Static[StaticP1ThreePScoreBG].Texture.ColB, 'P1Dark');
+      LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,
+        Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');
+      LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,
+        Static[StaticP3RScoreBG].Texture.ColB, 'P3Dark');
+
+
+
+    end;
+    if ScreenAct = 2 then begin
+      LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,
+        Static[StaticP1ThreeP].Texture.ColB, 'P4Dark');
+      LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,
+        Static[StaticP2R].Texture.ColB, 'P5Dark');
+      LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,
+        Static[StaticP3R].Texture.ColB, 'P6Dark');
+
+
+
+
+      LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,
+        Static[StaticP1ThreePScoreBG].Texture.ColB, 'P4Dark');
+      LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,
+        Static[StaticP2RScoreBG].Texture.ColB, 'P5Dark');
+      LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,
+        Static[StaticP3RScoreBG].Texture.ColB, 'P6Dark');
+
+
+
+
+    end;
+  end;
+  //end ScoreBG Mod }
+
+// set player names (for 2 screens and only Singstar skin)
+  if ScreenAct = 1 then begin
+    Text[TextP1].Text       := 'P1';
+    Text[TextP1TwoP].Text   := 'P1'; // added for ps3 skin
+    Text[TextP1ThreeP].Text := 'P1'; // added for ps3 skin
+    Text[TextP2R].Text      := 'P2';
+    Text[TextP2M].Text      := 'P2';
+    Text[TextP3R].Text      := 'P3';
+  end;
+
+  if ScreenAct = 2 then begin
+    case PlayersPlay of
+      4:  begin
+            Text[TextP1TwoP].Text := 'P3';
+            Text[TextP2R].Text := 'P4';
+          end;
+      6:  begin
+            Text[TextP1ThreeP].Text := 'P4';
+            Text[TextP2M].Text := 'P5';
+            Text[TextP3R].Text := 'P6';
+          end;
+    end; // case
+  end; // if
+
+
+  // stereo   <- and where iss P2M? or P3?
+  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10*ScreenX;
+  Text[TextP1].X := Text[TextP1].X + 10*ScreenX;
+
+  {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X + 10*ScreenX;
+  Text[TextP1Score].X := Text[TextP1Score].X + 10*ScreenX;}
+
+  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10*ScreenX;
+  Text[TextP2R].X := Text[TextP2R].X + 10*ScreenX;
+
+  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X + 10*ScreenX;
+  Text[TextP2RScore].X := Text[TextP2RScore].X + 10*ScreenX;}
+
+  // .. and scores
+  {if PlayersPlay = 1 then begin
+    Tekst := IntToStr(Player[0].ScoreTotalI);
+    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+    Text[TextP1Score].Text := Tekst;
+  end;
+
+  if PlayersPlay = 2 then begin
+    Tekst := IntToStr(Player[0].ScoreTotalI);
+    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+    Text[TextP1TwoPScore].Text := Tekst;
+
+    Tekst := IntToStr(Player[1].ScoreTotalI);
+    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+    Text[TextP2RScore].Text := Tekst;
+  end;
+
+  if PlayersPlay = 3 then begin
+    Tekst := IntToStr(Player[0].ScoreTotalI);
+    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+    Text[TextP1ThreePScore].Text := Tekst;
+
+    Tekst := IntToStr(Player[1].ScoreTotalI);
+    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+    Text[TextP2MScore].Text := Tekst;
+
+    Tekst := IntToStr(Player[2].ScoreTotalI);
+    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+    Text[TextP3RScore].Text := Tekst;
+  end;
+
+  if PlayersPlay = 4 then begin
+    if ScreenAct = 1 then begin
+      Tekst := IntToStr(Player[0].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1TwoPScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[1].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP2RScore].Text := Tekst;
+    end;
+    if ScreenAct = 2 then begin
+      Tekst := IntToStr(Player[2].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1TwoPScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[3].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP2RScore].Text := Tekst;
+    end;
+  end;
+
+  if PlayersPlay = 6 then begin
+    if ScreenAct = 1 then begin
+      Tekst := IntToStr(Player[0].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1ThreePScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[1].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP2MScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[2].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP3RScore].Text := Tekst;
+    end;
+    if ScreenAct = 2 then begin
+      Tekst := IntToStr(Player[3].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1ThreePScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[4].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP2MScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[5].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP3RScore].Text := Tekst;
+    end;
+  end;   }
+
+end; //ShowScore
+
+  for S := 1 to 1 do
+    Static[S].Texture.X := Static[S].Texture.X + 10*ScreenX;
+
+  for T := 0 to 1 do
+    Text[T].X := Text[T].X + 10*ScreenX;
+
+if DLLMan.Selected.LoadSong then
+begin
+  // update static menu with time ...
+  Min := Round(Czas.Teraz) div 60;
+  Sec := Round(Czas.Teraz) mod 60;
+  Text[TextTimeText].Text := '';
+  if Min < 10 then Text[TextTimeText].Text := '0';
+  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Min) + ':';
+  if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';
+  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);
+end;
+
+  // draw static menu (BG)
+  DrawBG;
+
+  //Draw Background
+  if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then
+    SingDrawBackground;
+
+  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?
+  // update and draw movie
+  // <mog> wie wo wadd? also in der selben funktion in der uscreensing kommt des video in der zeile 995, oder was wollteste wissen? :X
+{  if ShowFinish and AktSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin
+    UpdateSmpeg; // this only draws
+  end;}
+
+  // draw static menu (FG)
+  DrawFG;
+
+  if ShowFinish then begin
+    if DllMan.Selected.LoadSong then
+    begin
+      if (not AudioPlayback.Finished) and ((AktSong.Finish = 0) or (Czas.Teraz*1000 <= AktSong.Finish)) then begin
+        //Pause Mod:
+        if not Paused then
+          Sing(Self);       // analyze song
+      end else begin
+        if not FadeOut then begin
+          Finish;
+          FadeOut := true;
+          FadeTo(@ScreenPartyScore);
+        end;
+      end;
+    end;
+  end;
+
+  // draw custom items
+  SingModiDraw(PlayerInfo);  // always draw
+
+  //GoldenNoteStarsTwinkle Mod
+    GoldenRec.SpawnRec;
+  //GoldenNoteStarsTwinkle Mod
+
+  //Update PlayerInfo
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    if PlayerInfo.Playerinfo[I].Enabled then
+    begin
+      //PlayerInfo.Playerinfo[I].Bar :=  Player[I].ScorePercent;
+      PlayerInfo.Playerinfo[I].Score := Player[I].ScoreTotalI;
+    end;
+  end;
+
+  if ((ShowFinish) AND (NOT Paused)) then
+  begin
+    if not DLLMan.PluginDraw(Playerinfo, Czesci[0].Akt) then
+    begin
+      if not FadeOut then begin
+          Finish;
+          FadeOut := true;
+          FadeTo(@ScreenPartyScore);
+      end;
+    end;   
+  end;
+
+  //Change PlayerInfo/Changeables
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    if (Player[I].ScoreTotalI <> PlayerInfo.Playerinfo[I].Score) then
+    begin
+      //Player[I].ScoreTotal   := Player[I].ScoreTotal + (PlayerInfo.Playerinfo[I].Score - Player[I].ScoreTotalI);
+      Player[I].ScoreTotalI := PlayerInfo.Playerinfo[I].Score;
+    end;
+    {if (PlayerInfo.Playerinfo[I].Bar <> Player[I].ScorePercent) then
+      Player[I].ScorePercentTarget := PlayerInfo.Playerinfo[I].Bar; }
+  end;
+
+  // back stereo
+  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10*ScreenX;
+  Text[TextP1].X := Text[TextP1].X - 10*ScreenX;
+
+  {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X - 10*ScreenX;
+  Text[TextP1Score].X := Text[TextP1Score].X - 10*ScreenX;}
+
+
+  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X - 10*ScreenX;
+  Text[TextP2R].X := Text[TextP2R].X - 10*ScreenX;
+
+  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X - 10*ScreenX;
+  Text[TextP2RScore].X := Text[TextP2RScore].X - 10*ScreenX;}
+
+
+  for S := 1 to 1 do
+    Static[S].Texture.X := Static[S].Texture.X - 10*ScreenX;
+
+  for T := 0 to 1 do
+    Text[T].X := Text[T].X - 10*ScreenX;
+
+
 end;
 
 procedure TScreenSingModi.Finish;
@@ -665,4 +662,4 @@ begin
 end;
 
 end.
->>>>>>> .r429

+>>>>>>> .r429
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 4d146283..3f2f5d58 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1,12 +1,8 @@
 unit UScreenSong;
 
 interface
-{$I switches.inc}
-
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
+{$I switches.inc}
 
 
 uses
@@ -813,7 +809,7 @@ begin
         try
           AddButton(300 + Pet*250, 140, 200, 200, '', 'JPG', 'Plain', Theme.Song.Cover.Reflections);
         except
-          {$IFDEF win32}
+          {$IFDEF MSWINDOWS}
           Messagebox(0, PChar('No Cover Image is damage. Could not Workaround Song Loading, Ultrastar will exit now.'), PChar(Language.Translate('US_VERSION')), MB_ICONERROR or MB_OK);
           {$ELSE}
           // TODO : JB_linux - better handle this message and display to user..
diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index de78665e..14228964 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -2,6 +2,8 @@ unit UScreenSongJumpto;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;

 

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index c6e16f60..6f9b0c53 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -2,9 +2,7 @@ unit UScreenSongMenu;
 
 interface
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
+{$I switches.inc}
 
 uses
   UMenu,
diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas
index 1310b127..414055f9 100644
--- a/Game/Code/Screens/UScreenStatDetail.pas
+++ b/Game/Code/Screens/UScreenStatDetail.pas
@@ -2,6 +2,8 @@ unit UScreenStatDetail;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, SysUtils, UDisplay, UMusic, UIni, UThemes;

 

diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas
index 4f46bec2..02209dd7 100644
--- a/Game/Code/Screens/UScreenStatMain.pas
+++ b/Game/Code/Screens/UScreenStatMain.pas
@@ -2,10 +2,7 @@ unit UScreenStatMain;
 
 interface
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
-
+{$I switches.inc}
 
 uses
   UMenu,
@@ -164,7 +161,7 @@ var
   Result1, Result2: AStatResult;
   ResetTime: TSystemTime;
   
-  {$IFDEF win32}
+  {$IFDEF MSWINDOWS}
   function GetFileCreation(Filename: String): TSystemTime;
   var
     FindData: TWin32FindData;
@@ -207,7 +204,7 @@ begin
 
   ResetTime := GetFileCreation(Database.Filename);
 
-  {$IFDEF win32}
+  {$IFDEF MSWINDOWS}
     A1 := ResetTime.wDay;
     A2 := ResetTime.wMonth;
     A3 := ResetTime.wYear;
diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas
index d0fe15c8..83ba2bb0 100644
--- a/Game/Code/Screens/UScreenTop5.pas
+++ b/Game/Code/Screens/UScreenTop5.pas
@@ -2,10 +2,7 @@ unit UScreenTop5;
 
 interface
 
-{$IFDEF FPC}
-  {$MODE DELPHI}
-{$ENDIF}
-
+{$I switches.inc}
 
 uses
   UMenu, SDL, SysUtils, UDisplay, UMusic, USongs, UThemes, ULCD;
diff --git a/Game/Code/Screens/UScreenWelcome.pas b/Game/Code/Screens/UScreenWelcome.pas
index 35e159f8..fc088458 100644
--- a/Game/Code/Screens/UScreenWelcome.pas
+++ b/Game/Code/Screens/UScreenWelcome.pas
@@ -2,6 +2,8 @@ unit UScreenWelcome;
 

 interface

 

+{$I switches.inc}

+

 uses

   UMenu, SDL, SysUtils, UThemes;