diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index 14c21079..9652b95b 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -180,6 +180,18 @@
+
+
+
+
+ 1150
+ 350
+ 100
+ 50
+ -0.75
+
+
+
@@ -197,6 +209,18 @@
+
+
+
+
+ 1150
+ 150
+ 100
+ 50
+ -0.75
+
+
+
@@ -214,6 +238,18 @@
+
+
+
+
+ 1150
+ 350
+ 100
+ 50
+ -0.75
+
+
+
@@ -231,6 +267,18 @@
+
+
+
+
+ 1150
+ 10
+ 100
+ 50
+ -0.75
+
+
+
@@ -248,6 +296,18 @@
+
+
+
+
+ 1150
+ 210
+ 100
+ 50
+ -0.75
+
+
+
@@ -265,6 +325,18 @@
+
+
+
+
+ 1150
+ 410
+ 100
+ 50
+ -0.75
+
+
+
@@ -282,6 +354,18 @@
+
+
+
+
+ 528
+ 150
+ 100
+ 50
+ -0.75
+
+
+
@@ -299,6 +383,18 @@
+
+
+
+
+ 528
+ 350
+ 100
+ 50
+ -0.75
+
+
+
@@ -316,6 +412,18 @@
+
+
+
+
+ 1150
+ 150
+ 100
+ 50
+ -0.75
+
+
+
@@ -333,6 +441,18 @@
+
+
+
+
+ 1150
+ 350
+ 100
+ 50
+ -0.75
+
+
+
@@ -350,6 +470,18 @@
+
+
+
+
+ 528
+ 10
+ 100
+ 50
+ -0.75
+
+
+
@@ -367,6 +499,18 @@
+
+
+
+
+ 528
+ 210
+ 100
+ 50
+ -0.75
+
+
+
@@ -384,6 +528,18 @@
+
+
+
+
+ 528
+ 410
+ 100
+ 50
+ -0.75
+
+
+
@@ -401,6 +557,18 @@
+
+
+
+
+ 1150
+ 150
+ 100
+ 50
+ -0.75
+
+
+
@@ -418,6 +586,18 @@
+
+
+
+
+ 1150
+ 350
+ 100
+ 50
+ -0.75
+
+
+
@@ -435,6 +615,18 @@
+
+
+
+
+ 528
+ 10
+ 100
+ 50
+ -0.75
+
+
+
@@ -452,6 +644,18 @@
+
+
+
+
+ 528
+ 210
+ 100
+ 50
+ -0.75
+
+
+
@@ -469,6 +673,18 @@
+
+
+
+
+ 528
+ 410
+ 100
+ 50
+ -0.75
+
+
+
@@ -486,6 +702,18 @@
+
+
+
+
+ 1150
+ 10
+ 100
+ 50
+ -0.75
+
+
+
@@ -503,6 +731,18 @@
+
+
+
+
+ 1150
+ 210
+ 100
+ 50
+ -0.75
+
+
+
@@ -520,6 +760,18 @@
+
+
+
+
+ 1150
+ 410
+ 100
+ 50
+ -0.75
+
+
+
@@ -542,7 +794,7 @@
640
20
- -1
+ -2
27
880
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 5e4a3ba9..02306fda 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -70,6 +70,7 @@ namespace Vocaluxe.Screens
private const string _StaticLyricHelperTop = "StaticLyricHelperTop";
private const string _StaticPauseBG = "StaticPauseBG";
+ private string[,] _StaticScores;
private string[,] _StaticAvatars;
private const string _ButtonCancel = "ButtonCancel";
@@ -371,6 +372,7 @@ namespace Vocaluxe.Screens
}
if (CConfig.FadePlayerInfo == EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_ALL)
{
+ _Statics[_StaticScores[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
_Statics[_StaticAvatars[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
_Texts[_TextNames[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
_Texts[_TextScores[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
@@ -500,15 +502,6 @@ namespace Vocaluxe.Screens
_DrawLyricHelper();
- if (_Pause)
- {
- foreach (CButton button in _Buttons)
- button.Draw();
-
- foreach (CSelectSlide slide in _SelectSlides)
- slide.Draw();
- }
-
return true;
}
@@ -883,6 +876,7 @@ namespace Vocaluxe.Screens
private void _BuildStaticStrings(ref List statics)
{
+ _StaticScores = new string[CSettings.MaxNumPlayer,CSettings.MaxNumPlayer];
_StaticAvatars = new string[CSettings.MaxNumPlayer,CSettings.MaxNumPlayer];
for (int numplayer = 0; numplayer < CSettings.MaxNumPlayer; numplayer++)
@@ -892,8 +886,10 @@ namespace Vocaluxe.Screens
if (player <= numplayer)
{
string target = "P" + (player + 1) + "N" + (numplayer + 1);
+ _StaticScores[player, numplayer] = "StaticScore" + target;
_StaticAvatars[player, numplayer] = "StaticAvatar" + target;
+ statics.Add(_StaticScores[player, numplayer]);
statics.Add(_StaticAvatars[player, numplayer]);
}
}
@@ -923,6 +919,7 @@ namespace Vocaluxe.Screens
_Texts[_TextNames[player, numplayer]].Visible = isIvisible &&
(CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_NAME);
+ _Statics[_StaticScores[player, numplayer]].Visible = isIvisible;
_Statics[_StaticAvatars[player, numplayer]].Visible = isIvisible &&
(CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_AVATAR);