Added some screen-settings to ScreenScore.

This commit is contained in:
Florian Küpper committed 2012-12-28 14:03:44 +01:00
1 parent 3eda104c81
commit 907ec1f1cb
4 files changed
+43 -15

No files matched your search

+14 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<ScreenScore> <ScreenScore>
<ScreenVersion>2</ScreenVersion> <ScreenVersion>3</ScreenVersion>
<Background1> <Background1>
<!--<Type>: Background type: None, Color, Texture, Video--> <!--<Type>: Background type: None, Color, Texture, Video-->
<Type>Video</Type> <Type>Video</Type>
@@ -3745,5 +3745,17 @@
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</TextDifficultyP6N6> </TextDifficultyP6N6>
<ScreenSettingShortScore>
<Type>Int</Type>
<Value>7</Value>
</ScreenSettingShortScore>
<ScreenSettingShortRating>
<Type>Int</Type>
<Value>4</Value>
</ScreenSettingShortRating>
<ScreenSettingShortDifficulty>
<Type>Int</Type>
<Value>4</Value>
</ScreenSettingShortDifficulty>
</ScreenScore> </ScreenScore>
</root> </root>
@@ -1,4 +1,7 @@
ScreenScore ScreenScore
++++++++++
Version 3:
Add <ScreenSettingShortScore>, <ScreenSettingShortRating>, <ScreenSettingShortDifficulty> to change text-string with player-num >= <Value>
++++++++++ ++++++++++
Version 2: Version 2:
+17 -10
View File
@@ -15,10 +15,14 @@ namespace Vocaluxe.Screens
class CScreenScore : CMenu class CScreenScore : CMenu
{ {
// Version number for theme files. Increment it, if you've changed something on the theme files! // 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 TextSong = "TextSong";
private const string ScreenSettingShortScore = "ScreenSettingShortScore";
private const string ScreenSettingShortRating = "ScreenSettingShortRating";
private const string ScreenSettingShortDifficulty = "ScreenSettingShortDifficulty";
private string[,] TextNames; private string[,] TextNames;
private string[,] TextScores; private string[,] TextScores;
private string[,] TextRatings; private string[,] TextRatings;
@@ -54,6 +58,8 @@ namespace Vocaluxe.Screens
_ThemeStatics = statics.ToArray(); _ThemeStatics = statics.ToArray();
_ThemeScreenSettings = new string[] { ScreenSettingShortScore, ScreenSettingShortRating, ScreenSettingShortDifficulty };
StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer]; StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer];
} }
@@ -316,18 +322,19 @@ namespace Vocaluxe.Screens
} }
else else
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name; 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 < (int)ScreenSettings[htScreenSettings(ScreenSettingShortScore)].GetValue())
if (CGame.NumPlayer <= 3) Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS");
{ else
Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_RATING") + ": " + CLanguage.Translate(GetRating((int)Math.Round(player[p].Points))); 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()); Texts[htTexts(TextDifficulty[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_GAMEDIFFICULTY") + ": " + CLanguage.Translate(player[p].Difficulty.ToString());
}
else 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()); 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; StaticPointsBarDrawnPoints[p] = 0.0;
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H = 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; 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;
+9 -3
View File
@@ -405,10 +405,10 @@ namespace Vocaluxe.Menu
{ {
for (int i = 0; i < _ThemeScreenSettings.Length; i++) for (int i = 0; i < _ThemeScreenSettings.Length; i++)
{ {
CParticleEffect pe = new CParticleEffect(_Base, _PartyModeID); CScreenSetting se = new CScreenSetting(_Base, _PartyModeID);
if (pe.LoadTheme("//root/" + _ThemeName, _ThemeScreenSettings[i], navigator, SkinIndex)) if (se.LoadTheme("//root/" + _ThemeName, _ThemeScreenSettings[i], navigator, SkinIndex))
{ {
_htScreenSettings.Add(_ThemeScreenSettings[i], AddParticleEffect(pe)); _htScreenSettings.Add(_ThemeScreenSettings[i], AddScreenSetting(se));
} }
else else
{ {
@@ -1482,6 +1482,12 @@ namespace Vocaluxe.Menu
_AddInteraction(_ParticleEffects.Count - 1, EType.TParticleEffect); _AddInteraction(_ParticleEffects.Count - 1, EType.TParticleEffect);
return _ParticleEffects.Count - 1; return _ParticleEffects.Count - 1;
} }
public int AddScreenSetting(CScreenSetting se)
{
_ScreenSettings.Add(se);
return _ScreenSettings.Count - 1;
}
#endregion Elements #endregion Elements
#region InteractionHandling #region InteractionHandling