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

Fully remove wii remote netplay UI code and remove reference to WiimoteReal in NetPlayClient.cpp

This commit is contained in:
Rukai 2016-03-01 21:44:44 +11:00
parent 8e1aff34df
commit 1b65adcd56
4 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@
#include "Core/HW/SI_DeviceGCController.h" #include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/Sram.h" #include "Core/HW/Sram.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
static const char* NETPLAY_VERSION = scm_rev_git_str; static const char* NETPLAY_VERSION = scm_rev_git_str;
@ -728,24 +727,6 @@ bool NetPlayClient::StartGame(const std::string &path)
UpdateDevices(); UpdateDevices();
if (SConfig::GetInstance().bWii)
{
for (unsigned int i = 0; i < 4; ++i)
WiimoteReal::ChangeWiimoteSource(i, m_wiimote_map[i] > 0 ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE);
// Needed to prevent locking up at boot if (when) the wiimotes connect out of order.
NetWiimote nw;
nw.resize(4, 0);
for (unsigned int w = 0; w < 4; ++w)
{
if (m_wiimote_map[w] != -1)
// probably overkill, but whatever
for (unsigned int i = 0; i < 7; ++i)
m_wiimote_buffer[w].Push(nw);
}
}
return true; return true;
} }

13
Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp
View File

@ -117,15 +117,12 @@ NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl
wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY, wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY,
_("ALERT:\n\n" _("ALERT:\n\n"
"Netplay will only work with the following settings:\n" "All players must use the same Dolphin version.\n"
" - DSP Emulator Engine Must be the same on all computers!\n" "All memory cards, SD cards and cheats must be identical between players or disabled.\n"
" - Manually set the extensions for each Wiimote\n" "If DSP LLE is used, DSP ROMs must be identical between players.\n"
"If connecting directly, the host must have the chosen UDP port open/forwarded!\n"
"\n" "\n"
"All players should use the same Dolphin version and settings.\n" "Wiimote support is broken in netplay and therefore disabled.\n"));
"All memory cards must be identical between players or disabled.\n"
"Wiimote support is probably terrible. Don't use it.\n"
"\n"
"If connecting directly, the host must have the chosen UDP port open/forwarded!\n"));
wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);

11
Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
View File

@ -67,11 +67,6 @@ PadMappingArray PadMapDialog::GetModifiedPadMappings() const
return m_pad_mapping; return m_pad_mapping;
} }
PadMappingArray PadMapDialog::GetModifiedWiimoteMappings() const
{
return m_wii_mapping;
}
void PadMapDialog::OnAdjust(wxCommandEvent& WXUNUSED(event)) void PadMapDialog::OnAdjust(wxCommandEvent& WXUNUSED(event))
{ {
for (unsigned int i = 0; i < 4; i++) for (unsigned int i = 0; i < 4; i++)
@ -81,11 +76,5 @@ void PadMapDialog::OnAdjust(wxCommandEvent& WXUNUSED(event))
m_pad_mapping[i] = m_player_list[player_idx - 1]->pid; m_pad_mapping[i] = m_player_list[player_idx - 1]->pid;
else else
m_pad_mapping[i] = -1; m_pad_mapping[i] = -1;
player_idx = m_map_cbox[i + 4]->GetSelection();
if (player_idx > 0)
m_wii_mapping[i] = m_player_list[player_idx - 1]->pid;
else
m_wii_mapping[i] = -1;
} }
} }

4
Source/Core/DolphinWX/NetPlay/PadMapDialog.h
View File

@ -20,13 +20,11 @@ public:
PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client); PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client);
PadMappingArray GetModifiedPadMappings() const; PadMappingArray GetModifiedPadMappings() const;
PadMappingArray GetModifiedWiimoteMappings() const;
private: private:
void OnAdjust(wxCommandEvent& event); void OnAdjust(wxCommandEvent& event);
wxChoice* m_map_cbox[8]; wxChoice* m_map_cbox[4];
PadMappingArray m_pad_mapping; PadMappingArray m_pad_mapping;
PadMappingArray m_wii_mapping;
std::vector<const Player*> m_player_list; std::vector<const Player*> m_player_list;
}; };