diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-10 12:56:01 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-10 13:12:16 +0200 |
| commit | e956e80c1fa1cc8aefcb1533e5acf5cf3c8ffdd9 (patch) | |
| tree | 8f162f9162ca0dfa35841a9c734a0529764cb458 /platform/osx/joypad_osx.cpp | |
| parent | 03b13e0c695bb63043c3ca8665083bae1960aca4 (diff) | |
| download | redot-engine-e956e80c1fa1cc8aefcb1533e5acf5cf3c8ffdd9.tar.gz | |
Style: clang-format: Disable AllowShortIfStatementsOnASingleLine
Part of #33027, also discussed in #29848.
Enforcing the use of brackets even on single line statements would be
preferred, but `clang-format` doesn't have this functionality yet.
Diffstat (limited to 'platform/osx/joypad_osx.cpp')
| -rw-r--r-- | platform/osx/joypad_osx.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp index 7f5ec05967..0f50ba63c6 100644 --- a/platform/osx/joypad_osx.cpp +++ b/platform/osx/joypad_osx.cpp @@ -374,7 +374,8 @@ bool joypad::check_ff_features() { if (ret == FF_OK && (features.supportedEffects & FFCAP_ET_CONSTANTFORCE)) { uint32_t val; ret = FFDeviceGetForceFeedbackProperty(ff_device, FFPROP_FFGAIN, &val, sizeof(val)); - if (ret != FF_OK) return false; + if (ret != FF_OK) + return false; int num_axes = features.numFfAxes; ff_axes = (DWORD *)memalloc(sizeof(DWORD) * num_axes); ff_directions = (LONG *)memalloc(sizeof(LONG) * num_axes); @@ -509,14 +510,16 @@ void JoypadOSX::joypad_vibration_stop(int p_id, uint64_t p_timestamp) { int JoypadOSX::get_joy_index(int p_id) const { for (int i = 0; i < device_list.size(); i++) { - if (device_list[i].id == p_id) return i; + if (device_list[i].id == p_id) + return i; } return -1; } int JoypadOSX::get_joy_ref(IOHIDDeviceRef p_device) const { for (int i = 0; i < device_list.size(); i++) { - if (device_list[i].device_ref == p_device) return i; + if (device_list[i].device_ref == p_device) + return i; } return -1; } |