diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp index 29413ada2c..fba3fb6097 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp @@ -5,7 +5,6 @@ #include "InputCommon/ControllerEmu/ControlGroup/Force.h" #include -#include #include #include @@ -19,8 +18,6 @@ namespace ControllerEmu { Force::Force(const std::string& name_) : ControlGroup(name_, GROUP_TYPE_FORCE) { - memset(m_swing, 0, sizeof(m_swing)); - controls.emplace_back(std::make_unique(_trans("Up"))); controls.emplace_back(std::make_unique(_trans("Down"))); controls.emplace_back(std::make_unique(_trans("Left"))); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h index 767009a1f8..f640b0d3b2 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" @@ -17,6 +18,6 @@ public: void GetState(ControlState* axis); private: - ControlState m_swing[3]; + std::array m_swing{}; }; } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp index 5481d92606..1aaeab15e0 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include @@ -19,8 +18,6 @@ namespace ControllerEmu { Tilt::Tilt(const std::string& name_) : ControlGroup(name_, GROUP_TYPE_TILT) { - memset(m_tilt, 0, sizeof(m_tilt)); - controls.emplace_back(std::make_unique("Forward")); controls.emplace_back(std::make_unique("Backward")); controls.emplace_back(std::make_unique("Left")); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h index 940d7d9722..78884f41ab 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" @@ -17,6 +18,6 @@ public: void GetState(ControlState* x, ControlState* y, bool step = true); private: - ControlState m_tilt[2]; + std::array m_tilt{}; }; } // namespace ControllerEmu