Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "Use new stick/trigger constants for Classic.cpp"
Added using github, Parlane is an idiot.
This reverts commit 954e619.
  • Loading branch information
Parlane committed Jul 22, 2014
1 parent 954e619 commit e30f457
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
Expand Up @@ -92,8 +92,8 @@ void Classic::GetState(u8* const data)
double x, y;
m_left_stick->GetState(&x, &y);

ccdata->lx = LEFT_STICK_CENTER_X + (x * LEFT_STICK_RADIUS);
ccdata->ly = LEFT_STICK_CENTER_Y + (y * LEFT_STICK_RADIUS);
ccdata->lx = (x * 0x1F) + 0x20;
ccdata->ly = (y * 0x1F) + 0x20;
}

// right stick
Expand All @@ -102,8 +102,8 @@ void Classic::GetState(u8* const data)
u8 x_, y_;
m_right_stick->GetState(&x, &y);

x_ = RIGHT_STICK_CENTER_X + (x * RIGHT_STICK_RADIUS);
y_ = RIGHT_STICK_CENTER_Y + (y * RIGHT_STICK_RADIUS);
x_ = (x * 0x1F) + 0x20;
y_ = (y * 0x1F) + 0x20;

ccdata->rx1 = x_;
ccdata->rx2 = x_ >> 1;
Expand All @@ -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] * LEFT_TRIGGER_RANGE;
rt = trigs[1] * RIGHT_TRIGGER_RANGE;
lt = trigs[0] * 0x1F;
rt = trigs[1] * 0x1F;

ccdata->lt1 = lt;
ccdata->lt2 = lt >> 3;
Expand Down

0 comments on commit e30f457

Please sign in to comment.