Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

This commit is contained in:
Florian Kuepper committed 2012-12-23 14:50:47 +01:00
commit dfa623a53b
2 files changed
+2 -4

No files matched your search

+1 -1
View File
@@ -479,6 +479,7 @@ namespace Vocaluxe.PartyModes
public override void LeavingHighscore()
{
GameData.CurrentRoundNr++;
_Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
}
@@ -489,7 +490,6 @@ namespace Vocaluxe.PartyModes
SetNumJokers();
SetTeamNames();
GameData.CatSongIndices = null;
GameData.CurrentRoundNr++;
_Base.Graphics.FadeTo(EScreens.ScreenSong);
}