piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert pr#3691

Browse Source 
https://github.com/dolphin-emu/dolphin/pull/3691
This commit is contained in:
mimimi085181
2016-06-26 10:44:15 +02:00
parent fcf5d4f6bc
commit 330289cf71
4 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/NetPlayClient.cpp
View File

@ -16,6 +16,7 @@
#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"
@ -712,6 +713,25 @@ bool NetPlayClient::StartGame(const std::string& path)
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);
// Needed to prevent locking up at boot if (when) the wiimotes connect out of order.
NetWiimote nw;
nw.resize(4, 0);
for (unsigned int w = 0; w < 4; ++w)
{
if (m_wiimote_map[w] != -1)
// probably overkill, but whatever
for (unsigned int i = 0; i < 7; ++i)
m_wiimote_buffer[w].Push(nw);
}
}
UpdateDevices();
return true;