aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-10-19 15:14:17 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-10-19 15:14:17 +0000
commita52499fa9f5e7f37c70bfb7a4145554168ec30f0 (patch)
treeed343438845b47af6784c132a7bda303322a77e8
parent3d959d62af80562289e790231be2deffcd02c9b3 (diff)
downloadusdx-a52499fa9f5e7f37c70bfb7a4145554168ec30f0.tar.gz
usdx-a52499fa9f5e7f37c70bfb7a4145554168ec30f0.tar.xz
usdx-a52499fa9f5e7f37c70bfb7a4145554168ec30f0.zip
added static navigate in scorescreen for medley mode
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2683 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rwxr-xr-xmedley_new/game/themes/Candy.ini17
-rw-r--r--medley_new/game/themes/Classic.ini21
-rw-r--r--medley_new/game/themes/Deluxe.ini24
-rwxr-xr-xmedley_new/game/themes/Temptation.ini21
-rw-r--r--medley_new/game/themes/Verdure.ini24
-rw-r--r--medley_new/src/base/UThemes.pas6
-rw-r--r--medley_new/src/screens/UScreenScore.pas12
7 files changed, 123 insertions, 2 deletions
diff --git a/medley_new/game/themes/Candy.ini b/medley_new/game/themes/Candy.ini
index d8944b83..5051362d 100755
--- a/medley_new/game/themes/Candy.ini
+++ b/medley_new/game/themes/Candy.ini
@@ -2223,6 +2223,23 @@ Tex = ScoreLine
Type = Transparent
Color = Light
+[ScoreStaticNavigate]
+X = 759
+Y = 65
+W = 22
+H = 22
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+
+[ScoreTextNavigate]
+X = 753
+Y = 64
+Color = Light
+Font = 0
+Size = 24
+Align = 2
+Text = SING_LEGEND_NAVIGATE
#================================================================== Options ======
[Options]
diff --git a/medley_new/game/themes/Classic.ini b/medley_new/game/themes/Classic.ini
index 3db8838f..7d45c2fb 100644
--- a/medley_new/game/themes/Classic.ini
+++ b/medley_new/game/themes/Classic.ini
@@ -1218,7 +1218,7 @@ Reflection = 1
ReflectionSpacing = 2
[ScoreStatic4]
-X =350
+X =200
Y = 545
W = 32
H = 30
@@ -1227,7 +1227,7 @@ Color = White
Type = Transparent
[ScoreText2]
-X =390
+X =240
Y = 548
Color = Black
Font = 0
@@ -2387,6 +2387,23 @@ Tex = ScoreLine
Type = Transparent
Color = Gray
+[ScoreStaticNavigate]
+X = 450
+Y = 545
+W =32
+H =30
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+
+[ScoreTextNavigate]
+X =490
+Y = 548
+Color = Black
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+
[Options]
Texts = 6
Fade = 2
diff --git a/medley_new/game/themes/Deluxe.ini b/medley_new/game/themes/Deluxe.ini
index a8d789b2..b8bd7ae5 100644
--- a/medley_new/game/themes/Deluxe.ini
+++ b/medley_new/game/themes/Deluxe.ini
@@ -2573,6 +2573,30 @@ Tex = ScoreLine
Type = Colorized
Color = White
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Z = 0.5
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 13
+
[Options]
Texts = 6
Fade = 2
diff --git a/medley_new/game/themes/Temptation.ini b/medley_new/game/themes/Temptation.ini
index 35c37ba3..3040bdc6 100755
--- a/medley_new/game/themes/Temptation.ini
+++ b/medley_new/game/themes/Temptation.ini
@@ -2563,6 +2563,27 @@ Tex = ScoreLine
Type = Colorized
Color = White
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = White
+Size = 24
+Reflection = 1
+ReflectionSpacing = 20
+Text = SING_LEGEND_NAVIGATE
+
[Options]
Texts = 6
Fade = 2
diff --git a/medley_new/game/themes/Verdure.ini b/medley_new/game/themes/Verdure.ini
index 37d566d5..02e4e0eb 100644
--- a/medley_new/game/themes/Verdure.ini
+++ b/medley_new/game/themes/Verdure.ini
@@ -2637,6 +2637,30 @@ Tex = ScoreLine
Type = Colorized
Color = Black
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Z = 0.5
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 13
+
##################
#################################
#################
diff --git a/medley_new/src/base/UThemes.pas b/medley_new/src/base/UThemes.pas
index dcfc5b4d..55d2e84d 100644
--- a/medley_new/src/base/UThemes.pas
+++ b/medley_new/src/base/UThemes.pas
@@ -408,6 +408,9 @@ type
StaticLevelRound: array[1..6] of TThemeStatic;
StaticPlayerIdBox: array[1..6] of TThemeStatic;
+ StaticNavigate: TThemeStatic;
+ TextNavigate: TThemeText;
+
// Description: array[0..5] of string;}
end;
@@ -1274,6 +1277,9 @@ begin
ThemeLoadStatic(Score.StaticRatings[I], 'ScoreStaticRatingPicture' + IntToStr(I));
end;
+ ThemeLoadStatic(Score.StaticNavigate, 'ScoreStaticNavigate');
+ ThemeLoadText(Score.TextNavigate, 'ScoreTextNavigate');
+
// Top5
ThemeLoadBasic(Top5, 'Top5');
diff --git a/medley_new/src/screens/UScreenScore.pas b/medley_new/src/screens/UScreenScore.pas
index 3b08fe86..7742aec0 100644
--- a/medley_new/src/screens/UScreenScore.pas
+++ b/medley_new/src/screens/UScreenScore.pas
@@ -168,6 +168,8 @@ type
TextGolden_ActualValue: array[1..6] of integer;
ActualRound: integer;
+ StaticNavigate: integer;
+ TextNavigate: integer;
procedure RefreshTexts;
procedure ResetScores;
@@ -574,6 +576,9 @@ begin
aPlayerScoreScreenTextures[Player].Player_Id_Box := Texture.GetTexture(Skin.GetTextureFileName('PlayerIDBox0' + IntToStr(Player)), Texture_Type_Transparent);
end;
+ StaticNavigate := AddStatic(Theme.Score.StaticNavigate);
+ TextNavigate := AddText(Theme.Score.TextNavigate);
+
LoadSwapTextures;
end;
@@ -698,6 +703,13 @@ begin
begin
for P := 0 to PlayersPlay - 1 do
Player[P] := PlaylistMedley.Stats[ActualRound].Player[P];
+
+ Statics[StaticNavigate].Visible := true;
+ Text[TextNavigate].Visible := true;
+ end else
+ begin
+ Statics[StaticNavigate].Visible := false;
+ Text[TextNavigate].Visible := false;
end;
MapPlayersToPosition;