Enable Vanguard patcher by default

LeagueToolkit · May 1, 2024 · ca75917 · ca75917
1 parent 81c9c2e
commit ca75917
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/cslol-tools/lib/lol/patcher/patcher_win32.cpp b/cslol-tools/lib/lol/patcher/patcher_win32.cpp
@@ -324,11 +324,8 @@ auto patcher::run(std::function<void(Message, char const*)> update,
                   fs::path const& game_path,
                   fs::names const& opts) -> void {
     lol_throw_if(skinhack_detected());
-    for (auto const& o : opts) {
-        if (o == "dllpatcher") {
-            if (new_patcher(std::move(update), profile_path, config_path, game_path, opts)) return;
-        }
-    }
+    if (new_patcher(std::move(update), profile_path, config_path, game_path, opts)) return;
+
     auto ctx = Context{};
     ctx.set_prefix(profile_path);
     ctx.kernel32 = Kernel32::load();
@@ -417,6 +414,12 @@ static auto new_patcher(std::function<void(Message, char const*)> update,
                         fs::path const& config_path,
                         fs::path const& game_path,
                         fs::names const& opts) -> bool {
+    for (auto const& o : opts) {
+        if (o == "oldpatcher") {
+            return false;
+        }
+    }
+
     // Initialize first proces.
     lol_throw_if(cslol_init());
     lol_throw_if(cslol_set_flags(CSLOL_HOOK_DISALBE_NONE));

diff --git a/src/CSLOLTools.h b/src/CSLOLTools.h
@@ -54,7 +54,7 @@ class CSLOLTools : public QObject {
     void deleteMod(QString name);
     void exportMod(QString name, QString dest);
     void installFantomeZip(QString path);
-    void saveProfile(QString name, QJsonObject mods, bool run, bool skipConflict, bool experimentalDll);
+    void saveProfile(QString name, QJsonObject mods, bool run, bool skipConflict, bool oldPatcher);
     void loadProfile(QString name);
     void deleteProfile(QString name);
     void stopProfile();

diff --git a/src/CSLOLToolsImpl.cpp b/src/CSLOLToolsImpl.cpp
@@ -510,7 +510,7 @@ void CSLOLToolsImpl::doUpdate(QString urls) {
     }
 }
 
-void CSLOLToolsImpl::saveProfile(QString name, QJsonObject mods, bool run, bool skipConflict, bool experimentalDll) {
+void CSLOLToolsImpl::saveProfile(QString name, QJsonObject mods, bool run, bool skipConflict, bool oldPatcher) {
     if (state_ == CSLOLState::StateIdle) {
         setState(CSLOLState::StateBusy);
 
@@ -541,7 +541,7 @@ void CSLOLToolsImpl::saveProfile(QString name, QJsonObject mods, bool run, bool
                         prog_ + "/profiles/" + name,
                         prog_ + "/profiles/" + name + ".config",
                         "--game:" + game_,
-                        "--opts:" + QString(experimentalDll ? "dllpatcher" : "none"),
+                        "--opts:" + QString(oldPatcher ? "oldpatcher" : "none"),
                     });
                 } else {
                     setState(CSLOLState::StateIdle);

diff --git a/src/CSLOLToolsImpl.h b/src/CSLOLToolsImpl.h
@@ -60,7 +60,7 @@ public slots:
     void deleteMod(QString name);
     void exportMod(QString name, QString dest);
     void installFantomeZip(QString path);
-    void saveProfile(QString name, QJsonObject mods, bool run, bool skipConflict, bool experimentalDll);
+    void saveProfile(QString name, QJsonObject mods, bool run, bool skipConflict, bool oldPatcher);
     void loadProfile(QString name);
     void deleteProfile(QString name);
     void stopProfile();

diff --git a/src/qml/CSLOLDialogSettings.qml b/src/qml/CSLOLDialogSettings.qml
@@ -30,7 +30,7 @@ Dialog {
     property alias enableSystray: enableSystrayCheck.checked
     property alias enableAutoRun: enableAutoRunCheck.checked
     property alias updateUrls: updateUrlsTextArea.text
-     property alias experimentalDll: experimentalDllCheck.checked
+    property alias oldPatcher: oldPatcherCheck.checked
 
     property var colors_LIST: [
         "Red",
@@ -117,8 +117,8 @@ Dialog {
                     Layout.fillWidth: true
                 }
                 Switch {
-                    id: experimentalDllCheck
-                    text: qsTr("Experimental dll patcher(might result in bans)")
+                    id: oldPatcherCheck
+                    text: qsTr("Old patcher(does NOT work with Vanguard)")
                     checked: false
                     Layout.fillWidth: true
                 }

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -31,7 +31,7 @@ ApplicationWindow {
         property alias themeDarkMode: cslolDialogSettings.themeDarkMode
         property alias themePrimaryColor: cslolDialogSettings.themePrimaryColor
         property alias themeAccentColor: cslolDialogSettings.themeAccentColor
-        property alias experimentalDll: cslolDialogSettings.experimentalDll
+        property alias oldPatcher: cslolDialogSettings.oldPatcher
 
         property alias removeUnknownNames: cslolDialogEditMod.removeUnknownNames
         property alias lastZipDirectory: cslolDialogOpenZipFantome.folder
@@ -98,7 +98,7 @@ ApplicationWindow {
             let name = cslolToolBar.profilesCurrentName
             let mods = cslolModsView.saveProfile()
             if (checkGamePath()) {
-                cslolTools.saveProfile(name, mods, run, settings.suppressInstallConflicts, settings.experimentalDll)
+                cslolTools.saveProfile(name, mods, run, settings.suppressInstallConflicts, settings.oldPatcher)
             }
         }