diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-09-23 02:56:17 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-09-23 02:56:17 -0400 |
| commit | 0bdef3932f0ba59b16bd7cab6f80ffddebe8f17b (patch) | |
| tree | 4b608d50ef4217f14ef581d5af000e2beb399818 /Source/Core | |
| parent | 96a77f9feb1b7feb915efa91582b73814b4e960d (diff) | |
Automatically connect the appropriate wiimotes in netplay. Extensions must still be set manually.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/NetPlayClient.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetWindow.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index ad498ff744..1c65de2b55 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -502,6 +502,12 @@ bool NetPlayClient::StartGame(const std::string &path) UpdateDevices(); + for (unsigned int i = 0; i < 4; ++i) + { + g_wiimote_sources[i] = m_wiimote_map[i] > 0 ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE; + GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(m_wiimote_map[i] > 0); + } + // Needed to prevent locking up at boot if (when) the wiimotes connect out of order. NetWiimote nw; nw.resize(4, 0); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 1ad5d57f1f..0de2ee684d 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -107,7 +107,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" - " - Manually set the exact number of wiimotes to be used to [Emulated Wiimote]\n" + " - Manually set the extensions for each wiimote\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" |