From 0e5fde52ac4cbb33fc767eccdce81e0874e84688 Mon Sep 17 00:00:00 2001 From: Charles Rozhon Date: Tue, 2 Sep 2014 21:50:43 -0500 Subject: [PATCH] Fixed bug introduced in PR#803 caused by casting Also changed casts to C++ style casts to removed some of the ambiguity. --- Source/Core/Core/HW/GCPadEmu.cpp | 14 +++++++------- .../Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp | 12 ++++++------ .../Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp | 4 ++-- .../Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp | 6 +++--- .../Core/HW/WiimoteEmu/Attachment/Turntable.cpp | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp index 93876082d1..123f32969e 100644 --- a/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp @@ -106,22 +106,22 @@ void GCPad::GetInput(GCPadStatus* const pad) // sticks m_main_stick->GetState(&x, &y); - pad->stickX = GCPadStatus::MAIN_STICK_CENTER_X + (u8)(x * GCPadStatus::MAIN_STICK_RADIUS); - pad->stickY = GCPadStatus::MAIN_STICK_CENTER_Y + (u8)(y * GCPadStatus::MAIN_STICK_RADIUS); + pad->stickX = static_cast(GCPadStatus::MAIN_STICK_CENTER_X + (x * GCPadStatus::MAIN_STICK_RADIUS)); + pad->stickY = static_cast(GCPadStatus::MAIN_STICK_CENTER_Y + (y * GCPadStatus::MAIN_STICK_RADIUS)); m_c_stick->GetState(&x, &y); - pad->substickX = GCPadStatus::C_STICK_CENTER_X + (u8)(x * GCPadStatus::C_STICK_RADIUS); - pad->substickY = GCPadStatus::C_STICK_CENTER_Y + (u8)(y * GCPadStatus::C_STICK_RADIUS); + pad->substickX = static_cast(GCPadStatus::C_STICK_CENTER_X + (x * GCPadStatus::C_STICK_RADIUS)); + pad->substickY = static_cast(GCPadStatus::C_STICK_CENTER_Y + (y * GCPadStatus::C_STICK_RADIUS)); // triggers m_triggers->GetState(&pad->button, trigger_bitmasks, triggers); - pad->triggerLeft = (u8)(triggers[0] * 0xFF); - pad->triggerRight = (u8)(triggers[1] * 0xFF); + pad->triggerLeft = static_cast(triggers[0] * 0xFF); + pad->triggerRight = static_cast(triggers[1] * 0xFF); } void GCPad::SetMotor(const u8 on) { - float state = (float)on / 255; + float state = static_cast(on) / 255; float force = abs(state - 0.5f) * 2; if (state < 0.5) force = -force; diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp index 04f2c5032f..de1c794a96 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp @@ -92,8 +92,8 @@ void Classic::GetState(u8* const data) double x, y; m_left_stick->GetState(&x, &y); - ccdata->lx = Classic::LEFT_STICK_CENTER_X + (u8)(x * Classic::LEFT_STICK_RADIUS); - ccdata->ly = Classic::LEFT_STICK_CENTER_Y + (u8)(y * Classic::LEFT_STICK_RADIUS); + ccdata->lx = static_cast(Classic::LEFT_STICK_CENTER_X + (x * Classic::LEFT_STICK_RADIUS)); + ccdata->ly = static_cast(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_ = Classic::RIGHT_STICK_CENTER_X + (u8)(x * Classic::RIGHT_STICK_RADIUS); - y_ = Classic::RIGHT_STICK_CENTER_Y + (u8)(y * Classic::RIGHT_STICK_RADIUS); + x_ = static_cast(Classic::RIGHT_STICK_CENTER_X + (x * Classic::RIGHT_STICK_RADIUS)); + y_ = static_cast(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 = (u8)(trigs[0] * Classic::LEFT_TRIGGER_RANGE); - rt = (u8)(trigs[1] * Classic::RIGHT_TRIGGER_RANGE); + lt = static_cast(trigs[0] * Classic::LEFT_TRIGGER_RANGE); + rt = static_cast(trigs[1] * Classic::RIGHT_TRIGGER_RANGE); ccdata->lt1 = lt; ccdata->lt2 = lt >> 3; diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp index 4b16c08e48..f77636d214 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp @@ -63,8 +63,8 @@ void Drums::GetState(u8* const data) double x, y; m_stick->GetState(&x, &y); - ddata->sx = (u8)(x * 0x1F) + 0x20; - ddata->sy = (u8)(y * 0x1F) + 0x20; + ddata->sx = static_cast((x * 0x1F) + 0x20); + ddata->sy = static_cast((y * 0x1F) + 0x20); } // TODO: softness maybe diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp index 69439eaaa0..4a35413f9d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp @@ -76,8 +76,8 @@ void Guitar::GetState(u8* const data) double x, y; m_stick->GetState(&x, &y); - gdata->sx = (u8)(x * 0x1F) + 0x20; - gdata->sy = (u8)(y * 0x1F) + 0x20; + gdata->sx = static_cast((x * 0x1F) + 0x20); + gdata->sy = static_cast((y * 0x1F) + 0x20); } // TODO: touch bar, probably not @@ -86,7 +86,7 @@ void Guitar::GetState(u8* const data) // whammy bar double whammy; m_whammy->GetState(&whammy); - gdata->whammy = (u8)(whammy * 0x1F); + gdata->whammy = static_cast(whammy * 0x1F); // buttons m_buttons->GetState(&gdata->bt, guitar_button_bitmasks); diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp index 4286c83502..716bd38007 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -65,8 +65,8 @@ void Turntable::GetState(u8* const data) double x, y; m_stick->GetState(&x, &y); - ttdata->sx = (u8)(x * 0x1F) + 0x20; - ttdata->sy = (u8)(y * 0x1F) + 0x20; + ttdata->sx = static_cast((x * 0x1F) + 0x20); + ttdata->sy = static_cast((y * 0x1F) + 0x20); } // left table @@ -75,7 +75,7 @@ void Turntable::GetState(u8* const data) s8 tt_; m_left_table->GetState(&tt); - tt_ = (s8)(tt * 0x1F); + tt_ = static_cast(tt * 0x1F); ttdata->ltable1 = tt_; ttdata->ltable2 = tt_ >> 5; @@ -87,7 +87,7 @@ void Turntable::GetState(u8* const data) s8 tt_; m_right_table->GetState(&tt); - tt_ = (s8)(tt * 0x1F); + tt_ = static_cast(tt * 0x1F); ttdata->rtable1 = tt_; ttdata->rtable2 = tt_ >> 1; @@ -101,7 +101,7 @@ void Turntable::GetState(u8* const data) u8 dial_; m_effect_dial->GetState(&dial); - dial_ = (u8)(dial * 0x0F); + dial_ = static_cast(dial * 0x0F); ttdata->dial1 = dial_; ttdata->dial2 = dial_ >> 3; @@ -112,7 +112,7 @@ void Turntable::GetState(u8* const data) double cfs; m_crossfade->GetState(&cfs); - ttdata->slider = (u8)(cfs * 0x07) + 0x08; + ttdata->slider = static_cast((cfs * 0x07) + 0x08); } // buttons