From 04bf58ab911f0fe88b7a8f914a295135f6e00b9b Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Tue, 7 Jul 2020 16:22:18 +0200
Subject: [PATCH] remove minActionSets config setting

---
 Aquaria/UserSettings.cpp | 18 +++---------------
 Aquaria/UserSettings.h   |  2 --
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/Aquaria/UserSettings.cpp b/Aquaria/UserSettings.cpp
index 293500a..a6ff2ec 100644
--- a/Aquaria/UserSettings.cpp
+++ b/Aquaria/UserSettings.cpp
@@ -471,13 +471,9 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
 		readInt(xml_control, "AutoAim", "on", &control.autoAim);
 		readInt(xml_control, "Targeting", "on", &control.targeting);
 		readInt(xml_control, "FlipInputButtons", "on", &control.flipInputButtons);
-		readInt(xml_control, "MinActionSets", "num", &control.minActionSets);
 		readInt(xml_control, "ToolTipsOn", "on", &control.toolTipsOn);
 
-		if(control.minActionSets < 1)
-			control.minActionSets = 1;
 		control.actionSets.clear();
-		control.actionSets.reserve(control.minActionSets);
 
 		for(XMLElement *xml_actionSet = xml_control->FirstChildElement("ActionSet"); xml_actionSet; xml_actionSet = xml_actionSet->NextSiblingElement("ActionSet"))
 		{
@@ -514,19 +510,11 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
 				}
 			}
 		}
-
-		int nas = (int)control.actionSets.size();
-		if(nas < control.minActionSets)
-			control.actionSets.resize(control.minActionSets);
-		while(nas < control.minActionSets)
-		{
-			ActionSet& as = control.actionSets[nas];
-			ensureDefaultActions(as);
-			as.enabled = false;
-			++nas;
-		}
 	}
 
+	if(control.actionSets.size() == 1)
+		control.actionSets[0].enabled = true;
+
 	XMLElement *xml_demo = doc.FirstChildElement("Demo");
 	if (xml_demo)
 	{
diff --git a/Aquaria/UserSettings.h b/Aquaria/UserSettings.h
index 76e28f3..01d9e29 100644
--- a/Aquaria/UserSettings.h
+++ b/Aquaria/UserSettings.h
@@ -95,7 +95,6 @@ public:
 			targeting = 1;
 			flipInputButtons = 0;
 			joystickEnabled = 0;
-			minActionSets = 4;
 		}
 		int joystickEnabled;
 		int autoAim;
@@ -103,7 +102,6 @@ public:
 		int flipInputButtons;
 		std::vector<ActionSet> actionSets;
 		int toolTipsOn;
-		int minActionSets;
 	} control;
 
 	struct Demo