diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h index 4a055c597d..d836e49a46 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h @@ -3,8 +3,6 @@ #pragma once -#include "Core/HW/WiimoteEmu/Extension/Extension.h" - #include #include @@ -69,10 +67,6 @@ public: using Extension::Extension; - // TODO: This is public for TAS reasons. - // TODO: TAS handles encryption poorly. - EncryptionKey ext_key; - static constexpr int CALIBRATION_CHECKSUM_BYTES = 2; #pragma pack(push, 1) @@ -103,6 +97,7 @@ public: static_assert(0x100 == sizeof(Register)); protected: + EncryptionKey ext_key; Register m_reg = {}; void Reset() override; diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index 17be61079d..f8115afdf8 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -803,14 +803,6 @@ Extension* Wiimote::GetActiveExtension() const return static_cast(m_attachments->GetAttachmentList()[m_active_extension].get()); } -EncryptionKey Wiimote::GetExtensionEncryptionKey() const -{ - if (ExtensionNumber::NONE == GetActiveExtensionNumber()) - return {}; - - return static_cast(GetActiveExtension())->ext_key; -} - bool Wiimote::IsSideways() const { const bool sideways_modifier_toggle = m_hotkeys->GetSettingsModifier()[0]; diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index e50a6efbc9..be5fdfdc6e 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -246,9 +246,6 @@ private: Extension* GetActiveExtension() const; Extension* GetNoneExtension() const; - // TODO: Kill this nonsensical function used for TAS: - EncryptionKey GetExtensionEncryptionKey() const; - struct ReadRequest { WiimoteCommon::AddressSpace space;