diff options
| author | mimimi085181 <mimimi085181@gmail.com> | 2016-06-26 10:44:15 +0200 |
|---|---|---|
| committer | mimimi085181 <mimimi085181@gmail.com> | 2016-07-08 20:23:32 +0200 |
| commit | 330289cf7111753dc999333b3f9f1d2af2186a41 (patch) | |
| tree | 2eb47ec69c13858b947f2a7f3d66671e84de96ca /Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp | |
| parent | fcf5d4f6bcb1c728567fea8d76913d2a782e7e47 (diff) | |
Revert pr#3691
https://github.com/dolphin-emu/dolphin/pull/3691
Diffstat (limited to 'Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp index 0eeda464cd..38fb4233fa 100644 --- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp +++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp @@ -66,6 +66,11 @@ 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++) @@ -75,5 +80,11 @@ void PadMapDialog::OnAdjust(wxCommandEvent& WXUNUSED(event)) m_pad_mapping[i] = m_player_list[player_idx - 1]->pid; else 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; } } |
