diff options
| author | mimimi085181 <mimimi085181@gmail.com> | 2016-06-26 10:27:52 +0200 |
|---|---|---|
| committer | mimimi085181 <mimimi085181@gmail.com> | 2016-07-07 14:25:30 +0200 |
| commit | fcf5d4f6bcb1c728567fea8d76913d2a782e7e47 (patch) | |
| tree | 7a5cf7ed5fe9d1a722c838028f276abbfdc2eeaa /Source/Core | |
| parent | 3f03e2d5fe27f762f362b2a5010f778b26ed0ce6 (diff) | |
Revert pr#3802
https://github.com/dolphin-emu/dolphin/pull/3802
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/NetPlayClient.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index f2f9f3ace6..f214ce98fb 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -16,14 +16,12 @@ #include "Core/HW/SI_DeviceGCController.h" #include "Core/HW/Sram.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "Core/Movie.h" #include "InputCommon/GCAdapter.h" static std::mutex crit_netplay_client; static NetPlayClient* netplay_client = nullptr; -static std::array<int, 4> s_wiimote_sources_cache; NetSettings g_NetPlaySettings; // called from ---GUI--- thread @@ -714,17 +712,6 @@ bool NetPlayClient::StartGame(const std::string& path) m_dialog->BootGame(path); - // Disable wiimotes on game start - // TODO: remove this when re-implementing wiimote netplay - if (SConfig::GetInstance().bWii) - { - for (unsigned int i = 0; i < 4; ++i) - { - s_wiimote_sources_cache[i] = g_wiimote_sources[i]; - WiimoteReal::ChangeWiimoteSource(i, WIIMOTE_SRC_NONE); - } - } - UpdateDevices(); return true; @@ -1027,17 +1014,6 @@ bool NetPlayClient::StopGame() // stop game m_dialog->StopGame(); - // Restore wiimote settings on game stop - // TODO: remove this when re-implementing wiimote netplay - if (SConfig::GetInstance().bWii) - { - for (unsigned int i = 0; i < 4; ++i) - { - g_wiimote_sources[i] = s_wiimote_sources_cache[i]; - WiimoteReal::ChangeWiimoteSource(i, s_wiimote_sources_cache[i]); - } - } - return true; } |
