diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml
index 814efcfe..52bcf9b6 100644
--- a/Output/Themes/Ambient/Screens/ScreenScore.xml
+++ b/Output/Themes/Ambient/Screens/ScreenScore.xml
@@ -1,7 +1,7 @@
- 2
+ 3
Video
@@ -3745,5 +3745,17 @@
+
+ Int
+ 7
+
+
+ Int
+ 4
+
+
+ Int
+ 4
+
-
\ No newline at end of file
+
diff --git a/Output/Themes/Changelog/Changelog_ScreenScore.txt b/Output/Themes/Changelog/Changelog_ScreenScore.txt
index d050d838..2fa4243e 100644
--- a/Output/Themes/Changelog/Changelog_ScreenScore.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenScore.txt
@@ -1,4 +1,7 @@
ScreenScore
+++++++++++
+Version 3:
+Add , , to change text-string with player-num >=
++++++++++
Version 2:
diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index dc258bd1..40191203 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/Vocaluxe/Screens/CScreenScore.cs
@@ -15,10 +15,14 @@ namespace Vocaluxe.Screens
class CScreenScore : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- const int ScreenVersion = 2;
+ const int ScreenVersion = 3;
private const string TextSong = "TextSong";
+ private const string ScreenSettingShortScore = "ScreenSettingShortScore";
+ private const string ScreenSettingShortRating = "ScreenSettingShortRating";
+ private const string ScreenSettingShortDifficulty = "ScreenSettingShortDifficulty";
+
private string[,] TextNames;
private string[,] TextScores;
private string[,] TextRatings;
@@ -54,6 +58,8 @@ namespace Vocaluxe.Screens
_ThemeStatics = statics.ToArray();
+ _ThemeScreenSettings = new string[] { ScreenSettingShortScore, ScreenSettingShortRating, ScreenSettingShortDifficulty };
+
StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer];
}
@@ -316,18 +322,19 @@ namespace Vocaluxe.Screens
}
else
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
-
- Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS");
- if (CGame.NumPlayer <= 3)
- {
- Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_RATING") + ": " + CLanguage.Translate(GetRating((int)Math.Round(player[p].Points)));
+
+ if (CGame.NumPlayer < (int)ScreenSettings[htScreenSettings(ScreenSettingShortScore)].GetValue())
+ Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS");
+ else
+ Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000");
+ if (CGame.NumPlayer < (int)ScreenSettings[htScreenSettings(ScreenSettingShortDifficulty)].GetValue())
Texts[htTexts(TextDifficulty[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_GAMEDIFFICULTY") + ": " + CLanguage.Translate(player[p].Difficulty.ToString());
- }
else
- {
- Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate(GetRating((int)Math.Round(player[p].Points)));
Texts[htTexts(TextDifficulty[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate(player[p].Difficulty.ToString());
- }
+ if (CGame.NumPlayer < (int)ScreenSettings[htScreenSettings(ScreenSettingShortRating)].GetValue())
+ Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_RATING") + ": " + CLanguage.Translate(GetRating((int)Math.Round(player[p].Points)));
+ else
+ Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate(GetRating((int)Math.Round(player[p].Points)));
StaticPointsBarDrawnPoints[p] = 0.0;
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H = 0;
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.Y = Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H + Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.Y - Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H;
diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs
index 0e3ccf2e..544bb12e 100644
--- a/VocaluxeLib/Menu/CMenu.cs
+++ b/VocaluxeLib/Menu/CMenu.cs
@@ -405,10 +405,10 @@ namespace Vocaluxe.Menu
{
for (int i = 0; i < _ThemeScreenSettings.Length; i++)
{
- CParticleEffect pe = new CParticleEffect(_Base, _PartyModeID);
- if (pe.LoadTheme("//root/" + _ThemeName, _ThemeScreenSettings[i], navigator, SkinIndex))
+ CScreenSetting se = new CScreenSetting(_Base, _PartyModeID);
+ if (se.LoadTheme("//root/" + _ThemeName, _ThemeScreenSettings[i], navigator, SkinIndex))
{
- _htScreenSettings.Add(_ThemeScreenSettings[i], AddParticleEffect(pe));
+ _htScreenSettings.Add(_ThemeScreenSettings[i], AddScreenSetting(se));
}
else
{
@@ -1482,6 +1482,12 @@ namespace Vocaluxe.Menu
_AddInteraction(_ParticleEffects.Count - 1, EType.TParticleEffect);
return _ParticleEffects.Count - 1;
}
+
+ public int AddScreenSetting(CScreenSetting se)
+ {
+ _ScreenSettings.Add(se);
+ return _ScreenSettings.Count - 1;
+ }
#endregion Elements
#region InteractionHandling