Merge pull request #1146 from RachelBryk/netplay-input-display
Make input display work properly with netplay.
This commit is contained in:
commit
f5bbfa139d
|
@ -502,6 +502,14 @@ void UpdateDevices()
|
|||
UpdateInterrupts();
|
||||
}
|
||||
|
||||
SIDevices GetDeviceType(int channel)
|
||||
{
|
||||
if (channel < 0 || channel > 4)
|
||||
return SIDEVICE_NONE;
|
||||
else
|
||||
return g_Channel[channel].m_pDevice->GetDeviceType();
|
||||
}
|
||||
|
||||
void RunSIBuffer()
|
||||
{
|
||||
// Math inLength
|
||||
|
|
|
@ -35,6 +35,8 @@ void AddDevice(ISIDevice* pDevice);
|
|||
void ChangeDeviceCallback(u64 userdata, int cyclesLate);
|
||||
void ChangeDevice(SIDevices device, int channel);
|
||||
|
||||
SIDevices GetDeviceType(int channel);
|
||||
|
||||
int GetTicksToNextSIPoll();
|
||||
|
||||
} // end of namespace SerialInterface
|
||||
|
|
|
@ -117,7 +117,7 @@ std::string GetInputDisplay()
|
|||
s_numPads = 0;
|
||||
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);
|
||||
if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
|
||||
s_numPads |= (1 << (i + 4));
|
||||
|
|
Loading…
Reference in New Issue