From cdf5490d56f02001fe79230a59fed76c60d69db7 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Wed, 6 May 2020 22:10:30 -0500 Subject: Core: Add support for specifying a command line option to boot the game into a save-state --- Source/Core/DolphinNoGUI/MainNoGUI.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinNoGUI/MainNoGUI.cpp') diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index 1278d46c40..0bf4df23b8 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -156,13 +156,21 @@ int main(int argc, char* argv[]) optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), argc, argv); std::vector args = parser->args(); + std::optional save_state_path; + if (options.is_set("save_state")) + { + save_state_path = static_cast(options.get("save_state")); + } + std::unique_ptr boot; + bool game_specified = false; if (options.is_set("exec")) { const std::list paths_list = options.all("exec"); const std::vector paths{std::make_move_iterator(std::begin(paths_list)), std::make_move_iterator(std::end(paths_list))}; - boot = BootParameters::GenerateFromFile(paths); + boot = BootParameters::GenerateFromFile(paths, save_state_path); + game_specified = true; } else if (options.is_set("nand_title")) { @@ -178,8 +186,9 @@ int main(int argc, char* argv[]) } else if (args.size()) { - boot = BootParameters::GenerateFromFile(args.front()); + boot = BootParameters::GenerateFromFile(args.front(), save_state_path); args.erase(args.begin()); + game_specified = true; } else { @@ -201,6 +210,12 @@ int main(int argc, char* argv[]) return 1; } + if (save_state_path && !game_specified) + { + fprintf(stderr, "A save state cannot be loaded without specifying a game to launch.\n"); + return 1; + } + Core::SetOnStateChangedCallback([](Core::State state) { if (state == Core::State::Uninitialized) s_platform->Stop(); -- cgit v1.2.3