ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1146 from RachelBryk/netplay-input-display 

Make input display work properly with netplay.
This commit is contained in:
skidau 2014-09-27 13:25:01 +10:00
parent 943383c30e e4d71f36b1
commit f5bbfa139d
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/SI.cpp
View File

@ -502,6 +502,14 @@ void UpdateDevices()
UpdateInterrupts(); UpdateInterrupts();
} }
SIDevices GetDeviceType(int channel)
{
if (channel < 0 || channel > 4)
return SIDEVICE_NONE;
else
return g_Channel[channel].m_pDevice->GetDeviceType();
}
void RunSIBuffer() void RunSIBuffer()
{ {
// Math inLength // Math inLength

2
Source/Core/Core/HW/SI.h
View File

@ -35,6 +35,8 @@ void AddDevice(ISIDevice* pDevice);
void ChangeDeviceCallback(u64 userdata, int cyclesLate); void ChangeDeviceCallback(u64 userdata, int cyclesLate);
void ChangeDevice(SIDevices device, int channel); void ChangeDevice(SIDevices device, int channel);
SIDevices GetDeviceType(int channel);
int GetTicksToNextSIPoll(); int GetTicksToNextSIPoll();
} // end of namespace SerialInterface } // end of namespace SerialInterface

2
Source/Core/Core/Movie.cpp
View File

@ -117,7 +117,7 @@ std::string GetInputDisplay()
s_numPads = 0; s_numPads = 0;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) if (SerialInterface::GetDeviceType(i) != SIDEVICE_NONE)
s_numPads |= (1 << i); s_numPads |= (1 << i);
if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
s_numPads |= (1 << (i + 4)); s_numPads |= (1 << (i + 4));