Automatically connect the appropriate wiimotes in netplay. Extensions must still be set manually.

This commit is contained in:
Rachel Bryk 2013-09-23 02:56:17 -04:00
parent 96a77f9feb
commit 0bdef3932f
2 changed files with 7 additions and 1 deletions

View File

@ -502,6 +502,12 @@ bool NetPlayClient::StartGame(const std::string &path)
UpdateDevices(); 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. // Needed to prevent locking up at boot if (when) the wiimotes connect out of order.
NetWiimote nw; NetWiimote nw;
nw.resize(4, 0); nw.resize(4, 0);

View File

@ -107,7 +107,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
" - DSP Emulator Engine Must be the same on all computers!\n" " - DSP Emulator Engine Must be the same on all computers!\n"
" - DSP on Dedicated Thread [OFF]\n" " - DSP on Dedicated Thread [OFF]\n"
" - Framelimit NOT set to [Audio]\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" "\n"
"All players should use the same Dolphin version and settings.\n" "All players should use the same Dolphin version and settings.\n"
"All memory cards must be identical between players or disabled.\n" "All memory cards must be identical between players or disabled.\n"