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

This commit is contained in:
Florian Kuepper committed 2012-12-15 14:03:55 +01:00
commit c13590e7d2
1 file changed
+18
+18
View File
@@ -690,7 +690,16 @@ namespace Vocaluxe.Screens
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
if (CSongs.AllSongs[SongNr].IsDuet)
{
gm = EGameMode.TR_GAMEMODE_DUET;
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{
if ((i % 2) == 0)
CGame.Player[i].LineNr = 1;
else
CGame.Player[i].LineNr = 1;
}
}
CGame.AddSong(SongNr, gm);
IDs.Remove(SongNr);
@@ -717,7 +726,16 @@ namespace Vocaluxe.Screens
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
if (CSongs.AllSongs[SongNr].IsDuet)
{
gm = EGameMode.TR_GAMEMODE_DUET;
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{
if ((i % 2) == 0)
CGame.Player[i].LineNr = 1;
else
CGame.Player[i].LineNr = 1;
}
}
CGame.AddSong(SongNr, gm);