From aa78c07877799072c3ad71486996b94d954d2a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Tue, 12 Sep 2017 10:15:50 +0200 Subject: [PATCH] Disabled duets in party modes (for now) --- .../PartyModeChallenge/CPartyScreenChallengeSongs.cs | 7 +++++++ .../PartyModeTicTacToe/CPartyScreenTicTacToeSongs.cs | 7 +++++++ VocaluxeLib/Menu/CMenuPartySongSelection.cs | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeSongs.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeSongs.cs index 931a1791..f7261c4e 100644 --- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeSongs.cs +++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeSongs.cs @@ -50,6 +50,13 @@ namespace VocaluxeLib.PartyModes.Challenge return true; } + protected override void _SetAllowedOptions() + { + base._SetAllowedOptions(); + + AllowedSongModes = new EGameMode[] { EGameMode.TR_GAMEMODE_NORMAL, EGameMode.TR_GAMEMODE_SHORTSONG, EGameMode.TR_GAMEMODE_MEDLEY }; + } + private void _SaveConfig() { _PartyMode.GameData.SongSource = Source; diff --git a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeSongs.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeSongs.cs index bf27dd65..a899cc61 100644 --- a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeSongs.cs +++ b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeSongs.cs @@ -64,6 +64,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe return true; } + protected override void _SetAllowedOptions() + { + base._SetAllowedOptions(); + + AllowedSongModes = new EGameMode[] { EGameMode.TR_GAMEMODE_NORMAL, EGameMode.TR_GAMEMODE_SHORTSONG, EGameMode.TR_GAMEMODE_MEDLEY }; + } + private void _SaveConfig() { _PartyMode.GameData.SongSource = Source; diff --git a/VocaluxeLib/Menu/CMenuPartySongSelection.cs b/VocaluxeLib/Menu/CMenuPartySongSelection.cs index dbcb6137..5a4db8f8 100644 --- a/VocaluxeLib/Menu/CMenuPartySongSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartySongSelection.cs @@ -250,7 +250,7 @@ namespace VocaluxeLib.Menu _SelectSlides[_SelectSlideCategory].Visible = Source == ESongSource.TR_SONGSOURCE_CATEGORY; } - protected void _SetAllowedOptions() + protected virtual void _SetAllowedOptions() { AllowedSongModes = (EGameMode[])Enum.GetValues(typeof(EGameMode)); AllowedSongSources = (ESongSource[])Enum.GetValues(typeof(ESongSource));