From ba63017f30e3ae2edbe9167ea1c67839c231a769 Mon Sep 17 00:00:00 2001 From: BitsOfAByte <19539165+BitsOfAByte@users.noreply.github.com> Date: Sun, 15 Jan 2023 22:18:31 +0000 Subject: [PATCH] feat: launch without 3rd-party plugins option --- src/XIVLauncher.Core/Components/MainPage/LoginAction.cs | 1 + src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs | 7 +++++++ src/XIVLauncher.Core/Components/MainPage/MainPage.cs | 2 +- src/XIVLauncher.Core/Components/MainPage/NewsFrame.cs | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/XIVLauncher.Core/Components/MainPage/LoginAction.cs b/src/XIVLauncher.Core/Components/MainPage/LoginAction.cs index 3dcba188..8afd3bc8 100644 --- a/src/XIVLauncher.Core/Components/MainPage/LoginAction.cs +++ b/src/XIVLauncher.Core/Components/MainPage/LoginAction.cs @@ -4,6 +4,7 @@ public enum LoginAction { Game, GameNoDalamud, + GameNoThirdparty, GameNoLaunch, Repair, Fake, diff --git a/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs b/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs index a66aa10a..aac7ae2e 100644 --- a/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs +++ b/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs @@ -117,6 +117,13 @@ public override void Draw() ImGui.Separator(); + if (ImGui.MenuItem("Launch without 3rd-party plugins")) + { + this.OnLogin?.Invoke(LoginAction.GameNoThirdparty); + } + + ImGui.Separator(); + if (ImGui.MenuItem("Patch without launching")) { this.OnLogin?.Invoke(LoginAction.GameNoLaunch); diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs index cbb3fb42..63d0c465 100644 --- a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs +++ b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs @@ -373,7 +373,7 @@ private async Task TryProcessLoginResult(Launcher.LoginResult loginResult, try { - using var process = await StartGameAndAddon(loginResult, isSteam, action == LoginAction.GameNoDalamud, false).ConfigureAwait(false); + using var process = await StartGameAndAddon(loginResult, isSteam, action == LoginAction.GameNoDalamud, action == LoginAction.GameNoThirdparty).ConfigureAwait(false); if (process is null) throw new Exception("Could not obtain Process Handle"); diff --git a/src/XIVLauncher.Core/Components/MainPage/NewsFrame.cs b/src/XIVLauncher.Core/Components/MainPage/NewsFrame.cs index cf0af30b..7cd46fb8 100644 --- a/src/XIVLauncher.Core/Components/MainPage/NewsFrame.cs +++ b/src/XIVLauncher.Core/Components/MainPage/NewsFrame.cs @@ -107,7 +107,7 @@ void ShowNewsEntry(News newsEntry) } else { - ImGui.Text("News are loading..."); + ImGui.Text("News is loading..."); } ImGui.PopStyleVar();