ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into canary

This commit is contained in:
illusion98 2019-09-15 03:25:21 -05:00
parent d11ca52c21 f748e5af49
commit 7a7c44b0b7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xenia/emulator.cc
View File

@ -47,6 +47,12 @@
DEFINE_double(time_scalar, 1.0, DEFINE_double(time_scalar, 1.0,
"Scalar used to speed or slow time (1x, 2x, 1/2x, etc).", "Scalar used to speed or slow time (1x, 2x, 1/2x, etc).",
"General"); "General");
DEFINE_string(
launch_module, "",
"Executable to launch from the .iso or the package instead of default.xex "
"or the module specified by the game. Leave blank to launch the default "
"module.",
"General");
namespace xe { namespace xe {
@ -606,6 +612,11 @@ void Emulator::WaitUntilExit() {
std::string Emulator::FindLaunchModule() { std::string Emulator::FindLaunchModule() {
std::string path("game:\\"); std::string path("game:\\");
if (!cvars::launch_module.empty()) {
return path + cvars::launch_module;
}
std::string default_module("default.xex"); std::string default_module("default.xex");
auto gameinfo_entry(file_system_->ResolvePath(path + "GameInfo.bin")); auto gameinfo_entry(file_system_->ResolvePath(path + "GameInfo.bin"));