diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h index eec79ab4e2..874548f38a 100644 --- a/Source/Core/InputCommon/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu.h @@ -121,6 +121,7 @@ public: class AnalogStick : public ControlGroup { public: + AnalogStick(const char* const _name); template void GetState(C* const x, C* const y, const unsigned int base, const unsigned int range) @@ -178,9 +179,6 @@ public: *y = C(yy * range + base); *x = C(xx * range + base); } - - AnalogStick(const char* const _name); - }; class Buttons : public ControlGroup @@ -205,6 +203,7 @@ public: class MixedTriggers : public ControlGroup { public: + MixedTriggers(const std::string& _name); template void GetState(C* const digital, const C* bitmasks, S* analog, const unsigned int range) @@ -223,14 +222,12 @@ public: } } } - - MixedTriggers(const std::string& _name); - }; class Triggers : public ControlGroup { public: + Triggers(const std::string& _name); template void GetState(S* analog, const unsigned int range) @@ -240,14 +237,12 @@ public: for (unsigned int i=0; icontrol_ref->State() - deadzone, 0.0f) / (1 - deadzone) * range); } - - Triggers(const std::string& _name); - }; class Slider : public ControlGroup { public: + Slider(const std::string& _name); template void GetState(S* const slider, const unsigned int range, const unsigned int base = 0) @@ -260,9 +255,6 @@ public: else *slider = 0; } - - Slider(const std::string& _name); - }; class Force : public ControlGroup