diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs index 99cfae4d..5d591fa3 100644 --- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs +++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs @@ -135,8 +135,8 @@ namespace VocaluxeLib.PartyModes.Challenge //build joker config slide _SelectSlides[_SelectSlideRefillJokers].Clear(); - _SelectSlides[_SelectSlideRefillJokers].AddValue(CBase.Language.Translate("TR_BUTTON_NO", PartyModeID)); - _SelectSlides[_SelectSlideRefillJokers].AddValue(CBase.Language.Translate("TR_BUTTON_YES", PartyModeID)); + _SelectSlides[_SelectSlideRefillJokers].AddValue("TR_BUTTON_NO"); + _SelectSlides[_SelectSlideRefillJokers].AddValue("TR_BUTTON_YES"); _SelectSlides[_SelectSlideRefillJokers].SelectLastValue(); _UpdateMicsAtOnce(); @@ -152,7 +152,7 @@ namespace VocaluxeLib.PartyModes.Challenge _PartyMode.GameData.NumPlayerAtOnce = _SelectSlides[_SelectSlideNumMics].Selection + _PartyMode.MinPlayers; _PartyMode.GameData.NumRounds = (_SelectSlides[_SelectSlideNumRounds].Selection + 1) * _RoundSteps; _PartyMode.GameData.NumJokers = _SelectSlides[_SelectSlideNumJokers].Selection + 1; - _PartyMode.GameData.RefillJokers = (_SelectSlides[_SelectSlideRefillJokers].Selection == 1) ? true : false; + _PartyMode.GameData.RefillJokers = _SelectSlides[_SelectSlideRefillJokers].Selection == 1; _UpdateMicsAtOnce(); _SetRoundSteps(); diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs index c23251ad..cd2e175d 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuListRecord.cs @@ -376,7 +376,7 @@ namespace VocaluxeLib.Menu.SongMenu List _Scores = CBase.DataBase.LoadScore(song.ID,EGameMode.TR_GAMEMODE_NORMAL, EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_ALL); List players = new List(); - if (_RecordStyle.Equals(ERecordStyle.RECORDSTYLE_ALL)) + if (_RecordStyle == ERecordStyle.RECORDSTYLE_ALL) { for(int i = 0; i < _Records.Count; i++) { @@ -401,7 +401,7 @@ namespace VocaluxeLib.Menu.SongMenu String recordName = ""; - if (_RecordStyle.Equals(ERecordStyle.RECORDSTYLE_DIFFICULTY)) + if (_RecordStyle == ERecordStyle.RECORDSTYLE_DIFFICULTY) { recordName = score.Name + score.Difficulty; } @@ -417,7 +417,7 @@ namespace VocaluxeLib.Menu.SongMenu { score = _Scores[k]; - if (_RecordStyle.Equals(ERecordStyle.RECORDSTYLE_DIFFICULTY)) + if (_RecordStyle == ERecordStyle.RECORDSTYLE_DIFFICULTY) { recordName = score.Name + score.Difficulty; } diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj index e5d9d606..42e21f11 100644 --- a/VocaluxeLib/VocaluxeLib.csproj +++ b/VocaluxeLib/VocaluxeLib.csproj @@ -151,9 +151,6 @@ - - -