diff options
| author | 2020-12-01 11:47:37 -0800 | |
|---|---|---|
| committer | 2020-12-01 11:47:37 -0800 | |
| commit | 25f650e075c441798016d0e7a446a10ce82a2865 (patch) | |
| tree | 940e2a4754d9edc508ac75b70903a475b44c7132 /src/yuzu_cmd/config.cpp | |
| parent | Merge pull request #5047 from german77/MouseInput (diff) | |
| parent | Add multiple udp server support (diff) | |
| download | yuzu-25f650e075c441798016d0e7a446a10ce82a2865.tar.gz yuzu-25f650e075c441798016d0e7a446a10ce82a2865.tar.xz yuzu-25f650e075c441798016d0e7a446a10ce82a2865.zip | |
Merge pull request #4937 from german77/multiUDP
InputCommon: Add multiple udp server support
Diffstat (limited to 'src/yuzu_cmd/config.cpp')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index e1adbbf2b..34c9673bc 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -306,10 +306,8 @@ void Config::ReadValues() { | |||
| 306 | sdl2_config->GetInteger("ControlsGeneral", "touch_diameter_x", 15); | 306 | sdl2_config->GetInteger("ControlsGeneral", "touch_diameter_x", 15); |
| 307 | Settings::values.touchscreen.diameter_y = | 307 | Settings::values.touchscreen.diameter_y = |
| 308 | sdl2_config->GetInteger("ControlsGeneral", "touch_diameter_y", 15); | 308 | sdl2_config->GetInteger("ControlsGeneral", "touch_diameter_y", 15); |
| 309 | Settings::values.udp_input_address = | 309 | Settings::values.udp_input_servers = |
| 310 | sdl2_config->Get("Controls", "udp_input_address", InputCommon::CemuhookUDP::DEFAULT_ADDR); | 310 | sdl2_config->Get("Controls", "udp_input_address", InputCommon::CemuhookUDP::DEFAULT_SRV); |
| 311 | Settings::values.udp_input_port = static_cast<u16>(sdl2_config->GetInteger( | ||
| 312 | "Controls", "udp_input_port", InputCommon::CemuhookUDP::DEFAULT_PORT)); | ||
| 313 | 311 | ||
| 314 | std::transform(keyboard_keys.begin(), keyboard_keys.end(), | 312 | std::transform(keyboard_keys.begin(), keyboard_keys.end(), |
| 315 | Settings::values.keyboard_keys.begin(), InputCommon::GenerateKeyboardParam); | 313 | Settings::values.keyboard_keys.begin(), InputCommon::GenerateKeyboardParam); |