From 57c0134a21033946c7c070e62c947229fdf8dce4 Mon Sep 17 00:00:00 2001 From: goedzo Date: Mon, 17 Dec 2018 16:10:53 +0100 Subject: [PATCH] Merged to single commit on Controller_cmd_fix --- src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 2 +- src/yuzu/main.cpp | 5 +++++ src/yuzu_cmd/config.cpp | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index a5cfa0070b..1c063231ff 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -3916,4 +3916,4 @@ std::optional DecompileProgram(const ProgramCode& program_code, u return {}; } -} // namespace OpenGL::GLShader::Decompiler \ No newline at end of file +} // namespace OpenGL::GLShader::Decompiler diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 90b212ba5b..980b92f29c 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -199,6 +199,11 @@ GMainWindow::GMainWindow() QStringList args = QApplication::arguments(); if (args.length() >= 2) { BootGame(args[1]); + // Enter full screen mode + // Don't confirm closing + UISettings::values.confirm_before_closing = false; + ui.action_Single_Window_Mode->setData(true); + ShowFullscreen(); } } diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index fe0d1eebf5..158905b8a7 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -226,11 +226,12 @@ static const std::array keyboard_mods{ void Config::ReadValues() { // Controls for (std::size_t p = 0; p < Settings::values.players.size(); ++p) { - const auto group = fmt::format("ControlsP{}", p); + const auto group = fmt::format("Controls", p); for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); - Settings::values.players[p].buttons[i] = - sdl2_config->Get(group, Settings::NativeButton::mapping[i], default_param); + std::string controls_prefix = "player_" + std::to_string(p) + "_"; + Settings::values.players[p].buttons[i] = sdl2_config->Get( + group, controls_prefix + Settings::NativeButton::mapping[i], default_param); if (Settings::values.players[p].buttons[i].empty()) Settings::values.players[p].buttons[i] = default_param; }