diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
index b036b823..1485e4bf 100644
--- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml
+++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
@@ -1,7 +1,7 @@
- 1
+ 2
Video
@@ -1292,5 +1292,195 @@
+
+
+ Star
+
+ 80
+ 100
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 160
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 220
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 280
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 340
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 400
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 460
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 520
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 580
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
+
+
+ Star
+
+ 80
+ 640
+ 1,00
+ 1080
+ 42
+
+
+ StaticColor
+
+ TButton
+
+ 25,00
+
+ 250
+
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenHighscore.txt b/Output/Themes/Changelog/Changelog_ScreenHighscore.txt
new file mode 100644
index 00000000..f2f6c417
--- /dev/null
+++ b/Output/Themes/Changelog/Changelog_ScreenHighscore.txt
@@ -0,0 +1,7 @@
+ScreenHighscore
+
+++++++++++
+Version 2:
+
+Add: ParticleEffectsNew[1..6] (one for each player!)
+++++++++++
\ No newline at end of file
diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs
index 743e0a0b..ef03cefd 100644
--- a/Vocaluxe/Base/CDataBase.cs
+++ b/Vocaluxe/Base/CDataBase.cs
@@ -185,7 +185,7 @@ namespace Vocaluxe.Base
command.ExecuteNonQuery();
//Read last insert line
- command.CommandText = "SELECT id FROM Scores ORDER BY Date DESC LIMIT 0, 1";
+ command.CommandText = "SELECT id FROM Scores ORDER BY id DESC LIMIT 0, 1";
reader = null;
try
diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs
index a8551bb7..a6d71d77 100644
--- a/Vocaluxe/Screens/CScreenHighscore.cs
+++ b/Vocaluxe/Screens/CScreenHighscore.cs
@@ -13,7 +13,7 @@ namespace Vocaluxe.Screens
class CScreenHighscore : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- const int ScreenVersion = 1;
+ const int ScreenVersion = 2;
private const int NumEntrys = 10;
private const string TextSongName = "TextSongName";
@@ -22,6 +22,7 @@ namespace Vocaluxe.Screens
private string[] TextName;
private string[] TextScore;
private string[] TextDate;
+ private string[] ParticleEffectNew;
private List[] _Scores;
private List _NewEntryIDs;
@@ -72,7 +73,14 @@ namespace Vocaluxe.Screens
texts.Add(TextDate[i]);
}
+ ParticleEffectNew = new string[NumEntrys];
+ for (int i = 0; i < NumEntrys; i++)
+ {
+ ParticleEffectNew[i] = "ParticleEffectNew" + (i + 1).ToString();
+ }
+
_ThemeTexts = texts.ToArray();
+ _ThemeParticleEffects = ParticleEffectNew;
_NewEntryIDs = new List();
}
@@ -170,17 +178,11 @@ namespace Vocaluxe.Screens
if (isNewEntry(_Scores[_Round][_Pos + p].ID) == true)
{
- Texts[htTexts(TextNumber[p])].Style = EStyle.BoldItalic;
- Texts[htTexts(TextName[p])].Style = EStyle.BoldItalic;
- Texts[htTexts(TextScore[p])].Style = EStyle.BoldItalic;
- Texts[htTexts(TextDate[p])].Style = EStyle.BoldItalic;
+ ParticleEffects[htParticleEffects(ParticleEffectNew[p])].Visible = true;
}
else
{
- Texts[htTexts(TextNumber[p])].Style = EStyle.Bold;
- Texts[htTexts(TextName[p])].Style = EStyle.Bold;
- Texts[htTexts(TextScore[p])].Style = EStyle.Bold;
- Texts[htTexts(TextDate[p])].Style = EStyle.Bold;
+ ParticleEffects[htParticleEffects(ParticleEffectNew[p])].Visible = false;
}
}
else
@@ -189,6 +191,7 @@ namespace Vocaluxe.Screens
Texts[htTexts(TextName[p])].Visible = false;
Texts[htTexts(TextScore[p])].Visible = false;
Texts[htTexts(TextDate[p])].Visible = false;
+ ParticleEffects[htParticleEffects(ParticleEffectNew[p])].Visible = false;
}
}
return true;
diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs
index ed60e73d..2004b3dd 100644
--- a/VocaluxeLib/Menu/CParticle.cs
+++ b/VocaluxeLib/Menu/CParticle.cs
@@ -449,7 +449,7 @@ namespace Vocaluxe.Menu
}
writer.WriteComment(": Type of ParticleEffect: " + CHelper.ListStrings(Enum.GetNames(typeof(EType))));
- writer.WriteElementString("Type", Enum.GetName(typeof(EType), _Type);
+ writer.WriteElementString("Type", Enum.GetName(typeof(EType), _Type));
writer.WriteComment(": Size of particle");
writer.WriteElementString("Size", _Size.ToString("#0.00"));
writer.WriteComment(": Max number of drawn particles");