From a4accf241c7623b5b36e1e31bded05f94f662585 Mon Sep 17 00:00:00 2001 From: f1fth_freed0m Date: Mon, 10 Mar 2008 07:29:30 +0000 Subject: Removed zlportio from Code git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@954 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UMain.pas | 34 +++++++++++++++++++++------------- Game/Code/Screens/UScreenCredits.pas | 4 ++-- Game/Code/Screens/UScreenMain.pas | 35 ++++++++++++++++++++--------------- Game/Code/Screens/UScreenScore.pas | 1 - Game/Code/Screens/UScreenSing.pas | 10 ++++++---- Game/Code/Screens/UScreenSingModi.pas | 4 ++-- Game/Code/Screens/UScreenSong.pas | 29 ++++++++++++++++------------- Game/Code/Screens/UScreenTop5.pas | 2 +- Game/Code/UltraStar.dpr | 4 ++-- 9 files changed, 70 insertions(+), 53 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas index 67690706..fd0c9eb5 100644 --- a/Game/Code/Classes/UMain.pas +++ b/Game/Code/Classes/UMain.pas @@ -23,10 +23,10 @@ uses USong, OpenGL12, {$IFDEF UseSerialPort} - zlportio, //you can disable it and all PortWriteB calls + //zlportio, //you can disable it and all PortWriteB calls {$ENDIF} - ULCD, - ULight, + //ULCD, //TODO: maybe LCD Support as Plugin? + //ULight, //TODO: maybe Light Support as Plugin? UThemes; type @@ -225,10 +225,11 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Load Sound Settings', 1); - // LCD - Log.BenchmarkStart(1); - Log.LogStatus('Load LCD', 'Initialization'); - LCD := TLCD.Create; + // LCD //TODO: maybe LCD Support as Plugin? + //Log.BenchmarkStart(1); + //Log.LogStatus('Load LCD', 'Initialization'); + //LCD := TLCD.Create; + (* if Ini.LPT = 1 then begin //LCD.HalfInterface := true; @@ -239,8 +240,9 @@ begin end; Log.BenchmarkEnd(1); Log.LogBenchmark('Loading LCD', 1); - - // Light + *) + // Light //TODO: maybe Light Support as Plugin? + (* Log.BenchmarkStart(1); Log.LogStatus('Load Light', 'Initialization'); Light := TLight.Create; @@ -250,7 +252,7 @@ begin end; Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Light', 1); - + *) // Theme @@ -379,12 +381,14 @@ begin //TTF_quit(); SDL_Quit(); + (* {$ifdef WIN32} if assigned(LCD) and (Ini.LPT = 1) then LCD.Clear; if assigned(Light) and (Ini.LPT = 2) then Light.TurnOff; {$endif} + *) if assigned(Log) then begin @@ -416,7 +420,7 @@ begin SwapBuffers; // light - Light.Refresh; + //Light.Refresh; // delay CountMidTime; @@ -795,7 +799,7 @@ begin Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]); end; - Sender.UpdateLCD; + //Sender.UpdateLCD; //On Sentence Change... Sender.onSentenceChange(Lines[0].Current); @@ -819,7 +823,7 @@ begin // LCD.ShowCursor; //LCD.MoveCursorBR(Sender.LyricMain.SelectedLetter); - LCD.ShowCursor; + //LCD.ShowCursor; end; end; @@ -842,9 +846,11 @@ begin //LPT_1 := 0; // Light.LightOne(0, 150); + (* Light.LightOne(1, 200); // beat light if ParamStr(1) = '-doublelights' then Light.LightOne(0, 200); // beat light + *) { if ((LineState.CurrentBeatC + Lines[0].Resolution + Lines[0].NotesGAP) mod (Lines[0].Resolution * 2) = 0) then @@ -862,8 +868,10 @@ begin AudioPlayback.PlaySound(SoundLib.Click); //LPT_2 := 0; + (* if ParamStr(1) <> '-doublelights' then Light.LightOne(0, 150); //125 + *) // drum machine (* diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas index e12a54e3..271c0f5e 100644 --- a/Game/Code/Screens/UScreenCredits.pas +++ b/Game/Code/Screens/UScreenCredits.pas @@ -20,8 +20,8 @@ uses UFiles, SysUtils, UThemes, - ULCD, - ULight, + //ULCD, + //ULight, UGraphicClasses; type diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas index fd95a768..54a6f47d 100644 --- a/Game/Code/Screens/UScreenMain.pas +++ b/Game/Code/Screens/UScreenMain.pas @@ -15,9 +15,9 @@ uses UMusic, UFiles, SysUtils, - UThemes, - ULCD, - ULight; + UThemes; + //ULCD, //TODO: maybe LCD Support as Plugin? + //ULight //TODO: maybe Light Support as Plugin? type TScreenMain = class(TMenu) @@ -32,7 +32,7 @@ type procedure InteractPrev; override; procedure InteractInc; override; procedure InteractDec; override; - procedure UpdateLCD; + //procedure UpdateLCD; //TODO: maybe LCD Support as Plugin? procedure SetAnimationProgress(Progress: real); override; //function Draw: boolean; override; end; @@ -218,12 +218,13 @@ begin Interaction := 0; end; -procedure TScreenMain.onShow; +procedure TScreenMain.onShow; //TODO: maybe LCD Support as Plugin? begin inherited; - + (* LCD.WriteText(1, ' Choose mode: '); UpdateLCD; + *) end; procedure TScreenMain.InteractNext; @@ -231,8 +232,8 @@ begin inherited InteractNext; Text[TextDescription].Text := Theme.Main.Description[Interaction]; Text[TextDescriptionLong].Text := Theme.Main.DescriptionLong[Interaction]; - UpdateLCD; - Light.LightOne(1, 200); + //UpdateLCD; + //Light.LightOne(1, 200); end; procedure TScreenMain.InteractPrev; @@ -240,8 +241,8 @@ begin inherited InteractPrev; Text[TextDescription].Text := Theme.Main.Description[Interaction]; Text[TextDescriptionLong].Text := Theme.Main.DescriptionLong[Interaction]; - UpdateLCD; - Light.LightOne(0, 200); + //UpdateLCD; + //Light.LightOne(0, 200); end; procedure TScreenMain.InteractDec; @@ -249,8 +250,8 @@ begin inherited InteractDec; Text[TextDescription].Text := Theme.Main.Description[Interaction]; Text[TextDescriptionLong].Text := Theme.Main.DescriptionLong[Interaction]; - UpdateLCD; - Light.LightOne(0, 200); + //UpdateLCD; + //Light.LightOne(0, 200); end; procedure TScreenMain.InteractInc; @@ -258,19 +259,23 @@ begin inherited InteractInc; Text[TextDescription].Text := Theme.Main.Description[Interaction]; Text[TextDescriptionLong].Text := Theme.Main.DescriptionLong[Interaction]; - UpdateLCD; - Light.LightOne(1, 200); + //UpdateLCD; + //Light.LightOne(1, 200); end; -procedure TScreenMain.UpdateLCD; +(* +procedure TScreenMain.UpdateLCD; //TODO: maybe LCD Support as Plugin? begin + case Interaction of 0: LCD.WriteText(2, ' sing '); 1: LCD.WriteText(2, ' editor '); 2: LCD.WriteText(2, ' options '); 3: LCD.WriteText(2, ' exit '); end + end; +*) procedure TScreenMain.SetAnimationProgress(Progress: real); begin diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas index 5bba9691..6939cee2 100644 --- a/Game/Code/Screens/UScreenScore.pas +++ b/Game/Code/Screens/UScreenScore.pas @@ -18,7 +18,6 @@ uses UThemes, OpenGL12, math, - ULCD, UTexture; // OpenGL; diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index d50d4360..608bae72 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -23,7 +23,7 @@ uses UMenu, TextGL, OpenGL12, UThemes, - ULCD, + //ULCD, //TODO: maybe LCD Support as Plugin? UGraphicClasses, USingScores; @@ -108,7 +108,7 @@ type function Draw: boolean; override; procedure Finish; virtual; - procedure UpdateLCD; + //procedure UpdateLCD; //TODO: maybe LCD Support as Plugin? procedure Pause; //Pause Mod(Toggles Pause) procedure onSentenceEnd(S: Cardinal); //OnSentenceEnd for LineBonus + Singbar @@ -637,7 +637,7 @@ begin While (not Lyrics.LineinQueue) AND (Lyrics.LineCounter <= High(Lines[0].Line)) do Lyrics.AddLine(@Lines[0].Line[Lyrics.LineCounter]); - UpdateLCD; + //UpdateLCD; //TODO: maybe LCD Support as Plugin? //Deactivate Pause Paused := False; @@ -1286,7 +1286,8 @@ begin SetFontItalic (False); end; -procedure TScreenSing.UpdateLCD; +(* +procedure TScreenSing.UpdateLCD; //TODO: maybe LCD Support as Plugin? var T: string; begin @@ -1302,6 +1303,7 @@ begin if Copy(T, Length(T), 1) <> ' ' then T := T + ' '; LCD.AddTextBR(T);} end; +*) procedure TScreenSing.onSentenceEnd(S: Cardinal); var diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas index 2e4f8240..c2b1be79 100644 --- a/Game/Code/Screens/UScreenSingModi.pas +++ b/Game/Code/Screens/UScreenSingModi.pas @@ -24,7 +24,7 @@ uses UMenu, OpenGL12, UThemes, - ULCD, + //ULCD, //TODO: maybe LCD Support as Plugin? UScreenSing, ModiSDK; @@ -71,7 +71,7 @@ type function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override; function Draw: boolean; override; procedure Finish; override; - //procedure UpdateLCD; + //procedure UpdateLCD; //TODO: maybe LCD Support as Plugin? //procedure Pause; //Pause Mod(Toggles Pause) end; diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index f481bad6..16432dfa 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -22,8 +22,8 @@ uses UThemes, UTexture, ULanguage, - ULCD, - ULight, + //ULCD, //TODO: maybe LCD Support as Plugin? + //ULight, //TODO: maybe Light Support as Plugin? USong, UIni; @@ -99,7 +99,7 @@ type procedure onHide; override; procedure SelectNext; procedure SelectPrev; - procedure UpdateLCD; + //procedure UpdateLCD; //TODO: maybe LCD Support as Plugin? procedure SkipTo(Target: Cardinal); procedure FixSelected; //Show Wrong Song when Tabs on Fix procedure FixSelected2; //Show Wrong Song when Tabs on Fix @@ -274,7 +274,7 @@ begin ChangeMusic; SetScroll4; - UpdateLCD; + //UpdateLCD; //TODO: maybe LCD Support as Plugin? //Break and Exit Exit; end; @@ -295,7 +295,7 @@ begin ChangeMusic; SetScroll4; - UpdateLCD; + //UpdateLCD; //TODO: maybe LCD Support as Plugin? //Break and Exit Exit; @@ -565,8 +565,8 @@ begin // SongTarget := Interaction; ChangeMusic; SetScroll4; - UpdateLCD; - Light.LightOne(1, 200); + //UpdateLCD; //TODO: maybe LCD Support as Plugin? + //Light.LightOne(1, 200); //TODO: maybe Light Support as Plugin? end; end; @@ -577,8 +577,8 @@ begin SelectPrev; ChangeMusic; SetScroll4; - UpdateLCD; - Light.LightOne(0, 200); + //UpdateLCD; //TODO: maybe LCD Support as Plugin? + //Light.LightOne(0, 200); //TODO: maybe Light Support as Plugin? end; end; @@ -659,7 +659,7 @@ begin ChangeMusic; SetScroll4; - UpdateLCD; + //UpdateLCD; //TODO: maybe LCD Support as Plugin? end; end; @@ -1542,7 +1542,7 @@ begin end; SetScroll; - UpdateLCD; + //UpdateLCD; //TODO: maybe LCD Support as Plugin? end; //Playlist Mode @@ -1757,13 +1757,16 @@ begin end; end; -procedure TScreenSong.UpdateLCD; +(* +procedure TScreenSong.UpdateLCD; //TODO: maybe LCD Support as Plugin? begin LCD.HideCursor; LCD.Clear; LCD.WriteText(1, Text[TextArtist].Text); LCD.WriteText(2, Text[TextTitle].Text); + end; +*) //Procedure Change current played Preview procedure TScreenSong.ChangeMusic; @@ -1977,7 +1980,7 @@ begin AudioPlayback.PlaySound(SoundLib.Change); ChangeMusic; SetScroll; - UpdateLCD; + //UpdateLCD; //TODO: maybe LCD Support as Plugin? end; procedure TScreenSong.SetJoker; diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas index 27881120..d241499a 100644 --- a/Game/Code/Screens/UScreenTop5.pas +++ b/Game/Code/Screens/UScreenTop5.pas @@ -9,7 +9,7 @@ interface {$I switches.inc} uses - UMenu, SDL, SysUtils, UDisplay, UMusic, USongs, UThemes, ULCD; + UMenu, SDL, SysUtils, UDisplay, UMusic, USongs, UThemes; type TScreenTop5 = class(TMenu) diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 4acb5d1f..79f9675e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -106,8 +106,8 @@ uses UThemes in 'Classes\UThemes.pas', ULog in 'Classes\ULog.pas', UJoystick in 'Classes\UJoystick.pas', - ULCD in 'Classes\ULCD.pas', - ULight in 'Classes\ULight.pas', + //ULCD in 'Classes\ULCD.pas', + //ULight in 'Classes\ULight.pas', UDataBase in 'Classes\UDataBase.pas', UCovers in 'Classes\UCovers.pas', UCatCovers in 'Classes\UCatCovers.pas', -- cgit v1.2.3