some bugfixes for main screen

This commit is contained in:
Alexander Eckart committed 2012-12-23 12:54:59 +01:00
1 parent 3a3a4ba1d4
commit 399bc71c75
2 files changed
+4 -1

No files matched your search

+3 -1
View File
@@ -295,6 +295,8 @@ namespace Vocaluxe.PartyModes
if (_Screens != null) if (_Screens != null)
{ {
_Base.Songs.ResetPartySongSung(); _Base.Songs.ResetPartySongSung();
ToScreenMain.ResultTable = new List<ResultTableRow>();
GameData.ResultTable = new List<ResultTableRow>();
GameData.Rounds = new ChallengeRounds(GameData.NumRounds, GameData.NumPlayer, GameData.NumPlayerAtOnce); GameData.Rounds = new ChallengeRounds(GameData.NumRounds, GameData.NumPlayer, GameData.NumPlayerAtOnce);
GameData.CurrentRoundNr = 1; GameData.CurrentRoundNr = 1;
ToScreenMain.CurrentRoundNr = 1; ToScreenMain.CurrentRoundNr = 1;
@@ -484,10 +486,10 @@ namespace Vocaluxe.PartyModes
{ {
_ScreenSongOptions.Selection.RandomOnly = _ScreenSongOptions.Sorting.Tabs != EOffOn.TR_CONFIG_ON; _ScreenSongOptions.Selection.RandomOnly = _ScreenSongOptions.Sorting.Tabs != EOffOn.TR_CONFIG_ON;
_ScreenSongOptions.Selection.CategoryChangeAllowed = _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_ON; _ScreenSongOptions.Selection.CategoryChangeAllowed = _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_ON;
GameData.CurrentRoundNr++;
SetNumJokers(); SetNumJokers();
SetTeamNames(); SetTeamNames();
GameData.CatSongIndices = null; GameData.CatSongIndices = null;
GameData.CurrentRoundNr++;
_Base.Graphics.FadeTo(EScreens.ScreenSong); _Base.Graphics.FadeTo(EScreens.ScreenSong);
} }
@@ -226,6 +226,7 @@ namespace Vocaluxe.PartyModes
private void NextRound() private void NextRound()
{ {
Data.ScreenMain.FadeToNameSelection = false;
Data.ScreenMain.FadeToSongSelection = true; Data.ScreenMain.FadeToSongSelection = true;
_PartyMode.DataFromScreen(_ThemeName, Data); _PartyMode.DataFromScreen(_ThemeName, Data);
} }