mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 11:02:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

nJoy: Forgot the header file

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1956 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-20 14:32:15 +00:00
parent 1386ad69ff
commit 85a53457de
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ static const char* DPadType[] =
static const char* TriggerType[] = static const char* TriggerType[] =
{ {
"SDL", // -0x8000 to 0x7fff "SDL", // -0x8000 to 0x7fff
"XInput", // 0 to 0xff "XInput", // 0x00 to 0xff
}; };
//////////////////////// ////////////////////////
@ -406,7 +406,7 @@ void ConfigBox::UpdateGUI(int _notebookpage)
// Controller type settings // Controller type settings
m_Controller[_notebookpage]->FindItem(IDC_DEADZONE)->Enable(Enabled); m_Controller[_notebookpage]->FindItem(IDC_DEADZONE)->Enable(Enabled);
m_Controller[_notebookpage]->FindItem(IDC_CONTROLTYPE)->Enable(Enabled); m_Controller[_notebookpage]->FindItem(IDC_CONTROLTYPE)->Enable(Enabled);
m_Controller[_notebookpage]->FindItem(IDC_TRIGGERTYPE)->Enable(Enabled && AnalogTrigger && XInput); m_Controller[_notebookpage]->FindItem(IDC_TRIGGERTYPE)->Enable(Enabled && XInput);
m_Controller[_notebookpage]->FindItem(IDCB_MAINSTICK_DIAGONAL)->Enable(Enabled); m_Controller[_notebookpage]->FindItem(IDCB_MAINSTICK_DIAGONAL)->Enable(Enabled);
m_Controller[_notebookpage]->FindItem(IDCB_MAINSTICK_S_TO_C)->Enable(Enabled); m_Controller[_notebookpage]->FindItem(IDCB_MAINSTICK_S_TO_C)->Enable(Enabled);
#endif #endif

4
Source/Plugins/Plugin_nJoy_SDL/Src/XInput.h
View File

@ -19,6 +19,7 @@
// //
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
#ifdef _WIN32
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Includes // Includes
@ -27,6 +28,7 @@
////////////////////////////// //////////////////////////////
namespace XInput namespace XInput
{ {
@ -39,3 +41,5 @@ bool IsConnected(int Controller);
////////////////////////////// //////////////////////////////
} // XInput } // XInput
#endif