feat(speed): sped up startup by a bit

feat(settings): removed unused settings
MurkyYT · Jul 29, 2024 · 0057b83 · 0057b83
1 parent 6629952
commit 0057b83
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 47 deletions.
diff --git a/src/CSAuto/App.config b/src/CSAuto/App.config
@@ -100,9 +100,6 @@
             <setting name="inGameState" serializeAs="String">
                 <value>{TeamScore} [{MyTeam}] ({RoundState}) {EnemyScore} [{EnemyTeam}]</value>
             </setting>
-            <setting name="oldAutoBuy" serializeAs="String">
-                <value>False</value>
-            </setting>
             <setting name="sendAcceptImage" serializeAs="String">
                 <value>False</value>
             </setting>

diff --git a/src/CSAuto/AutoBuyMenu.cs b/src/CSAuto/AutoBuyMenu.cs
@@ -93,10 +93,10 @@ public class AutoBuyMenu
         // Mid-Tier - 5
         // Rifles - 5
         // Grenades - 5
-        private readonly List<BuyItem> ctItems = new List<BuyItem>();
-        private readonly List<BuyItem> tItems = new List<BuyItem>();
-        private readonly List<CustomBuyItem> ctCustomItems = new List<CustomBuyItem>();
-        private readonly List<CustomBuyItem> tCustomItems = new List<CustomBuyItem>();
+        private List<BuyItem> ctItems = new List<BuyItem>();
+        private List<BuyItem> tItems = new List<BuyItem>();
+        private List<CustomBuyItem> ctCustomItems = new List<CustomBuyItem>();
+        private List<CustomBuyItem> tCustomItems = new List<CustomBuyItem>();
         public enum NAMES {
             None,
             KevlarVest, 
@@ -422,34 +422,14 @@ public void Load(RegistrySettings settings)
         {
             InitBuyItems();
             if (settings["CTCustomAutoBuyConfig"] != null)
-            {
-                Newtonsoft.Json.Linq.JArray ar = (Newtonsoft.Json.Linq.JArray)JsonConvert.DeserializeObject(settings["CTCustomAutoBuyConfig"]);
-                CustomBuyItem[] temp = ar.ToObject<CustomBuyItem[]>();
-                for (int i = 0; i < temp.Length && i < ctCustomItems.Count; i++)
-                    ctCustomItems[i] = temp[i];
-            }
+                ctCustomItems = JsonConvert.DeserializeObject<List<CustomBuyItem>>(settings["CTCustomAutoBuyConfig"]);
             if (settings["CTAutoBuyConfig"] != null)
-            {
-                Newtonsoft.Json.Linq.JArray ar = (Newtonsoft.Json.Linq.JArray)JsonConvert.DeserializeObject(settings["CTAutoBuyConfig"]);
-                BuyItem[] temp = ar.ToObject<BuyItem[]>();
-                for (int i = 0; i < temp.Length && i < ctItems.Count; i++)
-                    ctItems[i] = temp[i];
-            }
+                ctItems = JsonConvert.DeserializeObject<List<BuyItem>>(settings["CTAutoBuyConfig"]);
 
             if (settings["TAutoBuyConfig"] != null)
-            {
-                Newtonsoft.Json.Linq.JArray ar = (Newtonsoft.Json.Linq.JArray)JsonConvert.DeserializeObject(settings["TAutoBuyConfig"]);
-                BuyItem[] temp = ar.ToObject<BuyItem[]>();
-                for (int i = 0; i < temp.Length && i < tItems.Count; i++)
-                    tItems[i] = temp[i];
-            }
+                tItems = JsonConvert.DeserializeObject<List<BuyItem>>(settings["TAutoBuyConfig"]);
             if (settings["TCustomAutoBuyConfig"] != null)
-            {
-                Newtonsoft.Json.Linq.JArray ar = (Newtonsoft.Json.Linq.JArray)JsonConvert.DeserializeObject(settings["TCustomAutoBuyConfig"]);
-                CustomBuyItem[] temp = ar.ToObject<CustomBuyItem[]>();
-                for (int i = 0; i < temp.Length && i < tCustomItems.Count; i++)
-                    tCustomItems[i] = temp[i];
-            }
+                tCustomItems = JsonConvert.DeserializeObject<List<CustomBuyItem>>(settings["TCustomAutoBuyConfig"]);
         }
         public static BuyItem[] GetEnabled(RegistrySettings settings,bool isCt)
         {

diff --git a/src/CSAuto/MainApp.xaml.cs b/src/CSAuto/MainApp.xaml.cs
@@ -43,7 +43,7 @@ public partial class MainApp : Window
         #region Constants
         public const string VER = "2.1.2";
         public const string FULL_VER = VER + (DEBUG_REVISION == "" ? "" : " REV "+ DEBUG_REVISION);
-        const string DEBUG_REVISION = "13";
+        const string DEBUG_REVISION = "14";
         const string GAME_PROCCES_NAME = "cs2";
         const string GAME_WINDOW_NAME = "Counter-Strike 2";
         const string GAME_CLASS_NAME = "SDL_app";

diff --git a/src/CSAuto/Properties/Settings.Designer.cs b/src/CSAuto/Properties/Settings.Designer.cs
diff --git a/src/CSAuto/Properties/Settings.settings b/src/CSAuto/Properties/Settings.settings
@@ -111,9 +111,6 @@
     <Setting Name="inGameState" Type="System.String" Scope="User">
       <Value Profile="(Default)">{TeamScore} [{MyTeam}] ({RoundState}) {EnemyScore} [{EnemyTeam}]</Value>
     </Setting>
-    <Setting Name="oldAutoBuy" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="sendAcceptImage" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>