diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-02-09 19:26:15 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-02-09 19:26:15 -0600 |
| commit | 8d25e12085b8e3785a9843a8ffb5545eeb109107 (patch) | |
| tree | 9f3249d978d826f38767961ca3d30cb53e08f158 /Source/Core/InputCommon/ControllerInterface | |
| parent | 28b5c8be47c5afb18c021f10b24ad1423b20a8fc (diff) | |
| parent | ebb48d019eec1c29a37a406e2db16d7565367faa (diff) | |
Merge pull request #54 from lioncash/cleanup
Cleanup mismatching struct/enum indentations.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDL.h | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp index 04f2bb505f..0c4f026a9e 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp @@ -22,14 +22,14 @@ typedef struct static const ForceType force_type_names[] = { - {GUID_ConstantForce, "Constant"}, // DICONSTANTFORCE - {GUID_RampForce, "Ramp"}, // DIRAMPFORCE - {GUID_Square, "Square"}, // DIPERIODIC ... + {GUID_ConstantForce, "Constant"}, // DICONSTANTFORCE + {GUID_RampForce, "Ramp"}, // DIRAMPFORCE + {GUID_Square, "Square"}, // DIPERIODIC ... {GUID_Sine, "Sine"}, {GUID_Triangle, "Triangle"}, {GUID_SawtoothUp, "Sawtooth Up"}, {GUID_SawtoothDown, "Sawtooth Down"}, - //{GUID_Spring, "Spring"}, // DICUSTOMFORCE ... < I think + //{GUID_Spring, "Spring"}, // DICUSTOMFORCE ... < I think //{GUID_Damper, "Damper"}, //{GUID_Inertia, "Inertia"}, //{GUID_Friction, "Friction"}, diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index f1714b253e..02c7e6d5d0 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -34,9 +34,9 @@ private: { EffectIDState() : effect(SDL_HapticEffect()), id(-1), changed(false) {} - SDL_HapticEffect effect; - int id; - bool changed; + SDL_HapticEffect effect; + int id; + bool changed; }; #endif @@ -141,13 +141,13 @@ public: std::string GetSource() const override; private: - SDL_Joystick* const m_joystick; - const int m_sdl_index; - const unsigned int m_index; + SDL_Joystick* const m_joystick; + const int m_sdl_index; + const unsigned int m_index; #ifdef USE_SDL_HAPTIC - std::list<EffectIDState> m_state_out; - SDL_Haptic* m_haptic; + std::list<EffectIDState> m_state_out; + SDL_Haptic* m_haptic; #endif }; |