Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some data handling between challenge main screen and challenge game mode

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-12-17 19:24:33 +01:00
1 parent 99875f4293
commit bad4b3a5aa
6 files changed
+128 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Code/PartyModeChallenge.cs
+23 -4
View File
@@ -52,6 +52,7 @@ namespace Vocaluxe.PartyModes
public struct FromScreenMain
{
public bool FadeToSongSelection;
}
#endregion FromScreen
#endregion Communication
@@ -93,9 +94,9 @@ namespace Vocaluxe.PartyModes
public PartyModeChallenge()
{
_ScreenSongOptions.Selection.RandomOnly = false;
_ScreenSongOptions.Selection.PartyMode = false;
_ScreenSongOptions.Selection.PartyMode = true;
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
_ScreenSongOptions.Selection.NumJokers = null;
_ScreenSongOptions.Selection.NumJokers = new int[] { 5, 5 };
_ScreenSongOptions.Sorting.SearchString = String.Empty;
_ScreenSongOptions.Sorting.SearchStringVisible = false;
@@ -164,8 +165,20 @@ namespace Vocaluxe.PartyModes
break;
case "PartyScreenChallengeMain":
_Stage = EStage.Singing;
_Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
try
{
data = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSongSelection)
_Stage = EStage.Singing;
}
catch (Exception e)
{
_Base.Log.LogError("Error in party mode challenge. Can't cast received data from screen " + ScreenName + ". " + e.Message);
}
if (_Stage == EStage.Singing)
StartNextRound();
break;
default:
@@ -269,5 +282,11 @@ namespace Vocaluxe.PartyModes
{
return MaxNumRounds;
}
private void StartNextRound()
{
_Base.Graphics.FadeTo(EScreens.ScreenSong);
}
}
}
Output/PartyModes/Challenge/Code/PartyScreenChallengeMain.cs
+40 -3
View File
@@ -14,8 +14,12 @@ namespace Vocaluxe.PartyModes
const string ButtonNextRound = "ButtonNextRound";
private DataFromScreen Data;
public PartyScreenChallengeMain()
{
Data = new DataFromScreen();
Data.ScreenMain = new FromScreenMain();
}
protected override void Init()
@@ -32,6 +36,22 @@ namespace Vocaluxe.PartyModes
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenMain data = new DataToScreenMain();
try
{
data = (DataToScreenMain)ReceivedData;
}
catch (Exception e)
{
_Base.Log.LogError("Error in party mode screen challenge main. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
}
}
public override bool HandleInput(KeyEvent KeyEvent)
{
base.HandleInput(KeyEvent);
@@ -46,7 +66,12 @@ namespace Vocaluxe.PartyModes
{
case Keys.Back:
case Keys.Escape:
FadeTo(EScreens.ScreenParty);
EndParty();
break;
case Keys.Enter:
if (Buttons[htButtons(ButtonNextRound)].Selected)
NextRound();
break;
}
}
@@ -59,12 +84,13 @@ namespace Vocaluxe.PartyModes
if (MouseEvent.LB && IsMouseOver(MouseEvent))
{
if (Buttons[htButtons(ButtonNextRound)].Selected)
NextRound();
}
if (MouseEvent.RB)
{
FadeTo(EScreens.ScreenParty);
EndParty();
}
return true;
@@ -90,5 +116,16 @@ namespace Vocaluxe.PartyModes
{
base.OnClose();
}
private void NextRound()
{
Data.ScreenMain.FadeToSongSelection = true;
_PartyMode.DataFromScreen(_ThemeName, Data);
}
private void EndParty()
{
//TODO
}
}
}
Output/PartyModes/Challenge/Code/PartyScreenChallengeNames.cs
+1 -1
View File
@@ -101,7 +101,7 @@ namespace Vocaluxe.PartyModes
}
catch (Exception e)
{
_Base.Log.LogError("Error in party mode screen challenge config. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
_Base.Log.LogError("Error in party mode screen challenge names. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
}
}
PartyModeChallenge/PartyModeChallenge.cs
+23 -4
View File
@@ -52,6 +52,7 @@ namespace Vocaluxe.PartyModes
public struct FromScreenMain
{
public bool FadeToSongSelection;
}
#endregion FromScreen
#endregion Communication
@@ -93,9 +94,9 @@ namespace Vocaluxe.PartyModes
public PartyModeChallenge()
{
_ScreenSongOptions.Selection.RandomOnly = false;
_ScreenSongOptions.Selection.PartyMode = false;
_ScreenSongOptions.Selection.PartyMode = true;
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
_ScreenSongOptions.Selection.NumJokers = null;
_ScreenSongOptions.Selection.NumJokers = new int[] { 5, 5 };
_ScreenSongOptions.Sorting.SearchString = String.Empty;
_ScreenSongOptions.Sorting.SearchStringVisible = false;
@@ -164,8 +165,20 @@ namespace Vocaluxe.PartyModes
break;
case "PartyScreenChallengeMain":
_Stage = EStage.Singing;
_Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
try
{
data = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSongSelection)
_Stage = EStage.Singing;
}
catch (Exception e)
{
_Base.Log.LogError("Error in party mode challenge. Can't cast received data from screen " + ScreenName + ". " + e.Message);
}
if (_Stage == EStage.Singing)
StartNextRound();
break;
default:
@@ -269,5 +282,11 @@ namespace Vocaluxe.PartyModes
{
return MaxNumRounds;
}
private void StartNextRound()
{
_Base.Graphics.FadeTo(EScreens.ScreenSong);
}
}
}
PartyModeChallenge/PartyScreenChallengeMain.cs
+40 -3
View File
@@ -14,8 +14,12 @@ namespace Vocaluxe.PartyModes
const string ButtonNextRound = "ButtonNextRound";
private DataFromScreen Data;
public PartyScreenChallengeMain()
{
Data = new DataFromScreen();
Data.ScreenMain = new FromScreenMain();
}
protected override void Init()
@@ -32,6 +36,22 @@ namespace Vocaluxe.PartyModes
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenMain data = new DataToScreenMain();
try
{
data = (DataToScreenMain)ReceivedData;
}
catch (Exception e)
{
_Base.Log.LogError("Error in party mode screen challenge main. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
}
}
public override bool HandleInput(KeyEvent KeyEvent)
{
base.HandleInput(KeyEvent);
@@ -46,7 +66,12 @@ namespace Vocaluxe.PartyModes
{
case Keys.Back:
case Keys.Escape:
FadeTo(EScreens.ScreenParty);
EndParty();
break;
case Keys.Enter:
if (Buttons[htButtons(ButtonNextRound)].Selected)
NextRound();
break;
}
}
@@ -59,12 +84,13 @@ namespace Vocaluxe.PartyModes
if (MouseEvent.LB && IsMouseOver(MouseEvent))
{
if (Buttons[htButtons(ButtonNextRound)].Selected)
NextRound();
}
if (MouseEvent.RB)
{
FadeTo(EScreens.ScreenParty);
EndParty();
}
return true;
@@ -90,5 +116,16 @@ namespace Vocaluxe.PartyModes
{
base.OnClose();
}
private void NextRound()
{
Data.ScreenMain.FadeToSongSelection = true;
_PartyMode.DataFromScreen(_ThemeName, Data);
}
private void EndParty()
{
//TODO
}
}
}
PartyModeChallenge/PartyScreenChallengeNames.cs
+1 -1
View File
@@ -101,7 +101,7 @@ namespace Vocaluxe.PartyModes
}
catch (Exception e)
{
_Base.Log.LogError("Error in party mode screen challenge config. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
_Base.Log.LogError("Error in party mode screen challenge names. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
}
}