diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-09-01 15:24:29 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-09-01 15:24:29 -0400 |
| commit | d84312c799816e8835e6bed562f216bf19725761 (patch) | |
| tree | 92125c2902588d1312abb5895b799f9fa4a3d2ac /Source/Core/DolphinWX/Src/NetWindow.cpp | |
| parent | fae0c860f6c5d73ec3f92051904554e2d8688e9d (diff) | |
| parent | c092c65d4a8e7529c06add2b20e25144bd40c02f (diff) | |
Merge branch 'master' of https://code.google.com/p/dolphin-emu into android-core-control
Diffstat (limited to 'Source/Core/DolphinWX/Src/NetWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetWindow.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 7d50f42905..7bf3d9816d 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -107,7 +107,6 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* " - DSP Emulator Engine Must be the same on all computers!\n" " - DSP on Dedicated Thread [OFF]\n" " - Framelimit NOT set to [Audio]\n" - " - Manually set the exact number of controllers to be used to [Standard Controller]\n" "\n" "All players should use the same Dolphin version and settings.\n" "All memory cards must be identical between players or disabled.\n" @@ -405,9 +404,6 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings) settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; settings.m_DSPEnableJIT = instance.m_EnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); - - for (unsigned int i = 0; i < 4; ++i) - settings.m_Controllers[i] = SConfig::GetInstance().m_SIDevice[i]; } std::string NetPlayDiag::FindGame() |