INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-14 03:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Brace the code! Fix compile error due to class member construction order

Browse Source
This commit is contained in:
Ameer
2020-07-06 23:01:57 -04:00
parent 86abff48e1
commit e3253b5f18
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/input_common/gcadapter/gc_adapter.cpp
View File

@ -386,35 +386,50 @@ const std::array<GCState, 4>& Adapter::GetPadState() const {
}
int Adapter::GetOriginValue(int port, int axis) {
// TODO: perhaps place stick statuses into an array in PadStatus
const PadAxes padaxis = static_cast<PadAxes>(axis);
if (padaxis == PadAxes::StickX)
if (padaxis == PadAxes::StickX) {
return origin_status[port].stick_x;
if (padaxis == PadAxes::StickY)
}
if (padaxis == PadAxes::StickY) {
return origin_status[port].stick_y;
if (padaxis == PadAxes::SubstickX)
}
if (padaxis == PadAxes::SubstickX) {
return origin_status[port].substick_x;
if (padaxis == PadAxes::SubstickY)
}
if (padaxis == PadAxes::SubstickY) {
return origin_status[port].substick_x;
if (padaxis == PadAxes::TriggerLeft)
}
if (padaxis == PadAxes::TriggerLeft) {
return origin_status[port].trigger_left;
if (padaxis == PadAxes::TriggerRight)
}
if (padaxis == PadAxes::TriggerRight) {
return origin_status[port].trigger_right;
}
return 0;
}
const int Adapter::GetOriginValue(int port, int axis) const {
const PadAxes padaxis = static_cast<PadAxes>(axis);
if (padaxis == PadAxes::StickX)
if (padaxis == PadAxes::StickX) {
return origin_status[port].stick_x;
if (padaxis == PadAxes::StickY)
}
if (padaxis == PadAxes::StickY) {
return origin_status[port].stick_y;
if (padaxis == PadAxes::SubstickX)
}
if (padaxis == PadAxes::SubstickX) {
return origin_status[port].substick_x;
if (padaxis == PadAxes::SubstickY)
}
if (padaxis == PadAxes::SubstickY) {
return origin_status[port].substick_x;
if (padaxis == PadAxes::TriggerLeft)
}
if (padaxis == PadAxes::TriggerLeft) {
return origin_status[port].trigger_left;
if (padaxis == PadAxes::TriggerRight)
}
if (padaxis == PadAxes::TriggerRight) {
return origin_status[port].trigger_right;
}
return 0;
}
} // namespace GCAdapter