Automatic cleanup/formating

This commit is contained in:
Flamefire committed 2013-04-24 01:26:36 +02:00
1 parent b1e28ae7bc
commit 69d8af4e87
32 files changed
+93 -100

No files matched your search

@@ -157,21 +157,15 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
//filter against PlayerNrDemand
List<CCombination> combsFiltered = new List<CCombination>();
if (playerNrDemand != null)
{
combsFiltered.AddRange(_Combs.Where(t => t.IsAvailableAll(playerNrDemand)));
}
//1st fallback
if (playerNrDemand != null && combsFiltered.Count == 0)
{
combsFiltered.AddRange(_Combs.Where(t => t.IsAvailableSomeone(playerNrDemand)));
}
//2nd fallback
if (combsFiltered.Count == 0)
{
combsFiltered.AddRange(_Combs);
}
int num = combsFiltered.Count;
int rand = _Rand.Next(num);
@@ -702,7 +702,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
int pos = 1;
int lastPoints = 0;
int lastSingPoints = 0;
foreach (CResultTableRow resultRow in _GameData.ResultTable) {
foreach (CResultTableRow resultRow in _GameData.ResultTable)
{
if (lastPoints > resultRow.NumGamePoints || lastSingPoints > resultRow.NumSingPoints)
pos++;
resultRow.Position = pos;
@@ -409,7 +409,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
_RoundsTable.Add(rtr);
}
//Create statics and texts for rounds
foreach (CRoundsTableRow roundRow in _RoundsTable) {
foreach (CRoundsTableRow roundRow in _RoundsTable)
{
//Round-number
CText text = GetNewText(_Texts[_TextRoundNumber]);
_AddText(text);
@@ -451,7 +452,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
float delta = _Texts[_TextRoundNumber].Height;
//Update statics and texts for rounds
foreach (CRoundsTableRow roundRow in _RoundsTable) {
foreach (CRoundsTableRow roundRow in _RoundsTable)
{
//Round-number
roundRow.Number.X = numberX;
roundRow.Number.Y = numberY;
@@ -453,7 +453,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
private bool _OnAdd()
{
foreach (CPlayerChooseButton chooseButton in _PlayerChooseButtons) {
foreach (CPlayerChooseButton chooseButton in _PlayerChooseButtons)
{
if (chooseButton.Button.Selected && chooseButton.ProfileID != -1)
{
if (_Data.ScreenNames.ProfileIDs.Count < _NumPlayer)