From 0d1fbe7bbca8e42449ee37600519509cb47516b9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 1 Jan 2019 08:32:39 -0600 Subject: WiimoteEmu: Major renaming and cleanup. --- Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp index 98b9e5828b..e6623ea754 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp @@ -12,8 +12,8 @@ #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" +#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "InputCommon/ControllerEmu/ControlGroup/Extension.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" namespace ControllerEmu @@ -41,10 +41,10 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi) for (auto& control : ctrlGroup->controls) control->control_ref.get()->UpdateReference(devi, GetDefaultDevice()); - // extension - if (ctrlGroup->type == GroupType::Extension) + // Attachments: + if (ctrlGroup->type == GroupType::Attachments) { - for (auto& attachment : ((Extension*)ctrlGroup.get())->attachments) + for (auto& attachment : static_cast(ctrlGroup.get())->GetAttachmentList()) attachment->UpdateReferences(devi); } } @@ -73,10 +73,10 @@ void EmulatedController::SetDefaultDevice(ciface::Core::DeviceQualifier devq) for (auto& ctrlGroup : groups) { - // extension - if (ctrlGroup->type == GroupType::Extension) + // Attachments: + if (ctrlGroup->type == GroupType::Attachments) { - for (auto& ai : ((Extension*)ctrlGroup.get())->attachments) + for (auto& ai : static_cast(ctrlGroup.get())->GetAttachmentList()) { ai->SetDefaultDevice(m_default_device); } -- cgit v1.2.3