mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 12:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7580 from Techjar/netplay-padmapping-type

Browse source 
NetPlay: Remove PadMapping type
This commit is contained in:
Léo Lam 2019-01-16 21:57:38 +01:00 • committed by GitHub
commit c7373701cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
View file

@ -90,7 +90,7 @@ int PadMappingDialog::exec()
const auto index = gc ? m_pad_mapping[i] : m_wii_mapping[i];
combo->setCurrentIndex(index == -1 ? 0 : index);
combo->setCurrentIndex(index);
}
}
@ -114,7 +114,7 @@ void PadMappingDialog::OnMappingChanged()
int gc_id = m_gc_boxes[i]->currentIndex();
int wii_id = m_wii_boxes[i]->currentIndex();
m_pad_mapping[i] = gc_id > 0 ? m_players[gc_id - 1]->pid : -1;
m_wii_mapping[i] = wii_id > 0 ? m_players[wii_id - 1]->pid : -1;
m_pad_mapping[i] = gc_id > 0 ? m_players[gc_id - 1]->pid : 0;
m_wii_mapping[i] = wii_id > 0 ? m_players[wii_id - 1]->pid : 0;
}
}