no gui working

This commit is contained in:
R2DLiu 2020-07-17 17:37:40 -04:00
commit f57a7c0554
2 changed files with 10 additions and 1 deletions

View file

@ -1870,7 +1870,7 @@ void CEXISlippi::prepareOnlineMatchState()
// Turn pause on in direct, off in everything else // Turn pause on in direct, off in everything else
u8* gameBitField3 = (u8*)& onlineMatchBlock[2]; u8* gameBitField3 = (u8*)& onlineMatchBlock[2];
auto directMode = SlippiMatchmaking::OnlinePlayMode::DIRECT; directMode = SlippiMatchmaking::OnlinePlayMode::DIRECT;
*gameBitField3 = lastSearch.mode == directMode ? *gameBitField3 & 0xF7 : *gameBitField3 | 0x8; *gameBitField3 = lastSearch.mode == directMode ? *gameBitField3 & 0xF7 : *gameBitField3 | 0x8;
} }

View file

@ -20,6 +20,7 @@
#include "Core/Analytics.h" #include "Core/Analytics.h"
#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
#include "Core/BootManager.h" #include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Host.h" #include "Core/Host.h"
@ -158,6 +159,7 @@ int main(int argc, char* argv[])
}); });
optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), argc, argv); optparse::Values& options = CommandLineParse::ParseArguments(parser.get(), argc, argv);
std::vector<std::string> args = parser->args(); std::vector<std::string> args = parser->args();
std::optional<std::string> save_state_path; std::optional<std::string> save_state_path;
@ -207,6 +209,13 @@ int main(int argc, char* argv[])
UICommon::SetUserDirectory(user_directory); UICommon::SetUserDirectory(user_directory);
UICommon::Init(); UICommon::Init();
std::optional<std::string> slippi_input_path;
if (options.is_set("slippi_input"))
{
slippi_input_path = static_cast<const char*>(options.get("slippi_input"));
SConfig::GetInstance().m_strSlippiInput = slippi_input_path.value();
}
s_platform = GetPlatform(options); s_platform = GetPlatform(options);
if (!s_platform || !s_platform->Init()) if (!s_platform || !s_platform->Init())
{ {