summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2017-02-11 20:18:02 -0500
committerLioncash <mathew1800@gmail.com>2017-02-11 20:22:42 -0500
commitdf3a4580ea64b46a8b4b756b404dae36bffdfabf (patch)
tree37dc6ffb89cea352fa8de94b56531740276b5fc3 /Source/Core/InputCommon
parent0e961776e68c66b2e05f01291ff455b814dec645 (diff)
Tilt: Use std::array for m_tilt
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp3
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h3
2 files changed, 2 insertions, 4 deletions
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 <algorithm>
#include <cmath>
-#include <cstring>
#include <memory>
#include <string>
@@ -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<Input>("Forward"));
controls.emplace_back(std::make_unique<Input>("Backward"));
controls.emplace_back(std::make_unique<Input>("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 <array>
#include <string>
#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<ControlState, 2> m_tilt{};
};
} // namespace ControllerEmu