From 1a99e70ed78acb30719eb3c11f8f2e71185e89b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 11 Feb 2017 20:21:43 -0500 Subject: [PATCH] Force: Use std::array for m_swing --- Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp | 3 --- Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) 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