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

nJoy: Config fix

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1791 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-01-05 06:35:59 +00:00
parent d6ad009d7a
commit 6517f80316
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp
View File

@ -80,7 +80,7 @@ void ConfigBox::PadGetStatus()
// Get adjusted values
int main_x_after = main_x, main_y_after = main_y;
if(g_Config.bSquareToCircle)
if(g_Config.bSquareToCircle.at(notebookpage))
{
std::vector<int> main_xy = Pad_Square_to_Circle(main_x, main_y);
main_x_after = main_xy.at(0);

6
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -225,7 +225,7 @@ void ConfigBox::ChangeSettings( wxCommandEvent& event )
g_Config.SDiagonal = m_CoBDiagonal[notebookpage]->GetLabel().mb_str();
case IDCB_MAINSTICK_S_TO_C:
g_Config.bSquareToCircle = m_CBS_to_C[notebookpage]->IsChecked();
g_Config.bSquareToCircle.at(notebookpage) = m_CBS_to_C[notebookpage]->IsChecked();
}
}
@ -265,8 +265,8 @@ void ConfigBox::DoEnableDisable(int _notebookpage)
m_CBShowAdvanced[_notebookpage]->SetValue(g_Config.bShowAdvanced);
// Advanced settings
m_CoBDiagonal[notebookpage]->SetValue(wxString::FromAscii(g_Config.SDiagonal.c_str()));
m_CBS_to_C[notebookpage]->SetValue(g_Config.bSquareToCircle);
m_CoBDiagonal[_notebookpage]->SetValue(wxString::FromAscii(g_Config.SDiagonal.c_str()));
m_CBS_to_C[_notebookpage]->SetValue(g_Config.bSquareToCircle.at(_notebookpage));
m_Controller[_notebookpage]->Refresh(); // Repaint the background