summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2013-01-18 13:40:54 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2013-01-18 13:42:44 -0600
commit5ff77f9c882acdec1bd673d883dded9d219b8fa0 (patch)
treeb36e5c1206232a105a460a32446d640a487ed0e6 /Source
parent2f28d938cf640390cd8979c6104f3dbe8795e1e6 (diff)
Fix emulated turntable crossfade slider. (DJ Hero controller)
Fixes issue 4504.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
index 292d9c5a86..182170f501 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
@@ -97,8 +97,9 @@ void Turntable::GetState(u8* const data, const bool focus)
// crossfade slider
{
- u8 cfs = 0;
- m_crossfade->GetState(&cfs, 8, 7);
+ s8 cfs = 0;
+ m_crossfade->GetState(&cfs, focus ? 7 : 0);
+ cfs += 8;
ttdata->slider = cfs;
}