Netplay: Change Wiimote sources before booting

It is kind of silly to connect all of the configured Wii remotes (from
the user config; NOT netplay assigned remotes), then connect/disconnect
additional Wii remotes *after* the core has booted.

(The bWii check has been removed, because it's actually unneeded;
m_wiimote_map is always usable regardless of bWii. And we can't get
info about the currently running game without booting the core with our
current config system…)

This should fix Netplay trying to connect all configured Wii remotes.
This commit is contained in:
Léo Lam 2017-02-22 22:50:05 +01:00
parent 95b2b033b0
commit fb46520c74
1 changed files with 3 additions and 8 deletions

View File

@ -820,17 +820,12 @@ bool NetPlayClient::StartGame(const std::string& path)
Movie::BeginRecordingInput(controllers_mask);
}
for (unsigned int i = 0; i < 4; ++i)
WiimoteReal::ChangeWiimoteSource(i, m_wiimote_map[i] > 0 ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE);
// boot game
m_dialog->BootGame(path);
if (SConfig::GetInstance().bWii)
{
for (unsigned int i = 0; i < 4; ++i)
WiimoteReal::ChangeWiimoteSource(i,
m_wiimote_map[i] > 0 ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE);
}
UpdateDevices();
return true;