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

IMPORTANT: Format of all files with Resharper

Browse Source 
NO functional changes. If you have problems merging your changes, merge/rebase on previous commit then merge this. Conflicts can easily be resolved (take yours if in doubt)
After that merge next commits
This commit is contained in:
Flamefire committed 2014-02-26 00:36:00 +01:00
1 parent 3a110804d8
commit 149026ec32
57 files changed
+1242 -1099
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
+2 -2
View File
@@ -60,7 +60,7 @@ namespace VocaluxeLib.PartyModes.Challenge
while (_Data.ScreenNames.ProfileIDs.Count > _NumPlayer)
_Data.ScreenNames.ProfileIDs.RemoveAt(_Data.ScreenNames.ProfileIDs.Count - 1);
List<int>[] ids = new List<int>[] { _Data.ScreenNames.ProfileIDs };
List<int>[] ids = new List<int>[] {_Data.ScreenNames.ProfileIDs};
SetPartyModeProfiles(ids);
}
catch (Exception e)
@@ -77,7 +77,7 @@ namespace VocaluxeLib.PartyModes.Challenge
public override void Back()
{
SPartyNameOptions options = GetData();
if(options.TeamList.Length == 1)
if (options.TeamList.Length == 1)
_Data.ScreenNames.ProfileIDs = options.TeamList[0];
_Data.ScreenNames.FadeBack = true;
_PartyMode.DataFromScreen(ThemeName, _Data);
PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs
+1 -2
View File
@@ -61,7 +61,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
while (_Data.ScreenNames.ProfileIDs.Count > _NumPlayer)
_Data.ScreenNames.ProfileIDs.RemoveAt(_Data.ScreenNames.ProfileIDs.Count - 1);
List<int>[] ids = new List<int>[] { _Data.ScreenNames.ProfileIDs };
List<int>[] ids = new List<int>[] {_Data.ScreenNames.ProfileIDs};
SetPartyModeProfiles(ids);
}
catch (Exception e)
@@ -70,7 +70,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
}
}
public override void Back()
{
SPartyNameOptions options = GetData();
PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
+2 -3
View File
@@ -77,11 +77,10 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
public override void OnShow()
{
base.OnShow();
SetPartyModeData(2, _NumPlayerTeam1 + _NumPlayerTeam2, new int[] { _NumPlayerTeam1, _NumPlayerTeam2 });
SetPartyModeData(2, _NumPlayerTeam1 + _NumPlayerTeam2, new int[] {_NumPlayerTeam1, _NumPlayerTeam2});
List<int>[] ids = new List<int>[] {_Data.ScreenNames.ProfileIDsTeam1, _Data.ScreenNames.ProfileIDsTeam2};
SetPartyModeProfiles(ids);
}
@@ -89,7 +88,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public override void Back()
{
SPartyNameOptions options = GetData();
if(options.TeamList.Length == 2)
if (options.TeamList.Length == 2)
{
_Data.ScreenNames.ProfileIDsTeam1 = options.TeamList[0];
_Data.ScreenNames.ProfileIDsTeam2 = options.TeamList[1];