From 9786786c7eee679d534b9de832f98f1422dd0c41 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Sun, 28 Dec 2008 20:11:22 +0000 Subject: [PATCH] nJoy: Typo git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1708 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 4 ++-- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index e3833db171..73914eaf0f 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -732,8 +732,8 @@ void ConfigBox::CreateGUIControls() // -------------------------------------------------------------------- // Debugging // ----------------------------- - m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(100, 510), wxDefaultSize); - m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(100, 530), wxDefaultSize); + //m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(100, 510), wxDefaultSize); + //m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(100, 530), wxDefaultSize); //m_pStatusBar->SetLabel(wxString::Format("Debugging text")); // -------------------------------------------------------------------- diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp index b39a5678bd..fdd3e0f18f 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp @@ -50,8 +50,8 @@ The arrays joysticks[] and joystate[] are numbered 0 to 3 for the four different virtual controllers. Joysticks[].ID will have the number of the inputs device mapped to that controller, this value can be between 0 and the total number of connected physical devices. The mapping - is done by PAD_Initialize(), if we want to change that we have to run PAD_Shutdown() and then - run PAD_Initialize() again. + is initially done by PAD_Initialize(), but for the configuration we can remap them, like in + ConfigBox::ChangeJoystick(). The joyinfo[] array is for a certain physical device. It's therefore used as joyinfo[joysticks[controller].ID].