mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-09 18:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automatically connect the appropriate controllers for netplay.

Browse Source
This commit is contained in:
Rachel Bryk 2013-07-19 15:53:20 -04:00
parent 0e1efd7d38
commit 919e54c695
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/SI.cpp
View File

@ -262,6 +262,8 @@ void Init()
if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
AddDevice(Movie::IsUsingPad(i) ? (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); AddDevice(Movie::IsUsingPad(i) ? (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
else if (NetPlay::GetNetPlayPtr())
AddDevice(NetPlay::IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i);
else else
AddDevice(SConfig::GetInstance().m_SIDevice[i], i); AddDevice(SConfig::GetInstance().m_SIDevice[i], i);
} }

5
Source/Core/Core/Src/NetPlay.cpp
View File

@ -391,3 +391,8 @@ NetPlay* NetPlay::GetNetPlayPtr()
{ {
return netplay_ptr; return netplay_ptr;
} }
bool NetPlay::IsUsingPad(int pad)
{
return netplay_ptr->m_local_player->pad_map[pad] != -1;
}

1
Source/Core/Core/Src/NetPlay.h
View File

@ -120,6 +120,7 @@ public:
u8 GetPadNum(u8 numPAD); u8 GetPadNum(u8 numPAD);
static NetPlay* GetNetPlayPtr(); static NetPlay* GetNetPlayPtr();
static bool IsUsingPad(int pad);
protected: protected:
//void GetBufferedPad(const u8 pad_nb, NetPad* const netvalues); //void GetBufferedPad(const u8 pad_nb, NetPad* const netvalues);