Permalink
Browse files

HotkeyManager: Use std::array where applicable

  • Loading branch information...
lioncash committed Jun 14, 2018
1 parent aae06f1 commit d22d32372e5686052f2fad34c0a3ca461916f145
Showing with 6 additions and 7 deletions.
  1. +4 −5 Source/Core/Core/HotkeyManager.cpp
  2. +2 −2 Source/Core/Core/HotkeyManager.h
@@ -160,7 +160,7 @@ static_assert(NUM_HOTKEYS == hotkey_labels.size(), "Wrong count of hotkey_labels
namespace HotkeyManagerEmu
{
static u32 s_hotkeyDown[NUM_HOTKEY_GROUPS];
static std::array<u32, NUM_HOTKEY_GROUPS> s_hotkeyDown;
static HotkeyStatus s_hotkey;
static bool s_enabled;
@@ -217,8 +217,7 @@ void Initialize()
// load the saved controller config
s_config.LoadConfig(true);
for (u32& key : s_hotkeyDown)
key = 0;
s_hotkeyDown = {};
s_enabled = true;
}
@@ -269,7 +268,7 @@ constexpr std::array<HotkeyGroupInfo, NUM_HOTKEY_GROUPS> groups_info = {
HotkeyManager::HotkeyManager()
{
for (int group = 0; group < NUM_HOTKEY_GROUPS; group++)
for (std::size_t group = 0; group < m_hotkey_groups.size(); group++)
{
m_hotkey_groups[group] =
(m_keys[group] = new ControllerEmu::Buttons("Keys", groups_info[group].name));
@@ -294,7 +293,7 @@ std::string HotkeyManager::GetName() const
void HotkeyManager::GetInput(HotkeyStatus* const kb)
{
const auto lock = GetStateLock();
for (int group = 0; group < NUM_HOTKEY_GROUPS; group++)
for (std::size_t group = 0; group < groups_info.size(); group++)
{
const int group_count = (groups_info[group].last - groups_info[group].first) + 1;
std::vector<u32> bitmasks(group_count);
@@ -182,7 +182,7 @@ enum HotkeyGroup : int
struct HotkeyStatus
{
u32 button[NUM_HOTKEY_GROUPS];
std::array<u32, NUM_HOTKEY_GROUPS> button;
s8 err;
};
@@ -200,7 +200,7 @@ class HotkeyManager : public ControllerEmu::EmulatedController
void LoadDefaults(const ControllerInterface& ciface) override;
private:
ControllerEmu::Buttons* m_keys[NUM_HOTKEY_GROUPS];
std::array<ControllerEmu::Buttons*, NUM_HOTKEY_GROUPS> m_keys;
std::array<ControllerEmu::ControlGroup*, NUM_HOTKEY_GROUPS> m_hotkey_groups;
};

0 comments on commit d22d323

Please sign in to comment.