diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-02-26 15:56:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 15:56:34 -0800 |
| commit | 832e0501dbf361c84d7cc6a384ba3610b752e64f (patch) | |
| tree | 120597814e8bfaae7757cc3b27472a5cae254f9d /Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | |
| parent | 0dde642b7d65d9b0fdc680e1f4446a78f0a94b6a (diff) | |
| parent | 26f17a172353098740d97cce531f4c7c06abd4e4 (diff) | |
Merge pull request #4960 from lioncash/type
ControlGroup: Convert group type enum into an enum class
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp index ce09966d2d..6de5042aaf 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp @@ -39,7 +39,7 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi) control->control_ref.get()->UpdateReference(devi, default_device); // extension - if (ctrlGroup->type == GROUP_TYPE_EXTENSION) + if (ctrlGroup->type == GroupType::Extension) { for (auto& attachment : ((Extension*)ctrlGroup.get())->attachments) attachment->UpdateReferences(devi); @@ -52,7 +52,7 @@ void EmulatedController::UpdateDefaultDevice() for (auto& ctrlGroup : groups) { // extension - if (ctrlGroup->type == GROUP_TYPE_EXTENSION) + if (ctrlGroup->type == GroupType::Extension) { for (auto& ai : ((Extension*)ctrlGroup.get())->attachments) { |
