piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

nJoy: Allow the same settings for the C-stick

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3722 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-07-09 07:58:36 +00:00
parent 722ee4cd06
commit 8d42378479
7 changed files with 154 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
View File

@ -81,6 +81,11 @@ void PADConfigDialognJoy::UpdateGUIButtonMapping(int controller)
m_CBRadius[controller]->SetValue(PadMapping[controller].bRadiusOnOff);
m_CoBDiagonal[controller]->SetValue(wxString::FromAscii(PadMapping[controller].SDiagonal.c_str()));
m_CBS_to_C[controller]->SetValue(PadMapping[controller].bSquareToCircle);
// C-stick
m_CoBRadiusC[controller]->SetValue(wxString::FromAscii(PadMapping[controller].SRadiusC.c_str()));
m_CBRadiusC[controller]->SetValue(PadMapping[controller].bRadiusOnOffC);
m_CoBDiagonalC[controller]->SetValue(wxString::FromAscii(PadMapping[controller].SDiagonalC.c_str()));
m_CBS_to_CC[controller]->SetValue(PadMapping[controller].bSquareToCircleC);
m_AdvancedMapFilter[controller]->SetValue(g_Config.bNoTriggerFilter);
// Update Rumble checkbox
m_Rumble[controller]->SetValue(PadMapping[controller].rumble);
@ -129,6 +134,11 @@ void PADConfigDialognJoy::SaveButtonMapping(int controller, bool DontChangeId, i
PadMapping[controller].bRadiusOnOff = m_CBRadius[FromSlot]->IsChecked();
PadMapping[controller].SDiagonal = m_CoBDiagonal[FromSlot]->GetLabel().mb_str();
PadMapping[controller].bSquareToCircle = m_CBS_to_C[FromSlot]->IsChecked();
// C-stick
PadMapping[controller].SRadiusC = m_CoBRadiusC[FromSlot]->GetLabel().mb_str();
PadMapping[controller].bRadiusOnOffC = m_CBRadiusC[FromSlot]->IsChecked();
PadMapping[controller].SDiagonalC = m_CoBDiagonalC[FromSlot]->GetLabel().mb_str();
PadMapping[controller].bSquareToCircleC = m_CBS_to_CC[FromSlot]->IsChecked();
// The analog buttons
m_JoyAnalogMainX[FromSlot]->GetValue().ToLong(&value); PadMapping[controller].axis[InputCommon::CTL_MAIN_X] = value; tmp.clear();