prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged to single commit on Controller_cmd_fix

Browse Source
This commit is contained in:
goedzo
2018-12-17 16:10:53 +01:00
parent 84823a3036
commit 57c0134a21
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@@ -3916,4 +3916,4 @@ std::optional<ProgramResult> DecompileProgram(const ProgramCode& program_code, u
return {}; return {};
} }
} // namespace OpenGL::GLShader::Decompiler } // namespace OpenGL::GLShader::Decompiler

5
src/yuzu/main.cpp
View File

@@ -199,6 +199,11 @@ GMainWindow::GMainWindow()
QStringList args = QApplication::arguments(); QStringList args = QApplication::arguments();
if (args.length() >= 2) { if (args.length() >= 2) {
BootGame(args[1]); 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();
} }
} }

7
src/yuzu_cmd/config.cpp
View File

@@ -226,11 +226,12 @@ static const std::array<int, 8> keyboard_mods{
void Config::ReadValues() { void Config::ReadValues() {
// Controls // Controls
for (std::size_t p = 0; p < Settings::values.players.size(); ++p) { 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) { for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
Settings::values.players[p].buttons[i] = std::string controls_prefix = "player_" + std::to_string(p) + "_";
sdl2_config->Get(group, Settings::NativeButton::mapping[i], default_param); 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()) if (Settings::values.players[p].buttons[i].empty())
Settings::values.players[p].buttons[i] = default_param; Settings::values.players[p].buttons[i] = default_param;
} }