changes in order to compile in lazarus...

minor tidy ups and removal of big old comment blocks..

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

1 files changed, 25 insertions, 454 deletions

diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 20ad0957..6d3add87 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -2,8 +2,28 @@ unit UScreenSingModi;
 

 interface

 

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

-  TextGL, OpenGL12, BASS, UThemes, ULCD, UScreenSing, ModiSDK;

+{$IFDEF FPC}

+  {$MODE DELPHI}

+{$ENDIF}

+

+uses UMenu,

+     UMusic,

+     SDL,

+     SysUtils,

+     UFiles,

+     UTime,

+     USongs,

+     UIni,

+     ULog,

+     UTexture,

+     ULyrics,

+     TextGL,

+     OpenGL12,

+     BASS,

+     UThemes,

+     ULCD,

+     UScreenSing,

+     ModiSDK;

 

 type

   TScreenSingModi = class(TScreenSing)

@@ -134,459 +154,10 @@ begin
 end;

 

 procedure TScreenSingModi.onShow;

-{var

-  P:      integer;

-  V1:     boolean;

-  V2R:    boolean;

-  V2M:    boolean;

-  V3R:    boolean;

-  NR:       TRecR; //Line Bonus Mod    }

 var

   I: Integer;

 begin

 

- { Log.LogStatus('Begin', 'onShow');

-  FadeOut := false; // 0.5.0: early 0.5.0 problems were by this line commented

-

-  // prepare players

-  SetLength(Player, PlayersPlay);

-//  Player[0].ScoreTotalI := 0;

-

-

-  case PlayersPlay of

-    1:  begin

-          V1 := true;

-          V2R := false;

-          V2M := false;

-          V3R := false;

-        end;

-    2:  begin

-          V1 := true;

-          V2R := true;

-          V2M := false;

-          V3R := false;

-        end;

-    3:  begin

-          V1 := true;

-          V2R := false;

-          V2M := true;

-          V3R := true;

-        end;

-    4:  begin // double screen

-          V1 := true;

-          V2R := true;

-          V2M := false;

-          V3R := false;

-        end;

-    6:  begin // double screen

-          V1 := true;

-          V2R := false;

-          V2M := true;

-          V3R := true;

-        end;

-

-  end;

-

-

-

-  Static[StaticP2R].Visible := V2R;

-  Static[StaticP2RScoreBG].Visible := V2R;

-  Text[TextP2R].Visible := V2R;

-  Text[TextP2RScore].Visible := V2R;

-

-  Static[StaticP2M].Visible := V2M;

-  Static[StaticP2MScoreBG].Visible := V2M;

-  Text[TextP2M].Visible := V2M;

-  Text[TextP2MScore].Visible := V2M;

-

-  Static[StaticP3R].Visible := V3R;

-  Static[StaticP3RScoreBG].Visible := V3R;

-  Text[TextP3R].Visible := V3R;

-  Text[TextP3RScore].Visible := V3R;

-

-

-

-  // load notes

-  CzyscNuty;

-//  Log.LogWarning(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].FileName, '!!!');

-  AktSong := CatSongs.Song[CatSongs.Selected];

-

-  WczytajCzesci(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].FileName);

-  AktSong.Path := CatSongs.Song[CatSongs.Selected].Path;

-//  AktSong.GAP := AktSong.GAP + 40 {4096 = 100ms for buffer}{ + 20 {microphone}{ + 60000 / AktSong.BPM[0].BPM / 2; // temporary until UMain will be fixed

-

-  // set movie

-  if (AktSong.Video <> '') and FileExists(AktSong.Path + AktSong.Video) then begin

-    OpenSmpeg(AktSong.Path + AktSong.Video);

-    SkipSmpeg(AktSong.VideoGAP + AktSong.Start);

-    AktSong.VideoLoaded := true;

-  end;

-

-  // set background

-  if (AktSong.Background <> '')  and (AktSong.VideoLoaded = false) then

-    Tex_Background := Texture.LoadTexture(AktSong.Path + AktSong.Background)

-  else

-    Tex_Background.TexNum := -1;

-

-  // play music (I)

-  //Music.CaptureStart;

-  Music.MoveTo(AktSong.Start);

-//  Music.Play;

-

-  // prepare timer (I)

-//  CountSkipTimeSet;

-  Czas.Teraz := AktSong.Start;

-  Czas.Razem := Music.Length;

-  if (AktSong.Finish > 0) then Czas.Razem := AktSong.Finish / 1000;

-  Czas.OldBeat := -1;

-  for P := 0 to High(Player) do

-    ClearScores(P);

-

-  // main text

-  LyricMain.Clear;

-  LyricMain.X := 400;

-  LyricMain.Y := Skin_LyricsT;

-  LyricMain.Scale := 1.4; //1.4

-  LyricMain.Align := 1;

-

-  // sub text

-  LyricSub.Clear;

-  LyricSub.X := 400;

-  LyricSub.Y := Skin_LyricsT + 42; //40

-  LyricSub.Align := 1;

-

-  // set custom options

-  case Ini.LyricsFont of

-    0:

-      begin

-        LyricMain.FontStyle := 0;

-        LyricSub.FontStyle := 0;

-        LyricMain.Size := 14; // 13

-        LyricSub.Size := 14; // 13

-        LyricMain.ColR := Skin_FontR;

-        LyricMain.ColG := Skin_FontG;

-        LyricMain.ColB := Skin_FontB; //Change für Crazy Joker

-        {LyricMain.ColSR := Skin_FontHighlightR;

-        LyricMain.ColSG := Skin_FontHighlightG;

-        LyricMain.ColSB := Skin_FontHighlightB;1aa5dc}    {

-        LyricMain.ColSR := 26/255;

-        LyricMain.ColSG := 165/255;

-        LyricMain.ColSB := 220/255;

-

-        LyricSub.ColR := 0.6;

-        LyricSub.ColG := 0.6;

-        LyricSub.ColB := 0.6;

-      end;

-    1:

-      begin

-        LyricMain.FontStyle := 2;

-        LyricSub.FontStyle := 2;

-        LyricMain.Size := 14;

-        LyricSub.Size := 14;

-        LyricMain.ColR := 0.75;

-        LyricMain.ColG := 0.75;

-        LyricMain.ColB := 1;

-        LyricMain.ColSR := 0.5;

-        LyricMain.ColSG := 0.5;

-        LyricMain.ColSB := 1;

-        LyricSub.ColR := 0.8;

-        LyricSub.ColG := 0.8;

-        LyricSub.ColB := 0.8;

-      end;

-    2:

-      begin

-        LyricMain.FontStyle := 3;

-        LyricSub.FontStyle := 3;

-        LyricMain.Size := 12;

-        LyricSub.Size := 12;

-        LyricMain.ColR := 0.75;

-        LyricMain.ColG := 0.75;

-        LyricMain.ColB := 1;

-        LyricMain.ColSR := 0.5;

-        LyricMain.ColSG := 0.5;

-        LyricMain.ColSB := 1;

-        LyricSub.ColR := 0.8;

-        LyricSub.ColG := 0.8;

-        LyricSub.ColB := 0.8;

-      end;

-  end; // case

-

-  case Ini.LyricsEffect of

-    0:  LyricMain.Style := 1; // 0 - one selected, 1 - selected all to the current

-    1:  LyricMain.Style := 2;

-    2:  LyricMain.Style := 3;

-    3:  LyricMain.Style := 4;

-  end; // case

-

-  // fill texts

-  LyricMain.AddCzesc(0);

-  LyricMain.Selected := -1;

-  LyricSub.AddCzesc(1);

-  LyricSub.Selected := -1;

-

-  UpdateLCD;

-

-  //Deactivate Pause

-  Paused := False;

-

-  {Static[StaticP2R].Visible := V2R;

-  Static[StaticP2RScoreBG].Visible := V2R;

-  Text[TextP2R].Visible := V2R;

-  Text[TextP2RScore].Visible := V2R;

-

-  Static[StaticP2M].Visible := V2M;

-  Static[StaticP2MScoreBG].Visible := V2M;

-  Text[TextP2M].Visible := V2M;

-  Text[TextP2MScore].Visible := V2M;

-

-  Static[StaticP3R].Visible := V3R;

-  Static[StaticP3RScoreBG].Visible := V3R;

-  Text[TextP3R].Visible := V3R;

-  Text[TextP3RScore].Visible := V3R;}     {

-

-  //Set Position of Line Bonus - PhrasenBonus

-  if (Ini.LineBonus = 1) then //Show Line Bonus at Scores

-  begin

-  Case PlayersPlay of

-    1: begin

-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-    end;

-

-    2: begin

-      //P1

-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.X;

-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-

-      //P2

-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2RScoreBG.X;

-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2RScore.Y;

-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2RScoreBG.X;

-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2RScore.Y + 65;

-    end;

-

-    3: begin

-      //P1

-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-

-      //P2

-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2MScoreBG.x;

-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2MScore.Y;

-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2MScoreBG.x;

-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2MScore.Y + 65;

-

-      //P3

-      Player[2].LineBonus_TargetX := Theme.Sing.StaticP3RScoreBG.x;

-      Player[2].LineBonus_TargetY := Theme.Sing.TextP3RScore.Y;

-      Player[2].LineBonus_StartX  := Theme.Sing.StaticP3RScoreBG.x;

-      Player[2].LineBonus_StartY  := Theme.Sing.TextP3RScore.Y + 65;

-    end;

-

-    4: begin

-      //P1

-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-

-      //P2

-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2RScoreBG.x;

-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2RScore.Y;

-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2RScoreBG.x;

-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2RScore.Y + 65;

-

-      //P3

-      Player[2].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[2].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[2].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;

-      Player[2].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-

-      //P4

-      Player[3].LineBonus_TargetX := Theme.Sing.StaticP2RScoreBG.x;

-      Player[3].LineBonus_TargetY := Theme.Sing.TextP2RScore.Y;

-      Player[3].LineBonus_StartX  := Theme.Sing.StaticP2RScoreBG.x;

-      Player[3].LineBonus_StartY  := Theme.Sing.TextP2RScore.Y + 65;

-    end;

-

-    6: begin

-      //P1

-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;

-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-

-      //P2

-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2MScoreBG.x;

-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2MScore.Y;

-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2MScoreBG.x;

-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2MScore.Y + 65;

-

-      //P3

-      Player[2].LineBonus_TargetX := Theme.Sing.StaticP3RScoreBG.x;

-      Player[2].LineBonus_TargetY := Theme.Sing.TextP3RScore.Y;

-      Player[2].LineBonus_StartX  := Theme.Sing.StaticP3RScoreBG.x;

-      Player[2].LineBonus_StartY  := Theme.Sing.TextP3RScore.Y + 65;

-

-      //P4

-      Player[3].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;

-      Player[3].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;

-      Player[3].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;

-      Player[3].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;

-

-      //P5

-      Player[4].LineBonus_TargetX := Theme.Sing.StaticP2MScoreBG.x;

-      Player[4].LineBonus_TargetY := Theme.Sing.TextP2MScore.Y;

-      Player[4].LineBonus_StartX  := Theme.Sing.StaticP2MScoreBG.x;

-      Player[4].LineBonus_StartY  := Theme.Sing.TextP2MScore.Y + 65;

-

-      //P6

-      Player[5].LineBonus_TargetX := Theme.Sing.StaticP3RScoreBG.x;

-      Player[5].LineBonus_TargetY := Theme.Sing.TextP3RScore.Y;

-      Player[5].LineBonus_StartX  := Theme.Sing.StaticP3RScoreBG.x;

-      Player[5].LineBonus_StartY  := Theme.Sing.TextP3RScore.Y + 65;

-    end;

-  end;

-  end

-  else if (Ini.LineBonus = 2) then //Show Line Bonus at Notes

-  begin

-  //SingDrawNoteLines(Nr.Left + 10*ScreenX, 120, Nr.Right + 10*ScreenX, 12);

-  //SingDrawNoteLines(Nr.Left + 10*ScreenX, 245, Nr.Right + 10*ScreenX, 12);

-  //SingDrawNoteLines(Nr.Left + 10*ScreenX, 370, Nr.Right + 10*ScreenX, 12);

-

-  // positions

-  if Ini.SingWindow = 0 then begin

-    NR.Left := 120;

-  end else begin

-    NR.Left := 20;

-  end;

-  NR.Right := 780;

-

-  NR.Width := NR.Right - NR.Left;

-  NR.WMid := NR.Width / 2;

-  NR.Mid := NR.Left + NR.WMid;

-

-  Case PlayersPlay of

-    1: begin

-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65;

-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_StartY  := Skin_P2_NotesB - 105;

-    end;

-

-    2: begin

-      //P1

-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_TargetY := Skin_P1_NotesB - 105 - 65 + 28;

-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_StartY  := Skin_P1_NotesB - 105 + 28;

-

-      //P2

-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65 + 28;

-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_StartY  := Skin_P2_NotesB - 105 + 28;

-    end;

-

-    3: begin

-      //P1

-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_TargetY := 120 - 65 + 28;

-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_StartY  := 120 + 28;

-

-      //P2

-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_TargetY := 245 - 65 + 28;

-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_StartY  := 245 + 28;

-

-      //P3

-      Player[2].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[2].LineBonus_TargetY := 370 - 65 + 28;

-      Player[2].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[2].LineBonus_StartY  := 370 + 28;

-    end;

-

-    4: begin

-      //P1

-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_TargetY := Skin_P1_NotesB - 105 - 65 + 28;

-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_StartY  := Skin_P1_NotesB - 105 + 28;

-

-      //P2

-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65 + 28;

-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_StartY  := Skin_P2_NotesB - 105 + 28;

-

-      //P3

-      Player[2].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[2].LineBonus_TargetY := Skin_P1_NotesB - 105 - 65 + 28;

-      Player[2].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[2].LineBonus_StartY  := Skin_P1_NotesB - 105 + 28;

-

-      //P4

-      Player[3].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[3].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65 + 28;

-      Player[3].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[3].LineBonus_StartY  := Skin_P2_NotesB - 105 + 28;

-    end;

-

-    6: begin

-      //P1

-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_TargetY := 120 - 65 + 28;

-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[0].LineBonus_StartY  := 120 + 28;

-

-      //P2

-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_TargetY := 245 - 65 + 28;

-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[1].LineBonus_StartY  := 245 + 28;

-

-      //P3

-      Player[2].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[2].LineBonus_TargetY := 370 - 65 + 28;

-      Player[2].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[2].LineBonus_StartY  := 370 + 28;

-

-      //P4

-      Player[3].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[3].LineBonus_TargetY := 120 - 65 + 28;

-      Player[3].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[3].LineBonus_StartY  := 120 + 28;

-

-      //P5

-      Player[4].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[4].LineBonus_TargetY := 245 - 65 + 28;

-      Player[4].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[4].LineBonus_StartY  := 245 + 28;

-

-      //P6

-      Player[5].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 87);

-      Player[5].LineBonus_TargetY := 370 - 65 + 28;

-      Player[5].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 87);

-      Player[5].LineBonus_StartY  := 370 + 28;

-    end;

-  end;

-  end;

-  //Set Position of Line Bonus - PhrasenBonus End

-  //Set Num of Empty Sentences for Phrasen Bonus

-  NumEmptySentences := 0;

-  for P := low(Czesci[0].Czesc) to high(Czesci[0].Czesc) do

-    if Czesci[0].Czesc[P].TotalNotes = 0 then Inc(NumEmptySentences);

-

-  Log.LogStatus('End', 'onShow');  }

-

   PlayersPlay := TeamInfo.NumTeams;

 

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

@@ -602,9 +173,9 @@ begin
   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].Name    := PChar(Ini.Name[I]);

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

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

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

   end;