Fixed scoring in challenge-modes.

This commit is contained in:
Florian Küpper committed 2014-12-19 09:45:19 +01:00
1 parent 3d088fa407
commit deb885ced5
3 files changed
+6 -9

No files matched your search

@@ -436,8 +436,6 @@ namespace VocaluxeLib.PartyModes.Challenge
GameData.Results[i, j] = 0; GameData.Results[i, j] = 0;
} }
} }
else
{
SPlayer[] results = CBase.Game.GetPlayers(); SPlayer[] results = CBase.Game.GetPlayers();
if (results == null) if (results == null)
return; return;
@@ -473,7 +471,7 @@ namespace VocaluxeLib.PartyModes.Challenge
GameData.ResultTable[index] = row; GameData.ResultTable[index] = row;
} }
}
GameData.ResultTable.Sort(); GameData.ResultTable.Sort();
@@ -196,7 +196,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case EStage.Main: case EStage.Main:
return _Screens["CPartyScreenChallengeMedleyMain"]; return _Screens["CPartyScreenChallengeMedleyMain"];
case EStage.Singing: case EStage.Singing:
return CBase.Graphics.GetScreen(EScreen.Song); return CBase.Graphics.GetScreen(EScreen.Sing);
default: default:
throw new ArgumentException("Invalid stage: " + _Stage); throw new ArgumentException("Invalid stage: " + _Stage);
} }
@@ -508,8 +508,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
GameData.Results[i, j] = 0; GameData.Results[i, j] = 0;
} }
} }
else
{
CPoints gamePoints = CBase.Game.GetPoints(); CPoints gamePoints = CBase.Game.GetPoints();
if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce) if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce)
return; return;
@@ -563,7 +562,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
GameData.ResultTable[index] = row; GameData.ResultTable[index] = row;
} }
} }
}
GameData.ResultTable.Sort(); GameData.ResultTable.Sort();
+3 -2
View File
@@ -629,10 +629,11 @@ namespace Vocaluxe.Screens
_SongMenu.OnShow(); _SongMenu.OnShow();
if (_Sso.Selection.PartyMode) if (_Sso.Selection.PartyMode)
{
_PlaylistActive = false; _PlaylistActive = false;
if (_Sso.Selection.PartyMode)
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_SelectElement(_Buttons[_ButtonStart]);
}
_SongMenu.Selected = !_PlaylistActive; _SongMenu.Selected = !_PlaylistActive;
_SongMenu.SmallView = _Playlist.Visible; _SongMenu.SmallView = _Playlist.Visible;