Remove more gms2.3 warning code

UnderminersTeam · Jun 27, 2022 · f58f510 · f58f510
1 parent 6b94f6b
commit f58f510
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 27 deletions.
diff --git a/UndertaleModTool/ImportCodeSystem.cs b/UndertaleModTool/ImportCodeSystem.cs
@@ -113,7 +113,7 @@ public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacem
             string codeName = code.Name.Content;
             GlobalDecompileContext DECOMPILE_CONTEXT = context is null ? new(Data, false) : context;
 
-            if (Data.ToolInfo.ProfileMode == false)
+            if (!Data.ToolInfo.ProfileMode)
             {
                 try
                 {
@@ -125,7 +125,7 @@ public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacem
                     throw new Exception("Error during GML code replacement:\n" + exc.ToString());
                 }
             }
-            else if (Data.ToolInfo.ProfileMode)
+            else
             {
                 try
                 {

diff --git a/UndertaleModTool/MainWindow.xaml.cs b/UndertaleModTool/MainWindow.xaml.cs
@@ -1057,10 +1057,6 @@ private async Task LoadFile(string filename, bool preventClose = false)
                                 data.ToolInfo.CurrentMD5 = BitConverter.ToString(MD5CurrentlyLoaded).Replace("-", "").ToLowerInvariant();
                             }
                         }
-                        /*if (data.GMS2_3 && SettingsWindow.Warn_About_GMS23)
-                        {
-                            this.ShowWarning("This game was built using GameMaker Studio 2.3 (or above). Support for this version is a work in progress, and you will likely run into issues decompiling code or in other places.", "GMS 2.3");
-                        }*/
                         if (data.IsYYC())
                         {
                             this.ShowWarning("This game uses YYC (YoYo Compiler), which means the code is embedded into the game executable. This configuration is currently not fully supported; continue at your own risk.", "YYC");

diff --git a/UndertaleModTool/ProfileSystem.cs b/UndertaleModTool/ProfileSystem.cs
@@ -230,12 +230,6 @@ await Task.Run(() =>
 
                 if (SettingsWindow.ProfileModeEnabled)
                 {
-/*                    if (data.GMS2_3)
-                    {
-                        this.ShowWarning("Profile mode is not currently supported for GameMaker Studio 2.3 games.");
-                        return;
-                    }
-*/
                     Directory.CreateDirectory(ProfilesFolder);
                     if (Directory.Exists(profDir))
                     {

diff --git a/UndertaleModTool/Settings.cs b/UndertaleModTool/Settings.cs
@@ -20,7 +20,6 @@ public class Settings
         public string GameMakerStudio2RuntimesPath { get; set; } = "%systemdrive%\\ProgramData\\GameMakerStudio2\\Cache\\runtimes"; /* Using %systemdrive% here fixes the runtimes not being found when the system drive is not C:\\ */
         public bool AssetOrderSwappingEnabled { get; set; } = false;
         public bool ProfileModeEnabled { get; set; } = false;
-        public bool Warn_About_GMS23 { get; set; } = true;
         public bool UseGMLCache { get; set; } = false;
         public bool ProfileMessageShown { get; set; } = false;
         public bool AutomaticFileAssociation { get; set; } = true;

diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml b/UndertaleModTool/Windows/SettingsWindow.xaml
@@ -51,10 +51,8 @@
             <CheckBox Grid.Row="4" Grid.Column="2" Margin="3" Content="" IsChecked="{Binding TempRunMessageShow}"/>
             <TextBlock Grid.Row="4" Grid.Column="2" Margin="25 2 2 2" Text="Warn about temp running" ToolTip="Warn about temp running. Enabled by default."/>
 
-            <CheckBox Grid.Row="5" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding Warn_About_GMS23}"/>
-            <TextBlock Grid.Row="5" Grid.Column="0" Margin="25 2 2 2" Text="Warn about GMS 2.3" ToolTip="Warn about GMS 2.3. Enabled by default."/>
-            <CheckBox Grid.Row="5" Grid.Column="2" Margin="3" Content="" IsChecked="{Binding UseGMLCache}"/>
-            <TextBlock Grid.Row="5" Grid.Column="2" Margin="25 2 2 2" Text="Use decompiled code cache (experimental)" ToolTip="Used by some scripts (e.g. &quot;Search.csx&quot;) for acceleration. Disabled by default."/>
+            <CheckBox Grid.Row="5" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding UseGMLCache}"/>
+            <TextBlock Grid.Row="5" Grid.Column="0" Margin="25 2 2 2" Text="Use decompiled code cache (experimental)" ToolTip="Used by some scripts (e.g. &quot;Search.csx&quot;) for acceleration. Disabled by default."/>
 
             <Separator Grid.Row="6" Grid.ColumnSpan="4" Margin="10"/>
 

diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml.cs b/UndertaleModTool/Windows/SettingsWindow.xaml.cs
@@ -61,16 +61,6 @@ public static bool ProfileModeEnabled
             }
         }
 
-        public static bool Warn_About_GMS23
-        {
-            get => Settings.Instance.Warn_About_GMS23;
-            set
-            {
-                Settings.Instance.Warn_About_GMS23 = value;
-                Settings.Save();
-            }
-        }
-
         public static bool UseGMLCache
         {
             get => Settings.Instance.UseGMLCache;