Make CampaignTagSelector optional

CnCNet · Sep 14, 2022 · f356b26 · f356b26
1 parent fa46e49
commit f356b26
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/ClientCore/ClientConfiguration.cs b/ClientCore/ClientConfiguration.cs
@@ -259,6 +259,8 @@ public string GetThemePath(string themeName)
 
         public string AllowedCustomGameModes => clientDefinitionsIni.GetStringValue(SETTINGS, "AllowedCustomGameModes", "Standard,Custom Map");
 
+        public bool CampaignGroupSelectorEnabled => clientDefinitionsIni.GetBooleanValue(SETTINGS, "CampaignGroupSelectorEnabled", false);
+
         public string GetGameExecutableName()
         {
             string[] exeNames = clientDefinitionsIni.GetStringValue(SETTINGS, "GameExecutableNames", "Game.exe").Split(',');

diff --git a/DXMainClient/DXGUI/Generic/CampaignSelector.cs b/DXMainClient/DXGUI/Generic/CampaignSelector.cs
@@ -64,6 +64,7 @@ public CampaignSelector(WindowManager windowManager, DiscordHandler discordHandl
         /// <param name="selectedTags">Missions with at lease one of which tags to be shown. As an exception, null means show all missions.</param>
         public void ParseMissionWithFillter(ISet<string> selectedTags = null)
         {
+            Missions.Clear();
             lbCampaignList.Items.Clear();
             ParseBattleIni("INI/Battle.ini", selectedTags);
             ParseBattleIni("INI/" + ClientConfiguration.Instance.BattleFSFileName, selectedTags);
@@ -326,7 +327,8 @@ private void LaunchMission(Mission mission)
             UserINISettings.Instance.Difficulty.Value = trbDifficultySelector.Value;
             UserINISettings.Instance.SaveSettings();
 
-            ((MainMenuDarkeningPanel)Parent).Hide();
+            //((DarkeningPanel)Parent).Hide();
+            Disable();
 
             discordHandler?.UpdatePresence(mission.GUIName, difficultyName, mission.IconPath, true);
             GameProcessLogic.GameProcessExited += GameProcessExited_Callback;
@@ -382,8 +384,6 @@ private bool ParseBattleIni(string path, ISet<string> selectedTags = null)
 
                 var mission = new Mission(battleIni, battleSection);
 
-                Missions.Add(mission);
-
                 XNAListBoxItem item = new XNAListBoxItem();
                 item.Text = mission.GUIName;
                 if (!mission.Enabled)
@@ -406,7 +406,10 @@ private bool ParseBattleIni(string path, ISet<string> selectedTags = null)
                     item.Texture = AssetLoader.LoadTexture(mission.IconPath + "icon.png");
 
                 if (selectedTags == null || mission.Tags.Intersect(selectedTags).Count() >= 1)
+                {
+                    Missions.Add(mission);
                     lbCampaignList.AddItem(item);
+                }
             }
 
             Logger.Log("Finished parsing " + path + ".");

diff --git a/DXMainClient/DXGUI/Generic/CampaignTagSelector.cs b/DXMainClient/DXGUI/Generic/CampaignTagSelector.cs
@@ -1,4 +1,5 @@
-using ClientGUI;
+using ClientCore;
+using ClientGUI;
 using DTAClient.Domain;
 using Microsoft.Xna.Framework;
 using Rampastring.Tools;
@@ -27,19 +28,21 @@ public CampaignTagSelector(WindowManager windowManager, string iniName, DiscordH
         protected XNAClientButton btnShowAllMission;
         public override void Initialize()
         {
+            CampaignSelector = new CampaignSelector(WindowManager, discordHandler);
+            DarkeningPanel.AddAndInitializeWithControl(WindowManager, CampaignSelector);
+            CampaignSelector.Disable();
+
             Name = _iniSectionName;
 
+            if (!ClientConfiguration.Instance.CampaignGroupSelectorEnabled) return;
+
             ClientRectangle = new Rectangle(0, 0, DEFAULT_WIDTH, DEFAULT_HEIGHT);
             WindowManager.CenterControlOnScreen(this);
 
             BorderColor = UISettings.ActiveSettings.PanelBorderColor;
 
             base.Initialize();
 
-            CampaignSelector = new CampaignSelector(WindowManager, discordHandler);
-            DarkeningPanel.AddAndInitializeWithControl(WindowManager, CampaignSelector);
-            CampaignSelector.Disable();
-
             btnCancel = FindChild<XNAClientButton>(nameof(btnCancel));
             btnCancel.LeftClick += BtnCancel_LeftClick;
             btnShowAllMission = FindChild<XNAClientButton>(nameof(btnShowAllMission));
@@ -69,12 +72,18 @@ private void BtnCancel_LeftClick(object sender, EventArgs e)
 
         private void Hide()
         {
-            Disable();
+            if (ClientConfiguration.Instance.CampaignGroupSelectorEnabled)
+                Disable();
+            else
+                CampaignSelector.Disable();
         }
 
         public void Show()
         {
-            Enable();
+            if (ClientConfiguration.Instance.CampaignGroupSelectorEnabled)
+                Enable();
+            else
+                CampaignSelector.Enable();
         }
 
         CampaignSelector CampaignSelector;