ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new stick/trigger constants for Classic.cpp

This commit is contained in:
Matthew Parlane 2014-07-22 12:16:34 +12:00
parent 82ee68663f
commit cee07ff16e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
View File

@ -92,8 +92,8 @@ void Classic::GetState(u8* const data)
double x, y;
m_left_stick->GetState(&x, &y);
ccdata->lx = (x * 0x1F) + 0x20;
ccdata->ly = (y * 0x1F) + 0x20;
ccdata->lx = Classic::LEFT_STICK_CENTER_X + (x * Classic::LEFT_STICK_RADIUS);
ccdata->ly = Classic::LEFT_STICK_CENTER_Y + (y * Classic::LEFT_STICK_RADIUS);
}
// right stick
@ -102,8 +102,8 @@ void Classic::GetState(u8* const data)
u8 x_, y_;
m_right_stick->GetState(&x, &y);
x_ = (x * 0x1F) + 0x20;
y_ = (y * 0x1F) + 0x20;
x_ = Classic::RIGHT_STICK_CENTER_X + (x * Classic::RIGHT_STICK_RADIUS);
y_ = Classic::RIGHT_STICK_CENTER_Y + (y * Classic::RIGHT_STICK_RADIUS);
ccdata->rx1 = x_;
ccdata->rx2 = x_ >> 1;
@ -117,8 +117,8 @@ void Classic::GetState(u8* const data)
u8 lt, rt;
m_triggers->GetState(&ccdata->bt, classic_trigger_bitmasks, trigs);
lt = trigs[0] * 0x1F;
rt = trigs[1] * 0x1F;
lt = trigs[0] * Classic::LEFT_TRIGGER_RANGE;
rt = trigs[1] * Classic::RIGHT_TRIGGER_RANGE;
ccdata->lt1 = lt;
ccdata->lt2 = lt >> 3;