aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-18 13:43:36 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-18 13:43:36 +0000
commitf761eb20ce8d3b5ef718be4a305b78712641248d (patch)
tree0cf16adb83c0004af60aeca3b5d8b9cf17b18aa6
parent4b502e678735fe19ccc7bd140b4ff34ac1406628 (diff)
downloadusdx-f761eb20ce8d3b5ef718be4a305b78712641248d.tar.gz
usdx-f761eb20ce8d3b5ef718be4a305b78712641248d.tar.xz
usdx-f761eb20ce8d3b5ef718be4a305b78712641248d.zip
change variable names "static" to "statics"
- "static" is a reserved name and should not be used - code-completion in lazarus does not work as it is not able to cope with variables that are named "static" git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2246 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/base/UThemes.pas6
-rw-r--r--src/menu/UMenu.pas72
-rw-r--r--src/screens/UScreenEdit.pas4
-rw-r--r--src/screens/UScreenEditHeader.pas56
-rw-r--r--src/screens/UScreenMain.pas4
-rw-r--r--src/screens/UScreenPartyNewRound.pas28
-rw-r--r--src/screens/UScreenPartyScore.pas82
-rw-r--r--src/screens/UScreenPartyWin.pas78
-rw-r--r--src/screens/UScreenScore.pas68
-rw-r--r--src/screens/UScreenSing.pas36
-rw-r--r--src/screens/UScreenSong.pas114
-rw-r--r--src/screens/UScreenTop5.pas20
12 files changed, 284 insertions, 284 deletions
diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index f8b2d8fd..45e85af5 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -218,7 +218,7 @@ type
TThemeBasic = class
Background: TThemeBackground;
Text: AThemeText;
- Static: AThemeStatic;
+ Statics: AThemeStatic;
//Button Collection Mod
ButtonCollection: AThemeButtonCollection;
@@ -1623,7 +1623,7 @@ procedure TTheme.ThemeLoadBasic(Theme: TThemeBasic; const Name: string);
begin
ThemeLoadBackground(Theme.Background, Name);
ThemeLoadTexts(Theme.Text, Name + 'Text');
- ThemeLoadStatics(Theme.Static, Name + 'Static');
+ ThemeLoadStatics(Theme.Statics, Name + 'Static');
ThemeLoadButtonCollections(Theme.ButtonCollection, Name + 'ButtonCollection');
LastThemeBasic := Theme;
@@ -2297,7 +2297,7 @@ begin
ThemeIni.WriteInteger(Name, 'Texts', Length(Theme.Text));
ThemeSaveBackground(Theme.Background, Name + 'Background');
- ThemeSaveStatics(Theme.Static, Name + 'Static');
+ ThemeSaveStatics(Theme.Statics, Name + 'Static');
ThemeSaveTexts(Theme.Text, Name + 'Text');
end;
diff --git a/src/menu/UMenu.pas b/src/menu/UMenu.pas
index b4ea3d00..a05c667f 100644
--- a/src/menu/UMenu.pas
+++ b/src/menu/UMenu.pas
@@ -68,7 +68,7 @@ type
ButtonCollection: array of TButtonCollection;
public
Text: array of TText;
- Static: array of TStatic;
+ Statics: array of TStatic;
mX: integer; // mouse X
mY: integer; // mouse Y
@@ -221,7 +221,7 @@ begin
Fade := 0;//fWhite;
- SetLength(Static, 0);
+ SetLength(Statics, 0);
SetLength(Button, 0);
//Set ButtonPos to Autoset Length
@@ -338,8 +338,8 @@ begin
AddBackground(ThemeBasic.Background);
//Add Statics and Texts
- for I := 0 to High(ThemeBasic.Static) do
- AddStatic(ThemeBasic.Static[I]);
+ for I := 0 to High(ThemeBasic.Statics) do
+ AddStatic(ThemeBasic.Statics[I]);
for I := 0 to High(ThemeBasic.Text) do
AddText(ThemeBasic.Text[I]);
@@ -628,16 +628,16 @@ var
StatNum: integer;
begin
// adds static
- StatNum := Length(Static);
- SetLength(Static, StatNum + 1);
- Static[StatNum] := TStatic.Create(Texture.GetTexture(TexName, Typ, $FF00FF)); // new skin
+ StatNum := Length(Statics);
+ SetLength(Statics, StatNum + 1);
+ Statics[StatNum] := TStatic.Create(Texture.GetTexture(TexName, Typ, $FF00FF)); // new skin
// configures static
- Static[StatNum].Texture.X := X;
- Static[StatNum].Texture.Y := Y;
- Static[StatNum].Texture.W := W;
- Static[StatNum].Texture.H := H;
- Static[StatNum].Visible := true;
+ Statics[StatNum].Texture.X := X;
+ Statics[StatNum].Texture.Y := Y;
+ Statics[StatNum].Texture.W := W;
+ Statics[StatNum].Texture.H := H;
+ Statics[StatNum].Visible := true;
Result := StatNum;
end;
@@ -671,52 +671,52 @@ var
StatNum: integer;
begin
// adds static
- StatNum := Length(Static);
- SetLength(Static, StatNum + 1);
+ StatNum := Length(Statics);
+ SetLength(Statics, StatNum + 1);
// colorize hack
if (Typ = TEXTURE_TYPE_COLORIZED) then
begin
// give encoded color to GetTexture()
- Static[StatNum] := TStatic.Create(Texture.GetTexture(TexName, Typ, RGBFloatToInt(ColR, ColG, ColB)));
+ Statics[StatNum] := TStatic.Create(Texture.GetTexture(TexName, Typ, RGBFloatToInt(ColR, ColG, ColB)));
end
else
begin
- Static[StatNum] := TStatic.Create(Texture.GetTexture(TexName, Typ, Color)); // new skin
+ Statics[StatNum] := TStatic.Create(Texture.GetTexture(TexName, Typ, Color)); // new skin
end;
// configures static
- Static[StatNum].Texture.X := X;
- Static[StatNum].Texture.Y := Y;
+ Statics[StatNum].Texture.X := X;
+ Statics[StatNum].Texture.Y := Y;
//Set height and width via sprite size if omitted
if(H = 0) then
- Static[StatNum].Texture.H := Static[StatNum].Texture.H
+ Statics[StatNum].Texture.H := Statics[StatNum].Texture.H
else
- Static[StatNum].Texture.H := H;
+ Statics[StatNum].Texture.H := H;
if(W = 0) then
- Static[StatNum].Texture.W := Static[StatNum].Texture.W
+ Statics[StatNum].Texture.W := Statics[StatNum].Texture.W
else
- Static[StatNum].Texture.W := W;
+ Statics[StatNum].Texture.W := W;
- Static[StatNum].Texture.Z := Z;
+ Statics[StatNum].Texture.Z := Z;
if (Typ <> TEXTURE_TYPE_COLORIZED) then
begin
- Static[StatNum].Texture.ColR := ColR;
- Static[StatNum].Texture.ColG := ColG;
- Static[StatNum].Texture.ColB := ColB;
+ Statics[StatNum].Texture.ColR := ColR;
+ Statics[StatNum].Texture.ColG := ColG;
+ Statics[StatNum].Texture.ColB := ColB;
end;
- Static[StatNum].Texture.TexX1 := TexX1;
- Static[StatNum].Texture.TexY1 := TexY1;
- Static[StatNum].Texture.TexX2 := TexX2;
- Static[StatNum].Texture.TexY2 := TexY2;
- Static[StatNum].Texture.Alpha := 1;
- Static[StatNum].Visible := true;
+ Statics[StatNum].Texture.TexX1 := TexX1;
+ Statics[StatNum].Texture.TexY1 := TexY1;
+ Statics[StatNum].Texture.TexX2 := TexX2;
+ Statics[StatNum].Texture.TexY2 := TexY2;
+ Statics[StatNum].Texture.Alpha := 1;
+ Statics[StatNum].Visible := true;
//ReflectionMod
- Static[StatNum].Reflection := Reflection;
- Static[StatNum].ReflectionSpacing := ReflectionSpacing;
+ Statics[StatNum].Reflection := Reflection;
+ Statics[StatNum].ReflectionSpacing := ReflectionSpacing;
Result := StatNum;
end;
@@ -934,8 +934,8 @@ var
J: integer;
begin
// We don't forget about newly implemented static for nice skin ...
- for J := 0 to High(Static) do
- Static[J].Draw;
+ for J := 0 to High(Statics) do
+ Statics[J].Draw;
// ... and slightly implemented menutext unit
for J := 0 to High(Text) do
diff --git a/src/screens/UScreenEdit.pas b/src/screens/UScreenEdit.pas
index 2111adef..12e2948c 100644
--- a/src/screens/UScreenEdit.pas
+++ b/src/screens/UScreenEdit.pas
@@ -157,8 +157,8 @@ end;
procedure TScreenEdit.SetAnimationProgress(Progress: real);
begin
- Static[0].Texture.ScaleW := Progress;
- Static[0].Texture.ScaleH := Progress;
+ Statics[0].Texture.ScaleW := Progress;
+ Statics[0].Texture.ScaleH := Progress;
end;
end.
diff --git a/src/screens/UScreenEditHeader.pas b/src/screens/UScreenEditHeader.pas
index c581215b..1d697bc9 100644
--- a/src/screens/UScreenEditHeader.pas
+++ b/src/screens/UScreenEditHeader.pas
@@ -349,90 +349,90 @@ end;*)
procedure TScreenEditHeader.SetRoundButtons;
begin
if Length(Text[TextTitle].Text) > 0 then
- Static[StaticTitle].Visible := true
+ Statics[StaticTitle].Visible := true
else
- Static[StaticTitle].Visible := false;
+ Statics[StaticTitle].Visible := false;
if Length(Text[TextArtist].Text) > 0 then
- Static[StaticArtist].Visible := true
+ Statics[StaticArtist].Visible := true
else
- Static[StaticArtist].Visible := false;
+ Statics[StaticArtist].Visible := false;
if Length(Text[TextMp3].Text) > 0 then
- Static[StaticMp3].Visible := true
+ Statics[StaticMp3].Visible := true
else
- Static[StaticMp3].Visible := false;
+ Statics[StaticMp3].Visible := false;
if Length(Text[TextBackground].Text) > 0 then
- Static[StaticBackground].Visible := true
+ Statics[StaticBackground].Visible := true
else
- Static[StaticBackground].Visible := false;
+ Statics[StaticBackground].Visible := false;
if Length(Text[TextVideo].Text) > 0 then
- Static[StaticVideo].Visible := true
+ Statics[StaticVideo].Visible := true
else
- Static[StaticVideo].Visible := false;
+ Statics[StaticVideo].Visible := false;
try
StrToFloat(Text[TextVideoGAP].Text);
if StrToFloat(Text[TextVideoGAP].Text)<> 0 then
- Static[StaticVideoGAP].Visible := true
+ Statics[StaticVideoGAP].Visible := true
else
- Static[StaticVideoGAP].Visible := false;
+ Statics[StaticVideoGAP].Visible := false;
except
- Static[StaticVideoGAP].Visible := false;
+ Statics[StaticVideoGAP].Visible := false;
end;
if LowerCase(Text[TextRelative].Text) = 'yes' then
- Static[StaticRelative].Visible := true
+ Statics[StaticRelative].Visible := true
else
- Static[StaticRelative].Visible := false;
+ Statics[StaticRelative].Visible := false;
try
StrToInt(Text[TextResolution].Text);
if (StrToInt(Text[TextResolution].Text) <> 0) and (StrToInt(Text[TextResolution].Text) >= 1) then
- Static[StaticResolution].Visible := true
+ Statics[StaticResolution].Visible := true
else
- Static[StaticResolution].Visible := false;
+ Statics[StaticResolution].Visible := false;
except
- Static[StaticResolution].Visible := false;
+ Statics[StaticResolution].Visible := false;
end;
try
StrToInt(Text[TextNotesGAP].Text);
- Static[StaticNotesGAP].Visible := true;
+ Statics[StaticNotesGAP].Visible := true;
except
- Static[StaticNotesGAP].Visible := false;
+ Statics[StaticNotesGAP].Visible := false;
end;
// start
try
StrToFloat(Text[TextStart].Text);
if (StrToFloat(Text[TextStart].Text) > 0) then
- Static[StaticStart].Visible := true
+ Statics[StaticStart].Visible := true
else
- Static[StaticStart].Visible := false;
+ Statics[StaticStart].Visible := false;
except
- Static[StaticStart].Visible := false;
+ Statics[StaticStart].Visible := false;
end;
// GAP
try
StrToFloat(Text[TextGAP].Text);
- Static[StaticGAP].Visible := true;
+ Statics[StaticGAP].Visible := true;
except
- Static[StaticGAP].Visible := false;
+ Statics[StaticGAP].Visible := false;
end;
// BPM
try
StrToFloat(Text[TextBPM].Text);
if (StrToFloat(Text[TextBPM].Text) > 0) then
- Static[StaticBPM].Visible := true
+ Statics[StaticBPM].Visible := true
else
- Static[StaticBPM].Visible := false;
+ Statics[StaticBPM].Visible := false;
except
- Static[StaticBPM].Visible := false;
+ Statics[StaticBPM].Visible := false;
end;
end;
diff --git a/src/screens/UScreenMain.pas b/src/screens/UScreenMain.pas
index 8bdfe419..2973fbb9 100644
--- a/src/screens/UScreenMain.pas
+++ b/src/screens/UScreenMain.pas
@@ -259,8 +259,8 @@ end;
procedure TScreenMain.SetAnimationProgress(Progress: real);
begin
- Static[0].Texture.ScaleW := Progress;
- Static[0].Texture.ScaleH := Progress;
+ Statics[0].Texture.ScaleW := Progress;
+ Statics[0].Texture.ScaleH := Progress;
end;
end.
diff --git a/src/screens/UScreenPartyNewRound.pas b/src/screens/UScreenPartyNewRound.pas
index 6a1c8e69..8024108c 100644
--- a/src/screens/UScreenPartyNewRound.pas
+++ b/src/screens/UScreenPartyNewRound.pas
@@ -215,7 +215,7 @@ begin
begin
if (I <= High(Party.Rounds)) then
begin
- Static[StaticRound[I]].Visible := True;
+ Statics[StaticRound[I]].Visible := True;
Text[TextRound[I]].Visible := True;
Text[TextWinner[I]].Visible := True;
@@ -225,7 +225,7 @@ begin
end
else
begin
- Static[StaticRound[I]].Visible := False;
+ Statics[StaticRound[I]].Visible := False;
Text[TextRound[I]].Visible := False;
Text[TextWinner[I]].Visible := False;
end;
@@ -242,16 +242,16 @@ begin
Text[TextScoreTeam1].Visible := true;
Text[TextNameTeam1].Visible := true;
Text[TextTeam1Players].Visible := true;
- Static[StaticTeam1].Visible := true;
- Static[StaticNextPlayer1].Visible := true;
+ Statics[StaticTeam1].Visible := true;
+ Statics[StaticNextPlayer1].Visible := true;
end
else
begin
Text[TextScoreTeam1].Visible := false;
Text[TextNameTeam1].Visible := false;
Text[TextTeam1Players].Visible := false;
- Static[StaticTeam1].Visible := false;
- Static[StaticNextPlayer1].Visible := false;
+ Statics[StaticTeam1].Visible := false;
+ Statics[StaticNextPlayer1].Visible := false;
end;
if (Length(Party.Teams) >= 2) then
@@ -263,16 +263,16 @@ begin
Text[TextScoreTeam2].Visible := true;
Text[TextNameTeam2].Visible := true;
Text[TextTeam2Players].Visible := true;
- Static[StaticTeam2].Visible := true;
- Static[StaticNextPlayer2].Visible := true;
+ Statics[StaticTeam2].Visible := true;
+ Statics[StaticNextPlayer2].Visible := true;
end
else
begin
Text[TextScoreTeam2].Visible := false;
Text[TextNameTeam2].Visible := false;
Text[TextTeam2Players].Visible := false;
- Static[StaticTeam2].Visible := false;
- Static[StaticNextPlayer2].Visible := false;
+ Statics[StaticTeam2].Visible := false;
+ Statics[StaticNextPlayer2].Visible := false;
end;
if (Length(Party.Teams) >= 3) then
@@ -284,16 +284,16 @@ begin
Text[TextScoreTeam3].Visible := true;
Text[TextNameTeam3].Visible := true;
Text[TextTeam3Players].Visible := true;
- Static[StaticTeam3].Visible := true;
- Static[StaticNextPlayer3].Visible := true;
+ Statics[StaticTeam3].Visible := true;
+ Statics[StaticNextPlayer3].Visible := true;
end
else
begin
Text[TextScoreTeam3].Visible := false;
Text[TextNameTeam3].Visible := false;
Text[TextTeam3Players].Visible := false;
- Static[StaticTeam3].Visible := false;
- Static[StaticNextPlayer3].Visible := false;
+ Statics[StaticTeam3].Visible := false;
+ Statics[StaticNextPlayer3].Visible := false;
end;
//nextRound Texts
diff --git a/src/screens/UScreenPartyScore.pas b/src/screens/UScreenPartyScore.pas
index 3bfca4a8..32ca5db2 100644
--- a/src/screens/UScreenPartyScore.pas
+++ b/src/screens/UScreenPartyScore.pas
@@ -208,15 +208,15 @@ begin
Ranking := Party.Rounds[Party.CurrentRound].Ranking;
- {//Set Static Length
- Static[StaticTeam1].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[0].Percentage / 100;
- Static[StaticTeam2].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
- Static[StaticTeam3].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;
+ {//Set Statics Length
+ Statics[StaticTeam1].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[0].Percentage / 100;
+ Statics[StaticTeam2].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
+ Statics[StaticTeam3].Texture.ScaleW := ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;
- //fix: prevents static from drawn out of bounds.
- if Static[StaticTeam1].Texture.ScaleW > 99 then Static[StaticTeam1].Texture.ScaleW := 99;
- if Static[StaticTeam2].Texture.ScaleW > 99 then Static[StaticTeam2].Texture.ScaleW := 99;
- if Static[StaticTeam3].Texture.ScaleW > 99 then Static[StaticTeam3].Texture.ScaleW := 99; }
+ //fix: prevents statics from drawn out of bounds.
+ if Statics[StaticTeam1].Texture.ScaleW > 99 then Statics[StaticTeam1].Texture.ScaleW := 99;
+ if Statics[StaticTeam2].Texture.ScaleW > 99 then Statics[StaticTeam2].Texture.ScaleW := 99;
+ if Statics[StaticTeam3].Texture.ScaleW > 99 then Statics[StaticTeam3].Texture.ScaleW := 99; }
//Set Winnertext
Text[TextWinner].Text := Format(Language.Translate('PARTY_SCORE_WINS'), [Party.GetWinnerString(Party.CurrentRound)]);
@@ -231,26 +231,26 @@ begin
begin
if (Length(Ranking) >= 1) and (Ranking[0].Rank >= 1) and (Ranking[0].Rank <= Length(DecoTex)) then
begin
- Static[StaticTeam1Deco].Texture.TexNum := DecoTex[Ranking[0].Rank-1];
- Static[StaticTeam1Deco].Texture.ColR := DecoColor[Ranking[0].Rank-1].R;
- Static[StaticTeam1Deco].Texture.ColG := DecoColor[Ranking[0].Rank-1].G;
- Static[StaticTeam1Deco].Texture.ColB := DecoColor[Ranking[0].Rank-1].B;
+ Statics[StaticTeam1Deco].Texture.TexNum := DecoTex[Ranking[0].Rank-1];
+ Statics[StaticTeam1Deco].Texture.ColR := DecoColor[Ranking[0].Rank-1].R;
+ Statics[StaticTeam1Deco].Texture.ColG := DecoColor[Ranking[0].Rank-1].G;
+ Statics[StaticTeam1Deco].Texture.ColB := DecoColor[Ranking[0].Rank-1].B;
end;
end;
Text[TextScoreTeam1].Visible := true;
Text[TextNameTeam1].Visible := true;
- Static[StaticTeam1].Visible := true;
- Static[StaticTeam1BG].Visible := true;
- Static[StaticTeam1Deco].Visible := true;
+ Statics[StaticTeam1].Visible := true;
+ Statics[StaticTeam1BG].Visible := true;
+ Statics[StaticTeam1Deco].Visible := true;
end
else
begin
Text[TextScoreTeam1].Visible := false;
Text[TextNameTeam1].Visible := false;
- Static[StaticTeam1].Visible := false;
- Static[StaticTeam1BG].Visible := false;
- Static[StaticTeam1Deco].Visible := false;
+ Statics[StaticTeam1].Visible := false;
+ Statics[StaticTeam1BG].Visible := false;
+ Statics[StaticTeam1Deco].Visible := false;
end;
if (Length(Party.Teams) >= 2) then
@@ -263,26 +263,26 @@ begin
begin
if (Length(Ranking) >= 2) and (Ranking[1].Rank >= 1) and (Ranking[1].Rank <= Length(DecoTex)) then
begin
- Static[StaticTeam2Deco].Texture.TexNum := DecoTex[Ranking[1].Rank-1];
- Static[StaticTeam2Deco].Texture.ColR := DecoColor[Ranking[1].Rank-1].R;
- Static[StaticTeam2Deco].Texture.ColG := DecoColor[Ranking[1].Rank-1].G;
- Static[StaticTeam2Deco].Texture.ColB := DecoColor[Ranking[1].Rank-1].B;
+ Statics[StaticTeam2Deco].Texture.TexNum := DecoTex[Ranking[1].Rank-1];
+ Statics[StaticTeam2Deco].Texture.ColR := DecoColor[Ranking[1].Rank-1].R;
+ Statics[StaticTeam2Deco].Texture.ColG := DecoColor[Ranking[1].Rank-1].G;
+ Statics[StaticTeam2Deco].Texture.ColB := DecoColor[Ranking[1].Rank-1].B;
end;
end;
Text[TextScoreTeam2].Visible := true;
Text[TextNameTeam2].Visible := true;
- Static[StaticTeam2].Visible := true;
- Static[StaticTeam2BG].Visible := true;
- Static[StaticTeam2Deco].Visible := true;
+ Statics[StaticTeam2].Visible := true;
+ Statics[StaticTeam2BG].Visible := true;
+ Statics[StaticTeam2Deco].Visible := true;
end
else
begin
Text[TextScoreTeam2].Visible := false;
Text[TextNameTeam2].Visible := false;
- Static[StaticTeam2].Visible := false;
- Static[StaticTeam2BG].Visible := false;
- Static[StaticTeam2Deco].Visible := false;
+ Statics[StaticTeam2].Visible := false;
+ Statics[StaticTeam2BG].Visible := false;
+ Statics[StaticTeam2Deco].Visible := false;
end;
if (Length(Party.Teams) >= 3) then
@@ -295,37 +295,37 @@ begin
begin
if (Length(Ranking) >= 3) and (Ranking[2].Rank >= 1) and (Ranking[2].Rank <= Length(DecoTex)) then
begin
- Static[StaticTeam3Deco].Texture.TexNum := DecoTex[Ranking[2].Rank-1];
- Static[StaticTeam3Deco].Texture.ColR := DecoColor[Ranking[2].Rank-1].R;
- Static[StaticTeam3Deco].Texture.ColG := DecoColor[Ranking[2].Rank-1].G;
- Static[StaticTeam3Deco].Texture.ColB := DecoColor[Ranking[2].Rank-1].B;
+ Statics[StaticTeam3Deco].Texture.TexNum := DecoTex[Ranking[2].Rank-1];
+ Statics[StaticTeam3Deco].Texture.ColR := DecoColor[Ranking[2].Rank-1].R;
+ Statics[StaticTeam3Deco].Texture.ColG := DecoColor[Ranking[2].Rank-1].G;
+ Statics[StaticTeam3Deco].Texture.ColB := DecoColor[Ranking[2].Rank-1].B;
end;
end;
Text[TextScoreTeam3].Visible := true;
Text[TextNameTeam3].Visible := true;
- Static[StaticTeam3].Visible := true;
- Static[StaticTeam3BG].Visible := true;
- Static[StaticTeam3Deco].Visible := true;
+ Statics[StaticTeam3].Visible := true;
+ Statics[StaticTeam3BG].Visible := true;
+ Statics[StaticTeam3Deco].Visible := true;
end
else
begin
Text[TextScoreTeam3].Visible := false;
Text[TextNameTeam3].Visible := false;
- Static[StaticTeam3].Visible := false;
- Static[StaticTeam3BG].Visible := false;
- Static[StaticTeam3Deco].Visible := false;
+ Statics[StaticTeam3].Visible := false;
+ Statics[StaticTeam3BG].Visible := false;
+ Statics[StaticTeam3Deco].Visible := false;
end;
end;
procedure TScreenPartyScore.SetAnimationProgress(Progress: real);
begin
{if (ScreenSingModi.PlayerInfo.NumPlayers >= 1) then
- Static[StaticTeam1].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[0].Percentage / 100;
+ Statics[StaticTeam1].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[0].Percentage / 100;
if (ScreenSingModi.PlayerInfo.NumPlayers >= 2) then
- Static[StaticTeam2].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
+ Statics[StaticTeam2].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[1].Percentage / 100;
if (ScreenSingModi.PlayerInfo.NumPlayers >= 3) then
- Static[StaticTeam3].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;}
+ Statics[StaticTeam3].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[2].Percentage / 100;}
end;
end.
diff --git a/src/screens/UScreenPartyWin.pas b/src/screens/UScreenPartyWin.pas
index d9fd26d4..ed8d017c 100644
--- a/src/screens/UScreenPartyWin.pas
+++ b/src/screens/UScreenPartyWin.pas
@@ -159,9 +159,9 @@ begin
Text[TextScoreTeam1].Visible := true;
Text[TextNameTeam1].Visible := true;
- Static[StaticTeam1].Visible := true;
- Static[StaticTeam1BG].Visible := true;
- Static[StaticTeam1Deco].Visible := true;
+ Statics[StaticTeam1].Visible := true;
+ Statics[StaticTeam1BG].Visible := true;
+ Statics[StaticTeam1Deco].Visible := true;
//Set Static Color to Team Color
if (Theme.PartyWin.StaticTeam1BG.Color = 'TeamColor') then
@@ -169,9 +169,9 @@ begin
I := GetTeamColor(Ranking[0].Team);
if (I <> -1) then
begin
- Static[StaticTeam1BG].Texture.ColR := Color[I].RGB.R;
- Static[StaticTeam1BG].Texture.ColG := Color[I].RGB.G;
- Static[StaticTeam1BG].Texture.ColB := Color[I].RGB.B;
+ Statics[StaticTeam1BG].Texture.ColR := Color[I].RGB.R;
+ Statics[StaticTeam1BG].Texture.ColG := Color[I].RGB.G;
+ Statics[StaticTeam1BG].Texture.ColB := Color[I].RGB.B;
end;
end;
@@ -180,9 +180,9 @@ begin
I := GetTeamColor(Ranking[0].Team);
if (I <> -1) then
begin
- Static[StaticTeam1].Texture.ColR := Color[I].RGB.R;
- Static[StaticTeam1].Texture.ColG := Color[I].RGB.G;
- Static[StaticTeam1].Texture.ColB := Color[I].RGB.B;
+ Statics[StaticTeam1].Texture.ColR := Color[I].RGB.R;
+ Statics[StaticTeam1].Texture.ColG := Color[I].RGB.G;
+ Statics[StaticTeam1].Texture.ColB := Color[I].RGB.B;
end;
end;
end
@@ -190,9 +190,9 @@ begin
begin
Text[TextScoreTeam1].Visible := false;
Text[TextNameTeam1].Visible := false;
- Static[StaticTeam1].Visible := false;
- Static[StaticTeam1BG].Visible := false;
- Static[StaticTeam1Deco].Visible := false;
+ Statics[StaticTeam1].Visible := false;
+ Statics[StaticTeam1BG].Visible := false;
+ Statics[StaticTeam1Deco].Visible := false;
end;
if (Length(Party.Teams) >= 2) then
@@ -202,9 +202,9 @@ begin
Text[TextScoreTeam2].Visible := true;
Text[TextNameTeam2].Visible := true;
- Static[StaticTeam2].Visible := true;
- Static[StaticTeam2BG].Visible := true;
- Static[StaticTeam2Deco].Visible := true;
+ Statics[StaticTeam2].Visible := true;
+ Statics[StaticTeam2BG].Visible := true;
+ Statics[StaticTeam2Deco].Visible := true;
//Set Static Color to Team Color
if (Theme.PartyWin.StaticTeam2BG.Color = 'TeamColor') then
@@ -212,9 +212,9 @@ begin
I := GetTeamColor(Ranking[1].Team);
if (I <> -1) then
begin
- Static[StaticTeam2BG].Texture.ColR := Color[I].RGB.R;
- Static[StaticTeam2BG].Texture.ColG := Color[I].RGB.G;
- Static[StaticTeam2BG].Texture.ColB := Color[I].RGB.B;
+ Statics[StaticTeam2BG].Texture.ColR := Color[I].RGB.R;
+ Statics[StaticTeam2BG].Texture.ColG := Color[I].RGB.G;
+ Statics[StaticTeam2BG].Texture.ColB := Color[I].RGB.B;
end;
end;
@@ -223,9 +223,9 @@ begin
I := GetTeamColor(Ranking[1].Team);
if (I <> -1) then
begin
- Static[StaticTeam2].Texture.ColR := Color[I].RGB.R;
- Static[StaticTeam2].Texture.ColG := Color[I].RGB.G;
- Static[StaticTeam2].Texture.ColB := Color[I].RGB.B;
+ Statics[StaticTeam2].Texture.ColR := Color[I].RGB.R;
+ Statics[StaticTeam2].Texture.ColG := Color[I].RGB.G;
+ Statics[StaticTeam2].Texture.ColB := Color[I].RGB.B;
end;
end;
end
@@ -233,9 +233,9 @@ begin
begin
Text[TextScoreTeam2].Visible := false;
Text[TextNameTeam2].Visible := false;
- Static[StaticTeam2].Visible := false;
- Static[StaticTeam2BG].Visible := false;
- Static[StaticTeam2Deco].Visible := false;
+ Statics[StaticTeam2].Visible := false;
+ Statics[StaticTeam2BG].Visible := false;
+ Statics[StaticTeam2Deco].Visible := false;
end;
if (Length(Party.Teams) >= 3) then
@@ -245,9 +245,9 @@ begin
Text[TextScoreTeam3].Visible := true;
Text[TextNameTeam3].Visible := true;
- Static[StaticTeam3].Visible := true;
- Static[StaticTeam3BG].Visible := true;
- Static[StaticTeam3Deco].Visible := true;
+ Statics[StaticTeam3].Visible := true;
+ Statics[StaticTeam3BG].Visible := true;
+ Statics[StaticTeam3Deco].Visible := true;
//Set Static Color to Team Color
if (Theme.PartyWin.StaticTeam3BG.Color = 'TeamColor') then
@@ -255,9 +255,9 @@ begin
I := GetTeamColor(Ranking[2].Team);
if (I <> -1) then
begin
- Static[StaticTeam3BG].Texture.ColR := Color[I].RGB.R;
- Static[StaticTeam3BG].Texture.ColG := Color[I].RGB.G;
- Static[StaticTeam3BG].Texture.ColB := Color[I].RGB.B;
+ Statics[StaticTeam3BG].Texture.ColR := Color[I].RGB.R;
+ Statics[StaticTeam3BG].Texture.ColG := Color[I].RGB.G;
+ Statics[StaticTeam3BG].Texture.ColB := Color[I].RGB.B;
end;
end;
@@ -266,9 +266,9 @@ begin
I := GetTeamColor(Ranking[2].Team);
if (I <> -1) then
begin
- Static[StaticTeam3].Texture.ColR := Color[I].RGB.R;
- Static[StaticTeam3].Texture.ColG := Color[I].RGB.G;
- Static[StaticTeam3].Texture.ColB := Color[I].RGB.B;
+ Statics[StaticTeam3].Texture.ColR := Color[I].RGB.R;
+ Statics[StaticTeam3].Texture.ColG := Color[I].RGB.G;
+ Statics[StaticTeam3].Texture.ColB := Color[I].RGB.B;
end;
end;
end
@@ -276,20 +276,20 @@ begin
begin
Text[TextScoreTeam3].Visible := false;
Text[TextNameTeam3].Visible := false;
- Static[StaticTeam3].Visible := false;
- Static[StaticTeam3BG].Visible := false;
- Static[StaticTeam3Deco].Visible := false;
+ Statics[StaticTeam3].Visible := false;
+ Statics[StaticTeam3BG].Visible := false;
+ Statics[StaticTeam3Deco].Visible := false;
end;
end;
procedure TScreenPartyWin.SetAnimationProgress(Progress: real);
begin
{if (ScreenSingModi.PlayerInfo.NumPlayers >= 1) then
- Static[StaticTeam1].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[0].Score / maxScore;
+ Statics[StaticTeam1].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[0].Score / maxScore;
if (ScreenSingModi.PlayerInfo.NumPlayers >= 2) then
- Static[StaticTeam2].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[1].Score / maxScore;
+ Statics[StaticTeam2].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[1].Score / maxScore;
if (ScreenSingModi.PlayerInfo.NumPlayers >= 3) then
- Static[StaticTeam3].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[2].Score / maxScore;}
+ Statics[StaticTeam3].Texture.ScaleW := Progress * ScreenSingModi.PlayerInfo.Playerinfo[2].Score / maxScore;}
end;
end.
diff --git a/src/screens/UScreenScore.pas b/src/screens/UScreenScore.pas
index 41954850..de7675bf 100644
--- a/src/screens/UScreenScore.pas
+++ b/src/screens/UScreenScore.pas
@@ -296,7 +296,7 @@ begin
for I := 0 to High(PlayerStatic[P]) do
begin
// copy current statics texture to texture for screen 1
- PlayerStaticTextures[P, I, 1].Tex := Static[PlayerStatic[P, I]].Texture;
+ PlayerStaticTextures[P, I, 1].Tex := Statics[PlayerStatic[P, I]].Texture;
// fallback to first screen texture for 2nd screen
PlayerStaticTextures[P, I, 2].Tex := PlayerStaticTextures[P, I, 1].Tex;
@@ -318,10 +318,10 @@ begin
with Theme.Score.PlayerStatic[P, I] do
PlayerStaticTextures[P, I, 2].Tex := Texture.GetTexture(Skin.GetTextureFileName(Tex), Typ, RGBFloatToInt(R, G, B));
- PlayerStaticTextures[P, I, 2].Tex.X := Static[PlayerStatic[P, I]].Texture.X;
- PlayerStaticTextures[P, I, 2].Tex.Y := Static[PlayerStatic[P, I]].Texture.Y;
- PlayerStaticTextures[P, I, 2].Tex.W := Static[PlayerStatic[P, I]].Texture.W;
- PlayerStaticTextures[P, I, 2].Tex.H := Static[PlayerStatic[P, I]].Texture.H;
+ PlayerStaticTextures[P, I, 2].Tex.X := Statics[PlayerStatic[P, I]].Texture.X;
+ PlayerStaticTextures[P, I, 2].Tex.Y := Statics[PlayerStatic[P, I]].Texture.Y;
+ PlayerStaticTextures[P, I, 2].Tex.W := Statics[PlayerStatic[P, I]].Texture.W;
+ PlayerStaticTextures[P, I, 2].Tex.H := Statics[PlayerStatic[P, I]].Texture.H;
end;
end;
end;
@@ -364,7 +364,7 @@ begin
end;
end;
// copy current statics texture to texture for screen 1
- PlayerBoxTextures[P, I, 1].Tex := Static[StaticNum].Texture;
+ PlayerBoxTextures[P, I, 1].Tex := Statics[StaticNum].Texture;
// fallback to first screen texture for 2nd screen
PlayerBoxTextures[P, I, 2].Tex := PlayerBoxTextures[P, I, 1].Tex;
@@ -386,10 +386,10 @@ begin
with ThemeStatic do
PlayerBoxTextures[P, I, 2].Tex := Texture.GetTexture(Skin.GetTextureFileName(Tex), Typ, RGBFloatToInt(R, G, B));
- PlayerBoxTextures[P, I, 2].Tex.X := Static[StaticNum].Texture.X;
- PlayerBoxTextures[P, I, 2].Tex.Y := Static[StaticNum].Texture.Y;
- PlayerBoxTextures[P, I, 2].Tex.W := Static[StaticNum].Texture.W;
- PlayerBoxTextures[P, I, 2].Tex.H := Static[StaticNum].Texture.H;
+ PlayerBoxTextures[P, I, 2].Tex.X := Statics[StaticNum].Texture.X;
+ PlayerBoxTextures[P, I, 2].Tex.Y := Statics[StaticNum].Texture.Y;
+ PlayerBoxTextures[P, I, 2].Tex.W := Statics[StaticNum].Texture.W;
+ PlayerBoxTextures[P, I, 2].Tex.H := Statics[StaticNum].Texture.H;
end;
end;
end;
@@ -412,7 +412,7 @@ begin
begin
// we just set the texture specific stuff
// so we don't overwrite e.g. width and height
- with Static[StaticPlayerIdBox[PlayerPositionMap[I].Position]].Texture do
+ with Statics[StaticPlayerIdBox[PlayerPositionMap[I].Position]].Texture do
begin
TexNum := aPlayerScoreScreenTextures[I+1].Player_Id_Box.TexNum;
TexW := aPlayerScoreScreenTextures[I+1].Player_Id_Box.TexW;
@@ -427,15 +427,15 @@ begin
for P := Low(PlayerStatic) to High(PlayerStatic) do
for I := 0 to High(PlayerStatic[P]) do
begin
- Static[PlayerStatic[P, I]].Texture := PlayerStaticTextures[P, I, Screen].Tex;
+ Statics[PlayerStatic[P, I]].Texture := PlayerStaticTextures[P, I, Screen].Tex;
end;
{ box statics }
for P := Low(PlayerStatic) to High(PlayerStatic) do
begin
- Static[StaticBoxLightest[P]].Texture := PlayerBoxTextures[P, 0, Screen].Tex;
- Static[StaticBoxLight[P]].Texture := PlayerBoxTextures[P, 1, Screen].Tex;
- Static[StaticBoxDark[P]].Texture := PlayerBoxTextures[P, 2, Screen].Tex;
+ Statics[StaticBoxLightest[P]].Texture := PlayerBoxTextures[P, 0, Screen].Tex;
+ Statics[StaticBoxLight[P]].Texture := PlayerBoxTextures[P, 1, Screen].Tex;
+ Statics[StaticBoxDark[P]].Texture := PlayerBoxTextures[P, 2, Screen].Tex;
end;
end;
end;
@@ -685,9 +685,9 @@ begin
Text[TextGoldenNotesScore[P]].Alpha := 0;
Text[TextTotal[P]].Alpha := 0;
Text[TextTotalScore[P]].Alpha := 0;
- Static[StaticBoxLightest[P]].Texture.Alpha := 0;
- Static[StaticBoxLight[P]].Texture.Alpha := 0;
- Static[StaticBoxDark[P]].Texture.Alpha := 0;
+ Statics[StaticBoxLightest[P]].Texture.Alpha := 0;
+ Statics[StaticBoxLight[P]].Texture.Alpha := 0;
+ Statics[StaticBoxDark[P]].Texture.Alpha := 0;
Text[TextNotes[P]].Visible := V[P];
Text[TextNotesScore[P]].Visible := V[P];
@@ -699,22 +699,22 @@ begin
Text[TextTotalScore[P]].Visible := V[P];
for I := 0 to high(PlayerStatic[P]) do
- Static[PlayerStatic[P, I]].Visible := V[P];
+ Statics[PlayerStatic[P, I]].Visible := V[P];
for I := 0 to high(PlayerTexts[P]) do
Text[PlayerTexts[P, I]].Visible := V[P];
- Static[StaticBoxLightest[P]].Visible := V[P];
- Static[StaticBoxLight[P]].Visible := V[P];
- Static[StaticBoxDark[P]].Visible := V[P];
+ Statics[StaticBoxLightest[P]].Visible := V[P];
+ Statics[StaticBoxLight[P]].Visible := V[P];
+ Statics[StaticBoxDark[P]].Visible := V[P];
- Static[StaticPlayerIdBox[P]].Visible := V[P];
+ Statics[StaticPlayerIdBox[P]].Visible := V[P];
// we draw that on our own
- Static[StaticBackLevel[P]].Visible := false;
- Static[StaticBackLevelRound[P]].Visible := false;
- Static[StaticLevel[P]].Visible := false;
- Static[StaticLevelRound[P]].Visible := false;
+ Statics[StaticBackLevel[P]].Visible := false;
+ Statics[StaticBackLevelRound[P]].Visible := false;
+ Statics[StaticLevel[P]].Visible := false;
+ Statics[StaticLevelRound[P]].Visible := false;
end;
BarScore_EaseOut_Step := 1;
@@ -775,8 +775,8 @@ begin
(*
//todo: i need a clever method to draw statics with their z value
- for I := 0 to Length(Static) - 1 do
- Static[I].Draw;
+ for I := 0 to Length(Statics) - 1 do
+ Statics[I].Draw;
for I := 0 to Length(Text) - 1 do
Text[I].Draw;
*)
@@ -799,21 +799,21 @@ begin
Text[TextGoldenNotesScore[ThemeIndex]].Text := IntToStr(TextGolden_ActualValue[PlayerNumber]);
Text[TextGoldenNotesScore[ThemeIndex]].Alpha := (BarGolden_EaseOut_Step / 100);
- Static[StaticBoxLightest[ThemeIndex]].Texture.Alpha := (BarGolden_EaseOut_Step / 100);
+ Statics[StaticBoxLightest[ThemeIndex]].Texture.Alpha := (BarGolden_EaseOut_Step / 100);
Text[TextGoldenNotes[ThemeIndex]].Alpha := (BarGolden_EaseOut_Step / 100);
// line bonus
Text[TextLineBonusScore[ThemeIndex]].Text := IntToStr(TextPhrase_ActualValue[PlayerNumber]);
Text[TextLineBonusScore[ThemeIndex]].Alpha := (BarPhrase_EaseOut_Step / 100);
- Static[StaticBoxLight[ThemeIndex]].Texture.Alpha := (BarPhrase_EaseOut_Step / 100);
+ Statics[StaticBoxLight[ThemeIndex]].Texture.Alpha := (BarPhrase_EaseOut_Step / 100);
Text[TextLineBonus[ThemeIndex]].Alpha := (BarPhrase_EaseOut_Step / 100);
// plain score
Text[TextNotesScore[ThemeIndex]].Text := IntToStr(TextScore_ActualValue[PlayerNumber]);
Text[TextNotes[ThemeIndex]].Alpha := (BarScore_EaseOut_Step / 100);
- Static[StaticBoxDark[ThemeIndex]].Texture.Alpha := (BarScore_EaseOut_Step / 100);
+ Statics[StaticBoxDark[ThemeIndex]].Texture.Alpha := (BarScore_EaseOut_Step / 100);
Text[TextNotesScore[ThemeIndex]].Alpha := (BarScore_EaseOut_Step / 100);
// total score
@@ -1078,8 +1078,8 @@ begin
glEnable(GL_BLEND);
glBegin(GL_QUADS);
- glTexCoord2f(0, 0); glVertex3f(BarStartPosX, (BarStartPosY - Static[StaticLevelRound[ThemeIndex]].Texture.h) - NewHeight, ZBars);
- glTexCoord2f(1, 0); glVertex3f(BarStartPosX + Width, (BarStartPosY - Static[StaticLevelRound[ThemeIndex]].Texture.h) - NewHeight, ZBars);
+ glTexCoord2f(0, 0); glVertex3f(BarStartPosX, (BarStartPosY - Statics[StaticLevelRound[ThemeIndex]].Texture.h) - NewHeight, ZBars);
+ glTexCoord2f(1, 0); glVertex3f(BarStartPosX + Width, (BarStartPosY - Statics[StaticLevelRound[ThemeIndex]].Texture.h) - NewHeight, ZBars);
glTexCoord2f(1, 1); glVertex3f(BarStartPosX + Width, BarStartPosY - NewHeight, ZBars);
glTexCoord2f(0, 1); glVertex3f(BarStartPosX, BarStartPosY - NewHeight, ZBars);
glEnd;
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index 18496517..74c09b4f 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -322,7 +322,7 @@ begin
StaticPausePopup := AddStatic(Theme.Sing.PausePopUp);
// <note> pausepopup is not visibile at the beginning </note>
- Static[StaticPausePopup].Visible := false;
+ Statics[StaticPausePopup].Visible := false;
Lyrics := TLyricEngine.Create(
Theme.LyricBar.UpperX, Theme.LyricBar.UpperY, Theme.LyricBar.UpperW, Theme.LyricBar.UpperH,
@@ -428,24 +428,24 @@ begin
end;
// this one is shown in 1P mode
- Static[StaticP1].Visible := V1;
+ Statics[StaticP1].Visible := V1;
Text[TextP1].Visible := V1;
// this one is shown in 2/4P mode
- Static[StaticP1TwoP].Visible := V1TwoP;
+ Statics[StaticP1TwoP].Visible := V1TwoP;
Text[TextP1TwoP].Visible := V1TwoP;
- Static[StaticP2R].Visible := V2R;
+ Statics[StaticP2R].Visible := V2R;
Text[TextP2R].Visible := V2R;
// this one is shown in 3/6P mode
- Static[StaticP1ThreeP].Visible := V1ThreeP;
+ Statics[StaticP1ThreeP].Visible := V1ThreeP;
Text[TextP1ThreeP].Visible := V1ThreeP;
- Static[StaticP2M].Visible := V2M;
+ Statics[StaticP2M].Visible := V2M;
Text[TextP2M].Visible := V2M;
- Static[StaticP3R].Visible := V3R;
+ Statics[StaticP3R].Visible := V3R;
Text[TextP3R].Visible := V3R;
// FIXME: sets path and filename to ''
@@ -763,23 +763,23 @@ begin
// will move the statics and texts to the correct screen here.
// FIXME: clean up this weird stuff. Commenting this stuff out, nothing
// was missing on screen w/ 6 players - so do we even need this stuff?
- {Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10 * ScreenX;
+ {Statics[StaticP1].Texture.X := Statics[StaticP1].Texture.X + 10 * ScreenX;
Text[TextP1].X := Text[TextP1].X + 10 * ScreenX; }
- {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X + 10*ScreenX;
+ {Statics[StaticP1ScoreBG].Texture.X := Statics[StaticP1ScoreBG].Texture.X + 10*ScreenX;
Text[TextP1Score].X := Text[TextP1Score].X + 10*ScreenX;}
- {Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10 * ScreenX;
+ {Statics[StaticP2R].Texture.X := Statics[StaticP2R].Texture.X + 10 * ScreenX;
Text[TextP2R].X := Text[TextP2R].X + 10 * ScreenX; }
- {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X + 10*ScreenX;
+ {Statics[StaticP2RScoreBG].Texture.X := Statics[StaticP2RScoreBG].Texture.X + 10*ScreenX;
Text[TextP2RScore].X := Text[TextP2RScore].X + 10*ScreenX;}
// end of weird stuff
{
- Static[1].Texture.X := Static[1].Texture.X + 10 * ScreenX; }
+ Statics[1].Texture.X := Statics[1].Texture.X + 10 * ScreenX; }
{ for T := 0 to 1 do
Text[T].X := Text[T].X + 10 * ScreenX; }
@@ -870,15 +870,15 @@ begin
// will move the statics and texts to the correct screen here.
// FIXME: clean up this weird stuff
- {Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10 * ScreenX;
+ {Statics[StaticP1].Texture.X := Statics[StaticP1].Texture.X - 10 * ScreenX;
Text[TextP1].X := Text[TextP1].X - 10 * ScreenX;
- Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X - 10 * ScreenX;
+ Statics[StaticP2R].Texture.X := Statics[StaticP2R].Texture.X - 10 * ScreenX;
Text[TextP2R].X := Text[TextP2R].X - 10 * ScreenX;
// end of weird
- Static[1].Texture.X := Static[1].Texture.X - 10 * ScreenX;
+ Statics[1].Texture.X := Statics[1].Texture.X - 10 * ScreenX;
for T := 0 to 1 do
Text[T].X := Text[T].X - 10 * ScreenX; }
@@ -888,9 +888,9 @@ begin
// maybe someone could find a better solution
if Paused then
begin
- Static[StaticPausePopup].Visible := true;
- Static[StaticPausePopup].Draw;
- Static[StaticPausePopup].Visible := false;
+ Statics[StaticPausePopup].Visible := true;
+ Statics[StaticPausePopup].Draw;
+ Statics[StaticPausePopup].Visible := false;
end;
Result := true;
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 65f3c157..a3c5f36a 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -224,7 +224,7 @@ procedure TScreenSong.ShowCatTLCustom(Caption: UTF8String);// Show Custom Text i
begin
Text[TextCat].Text := Caption;
Text[TextCat].Visible := true;
- Static[StaticCat].Visible := false;
+ Statics[StaticCat].Visible := false;
end;
//Show Cat in Top Left Mod
@@ -232,18 +232,18 @@ procedure TScreenSong.ShowCatTL(Cat: integer);
begin
//Change
Text[TextCat].Text := CatSongs.Song[Cat].Artist;
- //Static[StaticCat].Texture := Texture.GetTexture(Button[Cat].Texture.Name, TEXTURE_TYPE_PLAIN, true);
+ //Statics[StaticCat].Texture := Texture.GetTexture(Button[Cat].Texture.Name, TEXTURE_TYPE_PLAIN, true);
//Show
Text[TextCat].Visible := true;
- Static[StaticCat].Visible := true;
+ Statics[StaticCat].Visible := true;
end;
procedure TScreenSong.HideCatTL;
begin
//Hide
//Text[TextCat].Visible := false;
- Static[StaticCat].Visible := false;
+ Statics[StaticCat].Visible := false;
//New -> Show Text specified in Theme
Text[TextCat].Visible := true;
Text[TextCat].Text := Theme.Song.TextCat.Text;
@@ -991,7 +991,7 @@ begin
end;
// Set visibility of video icon
- Static[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
+ Statics[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
// Set texts
Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
@@ -1176,7 +1176,7 @@ begin
end;
if Length(Button) > 0 then
- Static[1].Texture.Y := Button[Interaction].Y - 5; // selection texture
+ Statics[1].Texture.Y := Button[Interaction].Y - 5; // selection texture
end;
procedure TScreenSong.SetScroll2;
@@ -1638,8 +1638,8 @@ begin
Button[I].Draw;
// Statics
- for I := 0 to Length(Static) - 1 do
- Static[I].Draw;
+ for I := 0 to Length(Statics) - 1 do
+ Statics[I].Draw;
// and texts
for I := 0 to Length(Text) - 1 do
@@ -1863,74 +1863,74 @@ begin
begin
if (Length(Party.Teams) >= 1) then
begin
- Static[StaticTeam1Joker1].Visible := (Party.Teams[0].JokersLeft >= 1);
- Static[StaticTeam1Joker2].Visible := (Party.Teams[0].JokersLeft >= 2);
- Static[StaticTeam1Joker3].Visible := (Party.Teams[0].JokersLeft >= 3);
- Static[StaticTeam1Joker4].Visible := (Party.Teams[0].JokersLeft >= 4);
- Static[StaticTeam1Joker5].Visible := (Party.Teams[0].JokersLeft >= 5);
+ Statics[StaticTeam1Joker1].Visible := (Party.Teams[0].JokersLeft >= 1);
+ Statics[StaticTeam1Joker2].Visible := (Party.Teams[0].JokersLeft >= 2);
+ Statics[StaticTeam1Joker3].Visible := (Party.Teams[0].JokersLeft >= 3);
+ Statics[StaticTeam1Joker4].Visible := (Party.Teams[0].JokersLeft >= 4);
+ Statics[StaticTeam1Joker5].Visible := (Party.Teams[0].JokersLeft >= 5);
end
else
begin
- Static[StaticTeam1Joker1].Visible := false;
- Static[StaticTeam1Joker2].Visible := false;
- Static[StaticTeam1Joker3].Visible := false;
- Static[StaticTeam1Joker4].Visible := false;
- Static[StaticTeam1Joker5].Visible := false;
+ Statics[StaticTeam1Joker1].Visible := false;
+ Statics[StaticTeam1Joker2].Visible := false;
+ Statics[StaticTeam1Joker3].Visible := false;
+ Statics[StaticTeam1Joker4].Visible := false;
+ Statics[StaticTeam1Joker5].Visible := false;
end;
if (Length(Party.Teams) >= 2) then
begin
- Static[StaticTeam2Joker1].Visible := (Party.Teams[1].JokersLeft >= 1);
- Static[StaticTeam2Joker2].Visible := (Party.Teams[1].JokersLeft >= 2);
- Static[StaticTeam2Joker3].Visible := (Party.Teams[1].JokersLeft >= 3);
- Static[StaticTeam2Joker4].Visible := (Party.Teams[1].JokersLeft >= 4);
- Static[StaticTeam2Joker5].Visible := (Party.Teams[1].JokersLeft >= 5);
+ Statics[StaticTeam2Joker1].Visible := (Party.Teams[1].JokersLeft >= 1);
+ Statics[StaticTeam2Joker2].Visible := (Party.Teams[1].JokersLeft >= 2);
+ Statics[StaticTeam2Joker3].Visible := (Party.Teams[1].JokersLeft >= 3);
+ Statics[StaticTeam2Joker4].Visible := (Party.Teams[1].JokersLeft >= 4);
+ Statics[StaticTeam2Joker5].Visible := (Party.Teams[1].JokersLeft >= 5);
end
else
begin
- Static[StaticTeam2Joker1].Visible := false;
- Static[StaticTeam2Joker2].Visible := false;
- Static[StaticTeam2Joker3].Visible := false;
- Static[StaticTeam2Joker4].Visible := false;
- Static[StaticTeam2Joker5].Visible := false;
+ Statics[StaticTeam2Joker1].Visible := false;
+ Statics[StaticTeam2Joker2].Visible := false;
+ Statics[StaticTeam2Joker3].Visible := false;
+ Statics[StaticTeam2Joker4].Visible := false;
+ Statics[StaticTeam2Joker5].Visible := false;
end;
if (Length(Party.Teams) >= 3) then
begin
- Static[StaticTeam3Joker1].Visible := (Party.Teams[2].JokersLeft >= 1);
- Static[StaticTeam3Joker2].Visible := (Party.Teams[2].JokersLeft >= 2);
- Static[StaticTeam3Joker3].Visible := (Party.Teams[2].JokersLeft >= 3);
- Static[StaticTeam3Joker4].Visible := (Party.Teams[2].JokersLeft >= 4);
- Static[StaticTeam3Joker5].Visible := (Party.Teams[2].JokersLeft >= 5);
+ Statics[StaticTeam3Joker1].Visible := (Party.Teams[2].JokersLeft >= 1);
+ Statics[StaticTeam3Joker2].Visible := (Party.Teams[2].JokersLeft >= 2);
+ Statics[StaticTeam3Joker3].Visible := (Party.Teams[2].JokersLeft >= 3);
+ Statics[StaticTeam3Joker4].Visible := (Party.Teams[2].JokersLeft >= 4);
+ Statics[StaticTeam3Joker5].Visible := (Party.Teams[2].JokersLeft >= 5);
end
else
begin
- Static[StaticTeam3Joker1].Visible := false;
- Static[StaticTeam3Joker2].Visible := false;
- Static[StaticTeam3Joker3].Visible := false;
- Static[StaticTeam3Joker4].Visible := false;
- Static[StaticTeam3Joker5].Visible := false;
+ Statics[StaticTeam3Joker1].Visible := false;
+ Statics[StaticTeam3Joker2].Visible := false;
+ Statics[StaticTeam3Joker3].Visible := false;
+ Statics[StaticTeam3Joker4].Visible := false;
+ Statics[StaticTeam3Joker5].Visible := false;
end;
end
else
begin //Hide all
- Static[StaticTeam1Joker1].Visible := false;
- Static[StaticTeam1Joker2].Visible := false;
- Static[StaticTeam1Joker3].Visible := false;
- Static[StaticTeam1Joker4].Visible := false;
- Static[StaticTeam1Joker5].Visible := false;
-
- Static[StaticTeam2Joker1].Visible := false;
- Static[StaticTeam2Joker2].Visible := false;
- Static[StaticTeam2Joker3].Visible := false;
- Static[StaticTeam2Joker4].Visible := false;
- Static[StaticTeam2Joker5].Visible := false;
-
- Static[StaticTeam3Joker1].Visible := false;
- Static[StaticTeam3Joker2].Visible := false;
- Static[StaticTeam3Joker3].Visible := false;
- Static[StaticTeam3Joker4].Visible := false;
- Static[StaticTeam3Joker5].Visible := false;
+ Statics[StaticTeam1Joker1].Visible := false;
+ Statics[StaticTeam1Joker2].Visible := false;
+ Statics[StaticTeam1Joker3].Visible := false;
+ Statics[StaticTeam1Joker4].Visible := false;
+ Statics[StaticTeam1Joker5].Visible := false;
+
+ Statics[StaticTeam2Joker1].Visible := false;
+ Statics[StaticTeam2Joker2].Visible := false;
+ Statics[StaticTeam2Joker3].Visible := false;
+ Statics[StaticTeam2Joker4].Visible := false;
+ Statics[StaticTeam2Joker5].Visible := false;
+
+ Statics[StaticTeam3Joker1].Visible := false;
+ Statics[StaticTeam3Joker2].Visible := false;
+ Statics[StaticTeam3Joker3].Visible := false;
+ Statics[StaticTeam3Joker4].Visible := false;
+ Statics[StaticTeam3Joker5].Visible := false;
end;
end;
@@ -1943,7 +1943,7 @@ begin
Visible := (Mode = smPartyMode);
for I := 0 to High(StaticParty) do
- Static[StaticParty[I]].Visible := Visible;
+ Statics[StaticParty[I]].Visible := Visible;
for I := 0 to High(TextParty) do
Text[TextParty[I]].Visible := Visible;
@@ -1952,7 +1952,7 @@ begin
Visible := not Visible;
for I := 0 to High(StaticNonParty) do
- Static[StaticNonParty[I]].Visible := Visible;
+ Statics[StaticNonParty[I]].Visible := Visible;
for I := 0 to High(TextNonParty) do
Text[TextNonParty[I]].Visible := Visible;
diff --git a/src/screens/UScreenTop5.pas b/src/screens/UScreenTop5.pas
index 2ddff713..705d1e35 100644
--- a/src/screens/UScreenTop5.pas
+++ b/src/screens/UScreenTop5.pas
@@ -203,7 +203,7 @@ begin
for I := 1 to Length(CurrentSong.Score[Ini.Difficulty]) do
begin
- Static[StaticNumber[I]].Visible := true;
+ Statics[StaticNumber[I]].Visible := true;
Text[TextNumber[I]].Visible := true;
Text[TextName[I]].Visible := true;
Text[TextScore[I]].Visible := true;
@@ -216,7 +216,7 @@ begin
for I := Length(CurrentSong.Score[Ini.Difficulty]) + 1 to 5 do
begin
- Static[StaticNumber[I]].Visible := false;
+ Statics[StaticNumber[I]].Visible := false;
Text[TextNumber[I]].Visible := false;
Text[TextName[I]].Visible := false;
Text[TextScore[I]].Visible := false;
@@ -232,7 +232,7 @@ var
begin
for I := 1 to Length(CurrentSong.Score[difficulty]) do
begin
- Static[StaticNumber[I]].Visible := true;
+ Statics[StaticNumber[I]].Visible := true;
Text[TextNumber[I]].Visible := true;
Text[TextName[I]].Visible := true;
Text[TextScore[I]].Visible := true;
@@ -245,7 +245,7 @@ begin
for I := Length(CurrentSong.Score[difficulty]) + 1 to 5 do
begin
- Static[StaticNumber[I]].Visible := false;
+ Statics[StaticNumber[I]].Visible := false;
Text[TextNumber[I]].Visible := false;
Text[TextName[I]].Visible := false;
Text[TextScore[I]].Visible := false;
@@ -282,18 +282,18 @@ begin
if ScreenAct = 1 then
begin
LoadColor(
- Static[StaticBoxLightest[Item]].Texture.ColR,
- Static[StaticBoxLightest[Item]].Texture.ColG,
- Static[StaticBoxLightest[Item]].Texture.ColB,
+ Statics[StaticBoxLightest[Item]].Texture.ColR,
+ Statics[StaticBoxLightest[Item]].Texture.ColG,
+ Statics[StaticBoxLightest[Item]].Texture.ColB,
'P1Dark');
end;
if ScreenAct = 2 then
begin
LoadColor(
- Static[StaticBoxLightest[Item]].Texture.ColR,
- Static[StaticBoxLightest[Item]].Texture.ColG,
- Static[StaticBoxLightest[Item]].Texture.ColB,
+ Statics[StaticBoxLightest[Item]].Texture.ColR,
+ Statics[StaticBoxLightest[Item]].Texture.ColG,
+ Statics[StaticBoxLightest[Item]].Texture.ColB,
'P4Dark');
end;
}