From 0981d101a321ecd0a0e76cfebc8dd0e330d870d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 22:22:21 +0200 Subject: [PATCH] Fixed pm name selection shows 'team' if it shouldn't --- PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs | 1 + .../CPartyScreenChallengeMedleyNames.cs | 1 + VocaluxeLib/Menu/CMenuPartyNameSelection.cs | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs index 9b79c0d2..46d354aa 100644 --- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs +++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs @@ -37,6 +37,7 @@ namespace VocaluxeLib.PartyModes.Challenge base.Init(); _PartyMode = (CPartyModeChallenge)base._PartyMode; _AllowChangePlayerNum = false; + _Teams = false; } public override void OnShow() diff --git a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs index 4d92fc7d..a95bfc53 100644 --- a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs +++ b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs @@ -37,6 +37,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley base.Init(); _PartyMode = (CPartyModeChallengeMedley)base._PartyMode; _AllowChangePlayerNum = false; + _Teams = false; } public override void OnShow() diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs index 489467bc..cc01f135 100644 --- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs @@ -37,7 +37,7 @@ namespace VocaluxeLib.Menu } } - private bool _Teams; + protected bool _Teams = true; protected int _NumTeams = -1; protected int _NumPlayer = -1; protected int[] _NumPlayerTeams; @@ -106,8 +106,6 @@ namespace VocaluxeLib.Menu for (int i = 0; i < _TeamList.Length; i++) _TeamList[i] = new List(); - _Teams = _NumTeams > 0; - _UpdateSlides(); _LoadProfiles(); _UpdateButtonVisibility();