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

renamed SumSingPoints to NumSingPoints, fixed player position calculation (considering sing points)

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-12-30 18:07:40 +01:00
1 parent 524852d3c8
commit ff254dbc43
2 files changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModeChallenge/PartyModeChallenge.cs
+9 -7
View File
@@ -38,7 +38,7 @@ namespace Vocaluxe.PartyModes
public int NumPlayed; public int NumPlayed;
public int NumRounds; public int NumRounds;
public int NumWon; public int NumWon;
public int SumSingPoints; public int NumSingPoints;
public int NumGamePoints; public int NumGamePoints;
public int CompareTo(object obj) public int CompareTo(object obj)
@@ -50,7 +50,7 @@ namespace Vocaluxe.PartyModes
int res = row.NumGamePoints.CompareTo(NumGamePoints); int res = row.NumGamePoints.CompareTo(NumGamePoints);
if (res == 0) if (res == 0)
{ {
res = row.SumSingPoints.CompareTo(SumSingPoints); res = row.NumSingPoints.CompareTo(NumSingPoints);
if (res == 0) if (res == 0)
{ {
res = row.NumWon.CompareTo(NumWon); res = row.NumWon.CompareTo(NumWon);
@@ -575,7 +575,7 @@ namespace Vocaluxe.PartyModes
row.NumPlayed = 0; row.NumPlayed = 0;
row.NumRounds = 0; row.NumRounds = 0;
row.NumWon = 0; row.NumWon = 0;
row.SumSingPoints = 0; row.NumSingPoints = 0;
row.NumGamePoints = 0; row.NumGamePoints = 0;
GameData.ResultTable.Add(row); GameData.ResultTable.Add(row);
} }
@@ -624,7 +624,7 @@ namespace Vocaluxe.PartyModes
row.NumPlayed++; row.NumPlayed++;
row.NumWon += points[i].Won; row.NumWon += points[i].Won;
row.NumRounds += 1; row.NumRounds += 1;
row.SumSingPoints += points[i].SingPoints; row.NumSingPoints += points[i].SingPoints;
row.NumGamePoints += points[i].GamePoints; row.NumGamePoints += points[i].GamePoints;
GameData.ResultTable[index] = row; GameData.ResultTable[index] = row;
@@ -636,13 +636,15 @@ namespace Vocaluxe.PartyModes
//Update position-number //Update position-number
int pos = 1; int pos = 1;
int last_points = 0; int lastPoints = 0;
int lastSingPoints = 0;
for (int i = 0; i < GameData.ResultTable.Count; i++ ) for (int i = 0; i < GameData.ResultTable.Count; i++ )
{ {
if (last_points > GameData.ResultTable[i].NumGamePoints) if (lastPoints > GameData.ResultTable[i].NumGamePoints || lastSingPoints > GameData.ResultTable[i].NumSingPoints)
pos++; pos++;
GameData.ResultTable[i].Position = pos; GameData.ResultTable[i].Position = pos;
last_points = GameData.ResultTable[i].NumGamePoints; lastPoints = GameData.ResultTable[i].NumGamePoints;
lastSingPoints = GameData.ResultTable[i].NumSingPoints;
} }
} }
PartyModeChallenge/PartyScreenChallengeMain.cs
+1 -1
View File
@@ -588,7 +588,7 @@ namespace Vocaluxe.PartyModes
row.Name.Text = profiles[GameState.ResultTable[i+PlayerTableOffset].PlayerID].PlayerName; row.Name.Text = profiles[GameState.ResultTable[i+PlayerTableOffset].PlayerID].PlayerName;
row.Rounds.Text = GameState.ResultTable[i+PlayerTableOffset].NumRounds.ToString(); row.Rounds.Text = GameState.ResultTable[i+PlayerTableOffset].NumRounds.ToString();
row.Won.Text = GameState.ResultTable[i+PlayerTableOffset].NumWon.ToString(); row.Won.Text = GameState.ResultTable[i+PlayerTableOffset].NumWon.ToString();
row.SingPoints.Text = GameState.ResultTable[i+PlayerTableOffset].SumSingPoints.ToString(); row.SingPoints.Text = GameState.ResultTable[i+PlayerTableOffset].NumSingPoints.ToString();
row.GamePoints.Text = GameState.ResultTable[i+PlayerTableOffset].NumGamePoints.ToString(); row.GamePoints.Text = GameState.ResultTable[i+PlayerTableOffset].NumGamePoints.ToString();
} }
else else