From 11f3ded2966726680908deb4505cad41da2938c1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 16 Aug 2015 00:58:15 -0400 Subject: NetPlay: Return mapping arrays and player list vectors directly Simplifies pad map dialog initialization --- Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp | 35 +++++++++++++++++--------- 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp') diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp index 5e6d3798cb..8fdd66903e 100644 --- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp +++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp @@ -8,13 +8,14 @@ #include "Core/NetPlayClient.h" #include "Core/NetPlayProto.h" +#include "Core/NetPlayServer.h" #include "DolphinWX/NetPlay/PadMapDialog.h" -PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimotemap[], std::vector& player_list) +PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client) : wxDialog(parent, wxID_ANY, _("Configure Pads")) - , m_mapping(map) - , m_wiimapping(wiimotemap) - , m_player_list(player_list) + , m_pad_mapping(server->GetPadMapping()) + , m_wii_mapping(server->GetWiimoteMapping()) + , m_player_list(client->GetPlayers()) { wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL); h_szr->AddSpacer(10); @@ -32,7 +33,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimot m_map_cbox[i] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); m_map_cbox[i]->Bind(wxEVT_CHOICE, &PadMapDialog::OnAdjust, this); - if (m_mapping[i] == -1) + if (m_pad_mapping[i] == -1) { m_map_cbox[i]->Select(0); } @@ -40,7 +41,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimot { for (unsigned int j = 0; j < m_player_list.size(); j++) { - if (m_mapping[i] == m_player_list[j]->pid) + if (m_pad_mapping[i] == m_player_list[j]->pid) m_map_cbox[i]->Select(j + 1); } } @@ -59,7 +60,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimot m_map_cbox[i + 4] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); m_map_cbox[i + 4]->Bind(wxEVT_CHOICE, &PadMapDialog::OnAdjust, this); - if (m_wiimapping[i] == -1) + if (m_wii_mapping[i] == -1) { m_map_cbox[i + 4]->Select(0); } @@ -67,7 +68,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimot { for (unsigned int j = 0; j < m_player_list.size(); j++) { - if (m_wiimapping[i] == m_player_list[j]->pid) + if (m_wii_mapping[i] == m_player_list[j]->pid) m_map_cbox[i + 4]->Select(j + 1); } } @@ -87,20 +88,30 @@ PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimot SetFocus(); } +PadMappingArray PadMapDialog::GetModifiedPadMappings() const +{ + return m_pad_mapping; +} + +PadMappingArray PadMapDialog::GetModifiedWiimoteMappings() const +{ + return m_wii_mapping; +} + void PadMapDialog::OnAdjust(wxCommandEvent& WXUNUSED(event)) { for (unsigned int i = 0; i < 4; i++) { int player_idx = m_map_cbox[i]->GetSelection(); if (player_idx > 0) - m_mapping[i] = m_player_list[player_idx - 1]->pid; + m_pad_mapping[i] = m_player_list[player_idx - 1]->pid; else - m_mapping[i] = -1; + m_pad_mapping[i] = -1; player_idx = m_map_cbox[i + 4]->GetSelection(); if (player_idx > 0) - m_wiimapping[i] = m_player_list[player_idx - 1]->pid; + m_wii_mapping[i] = m_player_list[player_idx - 1]->pid; else - m_wiimapping[i] = -1; + m_wii_mapping[i] = -1; } } -- cgit v1.2.3 From e939fba3e716f26b6ecb6f73edefa0fc2de80c1f Mon Sep 17 00:00:00 2001 From: Rukario Date: Thu, 3 Sep 2015 04:34:31 -0700 Subject: Updated terms in Netplay window. --- Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp') diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp index 8fdd66903e..4e3b382479 100644 --- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp +++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp @@ -12,7 +12,7 @@ #include "DolphinWX/NetPlay/PadMapDialog.h" PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client) - : wxDialog(parent, wxID_ANY, _("Configure Pads")) + : wxDialog(parent, wxID_ANY, _("Controller Ports")) , m_pad_mapping(server->GetPadMapping()) , m_wii_mapping(server->GetWiimoteMapping()) , m_player_list(client->GetPlayers()) @@ -28,7 +28,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien for (unsigned int i = 0; i < 4; ++i) { wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); - v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Pad ")) + (wxChar)('0' + i))), + v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("GC Port ")) + (wxChar)('1' + i))), 1, wxALIGN_CENTER_HORIZONTAL); m_map_cbox[i] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); @@ -55,7 +55,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien for (unsigned int i = 0; i < 4; ++i) { wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); - v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Wiimote ")) + (wxChar)('0' + i))), + v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Wiimote ")) + (wxChar)('1' + i))), 1, wxALIGN_CENTER_HORIZONTAL); m_map_cbox[i + 4] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names); -- cgit v1.2.3