Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No more 2.3 warnings profile mode #1013

Merged
merged 3 commits into from
Jun 27, 2022
Merged

No more 2.3 warnings profile mode #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
975ae97
Remove GMS 2.3 checks for profile mode and GMS 2.3 warning upon loading
Grossley Jun 24, 2022
43ea788
Remove more gms2.3 warning code
Miepee Jun 27, 2022
60b11c8
Merge branch 'master' into no-more-2.3-warnings-profile-mode
Grossley Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions UndertaleModTool/ImportCodeSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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
{
Expand Down
4 changes: 0 additions & 4 deletions UndertaleModTool/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
6 changes: 0 additions & 6 deletions UndertaleModTool/ProfileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
1 change: 0 additions & 1 deletion UndertaleModTool/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions UndertaleModTool/Windows/SettingsWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
10 changes: 0 additions & 10 deletions UndertaleModTool/Windows/SettingsWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down