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

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

Browse Source 
Conflicts:
	Output/PartyModes/Challenge/Code/PartyScreenChallengeConfig.cs
	PartyModeChallenge/PartyScreenChallengeConfig.cs
This commit is contained in:
Florian Kuepper committed 2012-12-16 13:14:39 +01:00
2 parents 96d38b5c35 10bcf64731
commit b4e728f540
4 files changed
+112 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModeChallenge/PartyScreenChallengeConfig.cs
+4 -4
View File
@@ -38,8 +38,8 @@ namespace Vocaluxe.PartyModes
Data = new DataFromScreen();
FromScreenConfig config = new FromScreenConfig();
config.NumPlayers = 0;
config.NumPlayersAtOnce = 0;
config.NumPlayer = 0;
config.NumPlayerAtOnce = 0;
config.NumRounds = 0;
Data.ScreenConfig = config;
}
@@ -161,8 +161,8 @@ namespace Vocaluxe.PartyModes
private void Next()
{
Data.ScreenConfig.NumPlayers = (SelectSlides[htSelectSlides(SelectSlideNumPlayers)].Selection + _PartyMode.GetMinPlayer());
Data.ScreenConfig.NumPlayersAtOnce = SelectSlides[htSelectSlides(SelectSlideNumMics)].Selection;
Data.ScreenConfig.NumPlayer = (SelectSlides[htSelectSlides(SelectSlideNumPlayers)].Selection + _PartyMode.GetMinPlayer());
Data.ScreenConfig.NumPlayerAtOnce = SelectSlides[htSelectSlides(SelectSlideNumMics)].Selection;
Data.ScreenConfig.NumRounds = SelectSlides[htSelectSlides(SelectSlideNumRounds)].Selection;
_PartyMode.DataFromScreen(_ThemeName, Data);