Fixed changed-player-bug when using random-joker in tic-tac-toe.

This commit is contained in:
Florian Küpper committed 2013-05-23 15:05:47 +02:00
1 parent c2e9fb2aba
commit 4ba69da46e
1 file changed
+25 -21
@@ -473,16 +473,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
} }
} }
private void _FieldSelected() private void _FieldSelected(bool jokerUsed = false)
{
if (!jokerUsed)
{ {
int songID = 0;
int singerTeam1 = 0; int singerTeam1 = 0;
int singerTeam2 = 0; int singerTeam2 = 0;
if (_GameData.Songs.Count > 0)
{
songID = _GameData.Songs[0];
_GameData.Songs.RemoveAt(0);
}
if (_GameData.PlayerTeam1.Count > 0) if (_GameData.PlayerTeam1.Count > 0)
{ {
singerTeam1 = _GameData.PlayerTeam1[0]; singerTeam1 = _GameData.PlayerTeam1[0];
@@ -494,21 +491,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
singerTeam2 = _GameData.PlayerTeam2[0]; singerTeam2 = _GameData.PlayerTeam2[0];
_GameData.PlayerTeam2.RemoveAt(0); _GameData.PlayerTeam2.RemoveAt(0);
} }
CSong song = CBase.Songs.GetSongByID(songID);
CBase.BackgroundMusic.SetStatus(true);
_PreviewStream = CBase.Sound.Load(song.GetMP3(), false);
CBase.Sound.SetPosition(_PreviewStream, song.PreviewStart);
CBase.Sound.SetStreamVolume(_PreviewStream, 0f);
CBase.Sound.Play(_PreviewStream);
CBase.Sound.Fade(_PreviewStream, CBase.Config.GetBackgroundMusicVolume(), 1f);
_Status = EStatus.FieldSelected;
_Fields[_SelectedField].Content.SongID = songID;
_GameData.Rounds[_SelectedField].SongID = songID;
_GameData.Rounds[_SelectedField].SingerTeam1 = singerTeam1; _GameData.Rounds[_SelectedField].SingerTeam1 = singerTeam1;
_GameData.Rounds[_SelectedField].SingerTeam2 = singerTeam2; _GameData.Rounds[_SelectedField].SingerTeam2 = singerTeam2;
_UpdateFieldContents();
_Texts[_TextNextPlayerT1].Visible = true; _Texts[_TextNextPlayerT1].Visible = true;
_Texts[_TextNextPlayerT2].Visible = true; _Texts[_TextNextPlayerT2].Visible = true;
@@ -522,6 +506,26 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Statics[_StaticAvatarT1].Texture = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].Avatar.Texture; _Statics[_StaticAvatarT1].Texture = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].Avatar.Texture;
_Statics[_StaticAvatarT2].Texture = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].Avatar.Texture; _Statics[_StaticAvatarT2].Texture = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].Avatar.Texture;
}
int songID = 0;
if (_GameData.Songs.Count > 0)
{
songID = _GameData.Songs[0];
_GameData.Songs.RemoveAt(0);
}
CSong song = CBase.Songs.GetSongByID(songID);
CBase.BackgroundMusic.SetStatus(true);
_PreviewStream = CBase.Sound.Load(song.GetMP3(), false);
CBase.Sound.SetPosition(_PreviewStream, song.PreviewStart);
CBase.Sound.SetStreamVolume(_PreviewStream, 0f);
CBase.Sound.Play(_PreviewStream);
CBase.Sound.Fade(_PreviewStream, CBase.Config.GetBackgroundMusicVolume(), 1f);
_Status = EStatus.FieldSelected;
_Fields[_SelectedField].Content.SongID = songID;
_GameData.Rounds[_SelectedField].SongID = songID;
_UpdateFieldContents();
_UpdateJokerButtons(); _UpdateJokerButtons();
_Buttons[_ButtonNextRound].Visible = true; _Buttons[_ButtonNextRound].Visible = true;
@@ -581,7 +585,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_GameData.NumJokerRandom[teamNr]--; _GameData.NumJokerRandom[teamNr]--;
if (!CBase.Sound.IsFinished(_PreviewStream)) if (!CBase.Sound.IsFinished(_PreviewStream))
CBase.Sound.FadeAndStop(_PreviewStream, 0, 1); CBase.Sound.FadeAndStop(_PreviewStream, 0, 1);
_FieldSelected(); _FieldSelected(true);
} }
break; break;