From 16fc5db8671c3020998d57bae779e05247aaa5f5 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sat, 22 Dec 2012 22:23:12 +0100 Subject: [PATCH 1/2] added profileID list to screen main data --- PartyModeChallenge/PartyModeChallenge.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs index c9082582..4aacf78c 100644 --- a/PartyModeChallenge/PartyModeChallenge.cs +++ b/PartyModeChallenge/PartyModeChallenge.cs @@ -27,6 +27,7 @@ namespace Vocaluxe.PartyModes public int NumPlayerAtOnce; public List Combs; public List ResultTable; + public List ProfileIDs; } public class ResultTableRow : IComparable @@ -286,6 +287,7 @@ namespace Vocaluxe.PartyModes ToScreenMain.CurrentRoundNr = 1; ToScreenMain.NumPlayerAtOnce = GameData.NumPlayerAtOnce; ToScreenMain.Combs = GameData.Rounds.Rounds; + ToScreenMain.ProfileIDs = GameData.ProfileIDs; UpdateScores(); ToScreenMain.ResultTable = GameData.ResultTable; Screen.DataToScreen(ToScreenMain); From e843569b3e80967ddb172abfd6920d706470ecd4 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sat, 22 Dec 2012 22:29:08 +0100 Subject: [PATCH 2/2] switch to screen names from main screen --- PartyModeChallenge/PartyModeChallenge.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs index 4aacf78c..77c2126f 100644 --- a/PartyModeChallenge/PartyModeChallenge.cs +++ b/PartyModeChallenge/PartyModeChallenge.cs @@ -88,6 +88,7 @@ namespace Vocaluxe.PartyModes public struct FromScreenMain { public bool FadeToSongSelection; + public bool FadeToNameSelection; } #endregion FromScreen #endregion Communication @@ -226,6 +227,8 @@ namespace Vocaluxe.PartyModes data = (DataFromScreen)Data; if (data.ScreenMain.FadeToSongSelection) _Stage = EStage.Singing; + if (data.ScreenMain.FadeToNameSelection) + _Stage = EStage.Config; } catch (Exception e) { @@ -235,6 +238,8 @@ namespace Vocaluxe.PartyModes if (_Stage == EStage.Singing) StartNextRound(); + if (_Stage == EStage.Config) + _Base.Graphics.FadeTo(EScreens.ScreenPartyDummy); break; default: