From a32b85691b6764bb966226ef42cd5e38a5f8914f Mon Sep 17 00:00:00 2001 From: shockdude Date: Wed, 18 Jan 2023 19:17:09 -0800 Subject: [PATCH] Fix Turntable extension's table range --- Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp | 4 ++-- Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp index 0b01b8dd7d..7d3a06469d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp @@ -96,7 +96,7 @@ void Turntable::BuildDesiredExtensionState(DesiredExtensionState* target_state) // left table { const ControllerEmu::Slider::StateData lt = m_left_table->GetState(m_input_override_function); - const s8 tt = MapFloat(lt.value, 0, 0, TABLE_RANGE); + const s8 tt = MapFloat(lt.value, 0, -TABLE_RANGE, TABLE_RANGE); tt_data.ltable1 = tt; tt_data.ltable2 = tt >> 5; @@ -105,7 +105,7 @@ void Turntable::BuildDesiredExtensionState(DesiredExtensionState* target_state) // right table { const ControllerEmu::Slider::StateData rt = m_right_table->GetState(m_input_override_function); - const s8 tt = MapFloat(rt.value, 0, 0, TABLE_RANGE); + const s8 tt = MapFloat(rt.value, 0, -TABLE_RANGE, TABLE_RANGE); tt_data.rtable1 = tt; tt_data.rtable2 = tt >> 1; diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h index 9f0548e69f..36cda37629 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h @@ -83,7 +83,7 @@ public: static constexpr u8 STICK_GATE_RADIUS = 0x16; static constexpr int TABLE_BIT_COUNT = 6; - static constexpr u8 TABLE_RANGE = (1 << STICK_BIT_COUNT) / 2 - 1; + static constexpr u8 TABLE_RANGE = (1 << TABLE_BIT_COUNT) / 2 - 1; static constexpr int EFFECT_DIAL_BIT_COUNT = 5; static constexpr u8 EFFECT_DIAL_CENTER = (1 << EFFECT_DIAL_BIT_COUNT) / 2;