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

Merge pull request #5105 from lioncash/namespace

Browse Source 
EXI: Namespace device classes
This commit is contained in:
Mat M
2017-04-08 17:12:56 -04:00
committed by GitHub
parent f09d17f40f 44fb429e7e
commit ab18eba9de
37 changed files with 156 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,9 +418,9 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
int tmp;
packet >> tmp;
g_NetPlaySettings.m_EXIDevice[0] = (TEXIDevices)tmp;
g_NetPlaySettings.m_EXIDevice[0] = static_cast<ExpansionInterface::TEXIDevices>(tmp);
packet >> tmp;
g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices)tmp;
g_NetPlaySettings.m_EXIDevice[1] = static_cast<ExpansionInterface::TEXIDevices>(tmp);
u32 time_low, time_high;
packet >> time_low;
@ -1279,7 +1279,7 @@ bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size,
// so all players' games get the same time
//
// also called from ---GUI--- thread when starting input recording
u64 CEXIIPL::NetPlay_GetEmulatedTime()
u64 ExpansionInterface::CEXIIPL::NetPlay_GetEmulatedTime()
{
std::lock_guard<std::mutex> lk(crit_netplay_client);