From 44f53ae73531b0570aef1ac1adf47a146c114a49 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Sat, 5 Jun 2010 12:25:04 +0000 Subject: - code cosmetics in UDraw - fixed singbar calculation of P2 in duet mode - fixed handling of duet highscores git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2445 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UDraw.pas | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'Game/Code/Classes') diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index fece85fc..94142bc7 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -750,27 +750,33 @@ begin //SingBar Mod //modded again to make it moveable: it's working, so why try harder - else if Ini.Oscilloscope = 2 then begin + else if Ini.Oscilloscope = 2 then + begin A := GetTickCount div 33; - if A <> Tickold then begin + if A <> Tickold then + begin Tickold := A; - for E := 0 to (PlayersPlay - 1) do begin //Set new Pos + Alpha + for E := 0 to (PlayersPlay - 1) do + begin //Set new Pos + Alpha I := Player[E].ScorePercentTarget - Player[E].ScorePercent; if I > 0 then Inc(Player[E].ScorePercent) else if I < 0 then Dec(Player[E].ScorePercent); end; //for end; //if - if PlayersPlay = 1 then begin + if PlayersPlay = 1 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP1SingBar.x, Theme.Sing.StaticP1SingBar.y, Theme.Sing.StaticP1SingBar.w, Theme.Sing.StaticP1SingBar.h , Player[0].ScorePercent); end; - if PlayersPlay = 2 then begin + if PlayersPlay = 2 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent); //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent); end; - if PlayersPlay = 3 then begin + if PlayersPlay = 3 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent); //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent); //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent); @@ -778,22 +784,27 @@ begin SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent); end; - if PlayersPlay = 4 then begin - if ScreenAct = 1 then begin + if PlayersPlay = 4 then + begin + if ScreenAct = 1 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent); //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent); end; - if ScreenAct = 2 then begin + if ScreenAct = 2 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent); //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[3].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[2].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[3].ScorePercent); end; end; - if PlayersPlay = 6 then begin - if ScreenAct = 1 then begin + if PlayersPlay = 6 then + begin + if ScreenAct = 1 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent); //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent); //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent); @@ -801,7 +812,8 @@ begin SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent); SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent); end; - if ScreenAct = 2 then begin + if ScreenAct = 2 then + begin //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[3].ScorePercent); //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[4].ScorePercent); //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[5].ScorePercent); -- cgit v1.2.3