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

Preparation for namestyle fixing: fixed ambiguous name

Browse Source
This commit is contained in:
Flamefire committed 2013-04-05 19:56:51 +02:00
1 parent b0b3c09ab4
commit 498cb09dd2
14 files changed
+145 -127
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeChallenge/PartyModeChallenge.cs
+11 -11
View File
@@ -192,17 +192,17 @@ namespace VocaluxeLib.PartyModes.Challenge
public override void DataFromScreen(string ScreenName, Object Data)
{
DataFromScreen data = new DataFromScreen();
DataFromScreen dataFrom = new DataFromScreen();
switch (ScreenName)
{
case "PartyScreenChallengeConfig":
try
{
data = (DataFromScreen)Data;
GameData.NumPlayer = data.ScreenConfig.NumPlayer;
GameData.NumPlayerAtOnce = data.ScreenConfig.NumPlayerAtOnce;
GameData.NumRounds = data.ScreenConfig.NumRounds;
dataFrom = (DataFromScreen)Data;
GameData.NumPlayer = dataFrom.ScreenConfig.NumPlayer;
GameData.NumPlayerAtOnce = dataFrom.ScreenConfig.NumPlayerAtOnce;
GameData.NumRounds = dataFrom.ScreenConfig.NumRounds;
_Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -216,12 +216,12 @@ namespace VocaluxeLib.PartyModes.Challenge
case "PartyScreenChallengeNames":
try
{
data = (DataFromScreen)Data;
if (data.ScreenNames.FadeToConfig)
dataFrom = (DataFromScreen)Data;
if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted;
else
{
GameData.ProfileIDs = data.ScreenNames.ProfileIDs;
GameData.ProfileIDs = dataFrom.ScreenNames.ProfileIDs;
_Stage = EStage.Names;
}
@@ -236,10 +236,10 @@ namespace VocaluxeLib.PartyModes.Challenge
case "PartyScreenChallengeMain":
try
{
data = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSongSelection)
dataFrom = (DataFromScreen)Data;
if (dataFrom.ScreenMain.FadeToSongSelection)
_Stage = EStage.Singing;
if (data.ScreenMain.FadeToNameSelection)
if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config;
}
catch (Exception e)
PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
+11 -11
View File
@@ -197,17 +197,17 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
public override void DataFromScreen(string ScreenName, Object Data)
{
DataFromScreen data = new DataFromScreen();
DataFromScreen dataFrom = new DataFromScreen();
switch (ScreenName)
{
case "PartyScreenChallengeMedleyConfig":
try
{
data = (DataFromScreen)Data;
GameData.NumPlayer = data.ScreenConfig.NumPlayer;
GameData.NumPlayerAtOnce = data.ScreenConfig.NumPlayerAtOnce;
GameData.NumRounds = data.ScreenConfig.NumRounds;
dataFrom = (DataFromScreen)Data;
GameData.NumPlayer = dataFrom.ScreenConfig.NumPlayer;
GameData.NumPlayerAtOnce = dataFrom.ScreenConfig.NumPlayerAtOnce;
GameData.NumRounds = dataFrom.ScreenConfig.NumRounds;
_Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -221,12 +221,12 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case "PartyScreenChallengeMedleyNames":
try
{
data = (DataFromScreen)Data;
if (data.ScreenNames.FadeToConfig)
dataFrom = (DataFromScreen)Data;
if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted;
else
{
GameData.ProfileIDs = data.ScreenNames.ProfileIDs;
GameData.ProfileIDs = dataFrom.ScreenNames.ProfileIDs;
_Stage = EStage.Names;
}
@@ -241,10 +241,10 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case "PartyScreenChallengeMedleyMain":
try
{
data = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSongSelection)
dataFrom = (DataFromScreen)Data;
if (dataFrom.ScreenMain.FadeToSongSelection)
_Stage = EStage.Singing;
if (data.ScreenMain.FadeToNameSelection)
if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config;
}
catch (Exception e)
PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
+22 -22
View File
@@ -225,21 +225,21 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public override void DataFromScreen(string ScreenName, Object Data)
{
DataFromScreen data = new DataFromScreen();
DataFromScreen dataFrom = new DataFromScreen();
switch (ScreenName)
{
case "PartyScreenTicTacToeConfig":
try
{
data = (DataFromScreen)Data;
GameData.NumPlayerTeam1 = data.ScreenConfig.NumPlayerTeam1;
GameData.NumPlayerTeam2 = data.ScreenConfig.NumPlayerTeam2;
GameData.NumFields = data.ScreenConfig.NumFields;
GameData.SongSource = data.ScreenConfig.SongSource;
GameData.CategoryID = data.ScreenConfig.CategoryID;
GameData.PlaylistID = data.ScreenConfig.PlaylistID;
GameData.GameMode = data.ScreenConfig.GameMode;
dataFrom = (DataFromScreen)Data;
GameData.NumPlayerTeam1 = dataFrom.ScreenConfig.NumPlayerTeam1;
GameData.NumPlayerTeam2 = dataFrom.ScreenConfig.NumPlayerTeam2;
GameData.NumFields = dataFrom.ScreenConfig.NumFields;
GameData.SongSource = dataFrom.ScreenConfig.SongSource;
GameData.CategoryID = dataFrom.ScreenConfig.CategoryID;
GameData.PlaylistID = dataFrom.ScreenConfig.PlaylistID;
GameData.GameMode = dataFrom.ScreenConfig.GameMode;
_Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -253,8 +253,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
case "PartyScreenTicTacToeNames":
try
{
data = (DataFromScreen)Data;
if (data.ScreenNames.FadeToConfig)
dataFrom = (DataFromScreen)Data;
if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted;
else
{
@@ -262,8 +262,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
GameData.Team = 0;
else
GameData.Team = 1;
GameData.ProfileIDsTeam1 = data.ScreenNames.ProfileIDsTeam1;
GameData.ProfileIDsTeam2 = data.ScreenNames.ProfileIDsTeam2;
GameData.ProfileIDsTeam1 = dataFrom.ScreenNames.ProfileIDsTeam1;
GameData.ProfileIDsTeam2 = dataFrom.ScreenNames.ProfileIDsTeam2;
_Stage = EStage.Names;
}
@@ -278,17 +278,17 @@ namespace VocaluxeLib.PartyModes.TicTacToe
case "PartyScreenTicTacToeMain":
try
{
data = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSinging)
dataFrom = (DataFromScreen)Data;
if (dataFrom.ScreenMain.FadeToSinging)
{
_Stage = EStage.Singing;
GameData.Rounds = data.ScreenMain.Rounds;
GameData.SingRoundNr = data.ScreenMain.SingRoundNr;
GameData.Songs = data.ScreenMain.Songs;
GameData.PlayerTeam1 = data.ScreenMain.PlayerTeam1;
GameData.PlayerTeam2 = data.ScreenMain.PlayerTeam2;
GameData.Rounds = dataFrom.ScreenMain.Rounds;
GameData.SingRoundNr = dataFrom.ScreenMain.SingRoundNr;
GameData.Songs = dataFrom.ScreenMain.Songs;
GameData.PlayerTeam1 = dataFrom.ScreenMain.PlayerTeam1;
GameData.PlayerTeam2 = dataFrom.ScreenMain.PlayerTeam2;
}
if (data.ScreenMain.FadeToNameSelection)
if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config;
}
catch (Exception e)
@@ -298,7 +298,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (_Stage == EStage.Singing)
StartRound(data.ScreenMain.SingRoundNr);
StartRound(dataFrom.ScreenMain.SingRoundNr);
if (_Stage == EStage.Config)
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
break;