sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move more logic from frontend to base HostInterface

Browse Source
This commit is contained in:
Connor McLaughlin
2020-02-16 00:14:28 +09:00
parent f0578bb932
commit fd8ed08307
17 changed files with 539 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/duckstation-sdl/main.cpp
View File

@ -15,28 +15,26 @@ static int Run(int argc, char* argv[])
}
// parameters
const char* filename = nullptr;
const char* exp1_filename = nullptr;
std::string state_filename;
std::optional<s32> state_index;
const char* boot_filename = nullptr;
for (int i = 1; i < argc; i++)
{
#define CHECK_ARG(str) !std::strcmp(argv[i], str)
#define CHECK_ARG_PARAM(str) (!std::strcmp(argv[i], str) && ((i + 1) < argc))
if (CHECK_ARG_PARAM("-state"))
state_filename = SDLHostInterface::GetSaveStateFilename(std::strtoul(argv[++i], nullptr, 10));
else if (CHECK_ARG_PARAM("-exp1"))
exp1_filename = argv[++i];
state_index = std::atoi(argv[++i]);
if (CHECK_ARG_PARAM("-resume"))
state_index = -1;
else
filename = argv[i];
boot_filename = argv[i];
#undef CHECK_ARG
#undef CHECK_ARG_PARAM
}
// create display and host interface
std::unique_ptr<SDLHostInterface> host_interface =
SDLHostInterface::Create(filename, exp1_filename, state_filename.empty() ? nullptr : state_filename.c_str());
std::unique_ptr<SDLHostInterface> host_interface = SDLHostInterface::Create();
if (!host_interface)
{
Panic("Failed to create host interface");
@ -44,6 +42,17 @@ static int Run(int argc, char* argv[])
return -1;
}
// boot/load state
if (boot_filename)
{
if (host_interface->BootSystemFromFile(boot_filename) && state_index.has_value())
host_interface->LoadState(false, state_index.value());
}
else if (state_index.has_value())
{
host_interface->LoadState(true, state_index.value());
}
// run
host_interface->Run();