diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-10 06:48:24 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-10 06:48:24 +0000 |
| commit | a0aa506453195d99d8b7e1c0297bb1e285428d0c (patch) | |
| tree | 21a19ab26075bb5bbcb5a630fc6fc87e9a162265 /Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp | |
| parent | 2bcdf4f5a476decb416a4947acc5472f9c011223 (diff) | |
GCPad/Wiimote New: Added a set defaults button to the config dialog. (gave new wiimote plugin a few default buttons, not done) Moved MSWindows cursor position code to ControllerInterface/DInput (plan on moving Linux's cursor code to Xlib as well). IR Up,Down,L,R now must have Cursor X/Y/-+ mapped for regular mouse control on Windows. (hopefully this isn't too confusing, the reset to default button automatically sets this up). Renamed One,Two,Minus,Plus to 12-+ (you will have to reconfigure these buttons, sorry). Added text labels for the button and trigger preview bitmaps. -other minor stuff.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5865 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp index 5523e7cfa8..1ae5b517af 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp @@ -9,7 +9,7 @@ namespace ciface namespace XInput { -struct +static struct { const char* const name; const WORD bitmask; @@ -31,13 +31,13 @@ struct { "Thumb R", XINPUT_GAMEPAD_RIGHT_THUMB } }; -const char* named_triggers[] = +static const char* const named_triggers[] = { "Trigger L", "Trigger R" }; -const char* named_axes[] = +static const char* const named_axes[] = { "Left X", "Left Y", @@ -45,7 +45,7 @@ const char* named_axes[] = "Right Y" }; -const char* named_motors[] = +static const char* const named_motors[] = { "Motor L", "Motor R" |