From 6d70be9561f30ba74a9b8afa6854a9ea467df8af Mon Sep 17 00:00:00 2001 From: Fire Cube Date: Tue, 10 Jun 2025 21:00:12 +0200 Subject: [PATCH] more --- src/emulator.cpp | 5 ++--- src/emulator.h | 3 +-- src/main.cpp | 5 ++--- src/qt_gui/main.cpp | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/emulator.cpp b/src/emulator.cpp index 75812d87d..7e7dce565 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -63,8 +63,8 @@ Emulator::~Emulator() { Config::saveMainWindow(config_dir / "config.toml"); } -void Emulator::Run(std::filesystem::path file, const std::vector args, - bool ignore_game_patch) { +void Emulator::Run(std::filesystem::path file, const std::vector args + ) { if (std::filesystem::is_directory(file)) { file /= "eboot.bin"; } @@ -85,7 +85,6 @@ void Emulator::Run(std::filesystem::path file, const std::vector ar // Applications expect to be run from /app0 so mount the file's parent path as app0. auto* mnt = Common::Singleton::Instance(); - Core::FileSys::MntPoints::ignore_game_patches = ignore_game_patch; mnt->Mount(game_folder, "/app0", true); // Certain games may use /hostapp as well such as CUSA001100 diff --git a/src/emulator.h b/src/emulator.h index 4351fde98..257ccd694 100644 --- a/src/emulator.h +++ b/src/emulator.h @@ -25,8 +25,7 @@ public: Emulator(); ~Emulator(); - void Run(std::filesystem::path file, const std::vector args = {}, - bool ignore_game_patch = false); + void Run(std::filesystem::path file, const std::vector args = {}); void UpdatePlayTime(const std::string& serial); private: diff --git a/src/main.cpp b/src/main.cpp index 90af0c0c2..8a251c55a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,6 @@ int main(int argc, char* argv[]) { Config::load(user_dir / "config.toml"); bool has_game_argument = false; - bool ignore_game_patch = false; std::string game_path; std::vector game_args{}; @@ -75,7 +74,7 @@ int main(int argc, char* argv[]) { } }}, {"--patch", [&](int& i) { arg_map["-p"](i); }}, - {"-i", [&](int&) { ignore_game_patch = true; }}, + {"-i", [&](int&) { Core::FileSys::MntPoints::ignore_game_patches = true; }}, {"--ignore-game-patch", [&](int& i) { arg_map["-i"](i); }}, {"-f", [&](int& i) { @@ -190,7 +189,7 @@ int main(int argc, char* argv[]) { // Run the emulator with the resolved eboot path Core::Emulator emulator; - emulator.Run(eboot_path, game_args, ignore_game_patch); + emulator.Run(eboot_path, game_args); return 0; } diff --git a/src/qt_gui/main.cpp b/src/qt_gui/main.cpp index f2203ee93..b7de517e8 100644 --- a/src/qt_gui/main.cpp +++ b/src/qt_gui/main.cpp @@ -34,7 +34,6 @@ int main(int argc, char* argv[]) { bool has_command_line_argument = argc > 1; bool show_gui = false, has_game_argument = false; - bool ignore_game_patch = false; std::string game_path; std::vector game_args{}; @@ -87,7 +86,7 @@ int main(int argc, char* argv[]) { } }}, {"--patch", [&](int& i) { arg_map["-p"](i); }}, - {"-i", [&](int&) { ignore_game_patch = true; }}, + {"-i", [&](int&) { Core::FileSys::MntPoints::ignore_game_patches = true; }}, {"--ignore-game-patch", [&](int& i) { arg_map["-i"](i); }}, {"-f", [&](int& i) { @@ -206,7 +205,7 @@ int main(int argc, char* argv[]) { // Run the emulator with the resolved game path Core::Emulator emulator; - emulator.Run(game_file_path.string(), game_args, ignore_game_patch); + emulator.Run(game_file_path.string(), game_args); if (!show_gui) { return 0; // Exit after running the emulator without showing the GUI }