diff options
| author | ayuanx <ayuanx@gmail.com> | 2009-12-09 15:29:39 +0000 |
|---|---|---|
| committer | ayuanx <ayuanx@gmail.com> | 2009-12-09 15:29:39 +0000 |
| commit | 0fa1f968c769e1c093bd2a1f2827f43354fe8b87 (patch) | |
| tree | f3b70b4e935981cc857dcbdc550a0ed3f604feac /Source/Core/InputCommon/Src | |
| parent | c9f98d8f2b57f93637bb0aaa9ed33e99dfdff722 (diff) | |
I think this should fix the "Wiimote sudden death after 15 min" issue, actually I announced this was a test in the log message of r4647, but it seems no one has noticed.
Added the missing file in last rev.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4664 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src')
| -rw-r--r-- | Source/Core/InputCommon/Src/SDL.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Source/Core/InputCommon/Src/SDL.h b/Source/Core/InputCommon/Src/SDL.h index 30f43a94df..e607b7b54d 100644 --- a/Source/Core/InputCommon/Src/SDL.h +++ b/Source/Core/InputCommon/Src/SDL.h @@ -169,14 +169,18 @@ enum }; -struct PadAxis +union PadAxis { - int Lx; - int Ly; - int Rx; - int Ry; - int Tl; // Triggers - int Tr; + int keyForControls[6]; + struct + { + int Lx; + int Ly; + int Rx; + int Ry; + int Tl; // Trigger + int Tr; // Trigger + }; }; struct PadWiimote { @@ -184,7 +188,6 @@ struct PadWiimote // Order is A, B, 1, 2, +, -, Home // L, R, U, D, RollL, RollR, PitchU, PitchD, Shake }; - struct PadNunchuck { int keyForControls[7]; @@ -201,7 +204,8 @@ struct PadGH3Controller { int keyForControls[14]; // Order is Green, Red, Yellow, Blue, Orange, - // +, -, Whammy, Al, Au, Ar, Ad, + // +, -, Whammy, + // Al, Ar, Au, Ad, // StrumUp, StrumDown }; struct CONTROLLER_STATE_NEW // GC PAD INFO/STATE |