diff options
author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 20:50:59 +0200 |
---|---|---|
committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 22:29:23 +0200 |
commit | 01ac2929cd723b579454788ffbe9579d1863d240 (patch) | |
tree | 84f9f7df642f09a32adb1fa779ffeeb15fa2c206 /src/core/Pad.cpp | |
parent | More more more audio (diff) | |
download | re3-01ac2929cd723b579454788ffbe9579d1863d240.tar re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.gz re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.bz2 re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.lz re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.xz re3-01ac2929cd723b579454788ffbe9579d1863d240.tar.zst re3-01ac2929cd723b579454788ffbe9579d1863d240.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/Pad.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index b5086d64..f334a255 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -299,10 +299,10 @@ CControllerState CPad::ReconcileTwoControllersInput(CControllerState const &Stat { if ( State1.button || State2.button ) ReconState.button = 255; } #define _RECONCILE_AXIS_POSITIVE(axis) \ - { if ( State1.axis >= 0 && State2.axis >= 0 ) ReconState.axis = Max(State1.axis, State2.axis); } + { if ( State1.axis >= 0 && State2.axis >= 0 ) ReconState.axis = max(State1.axis, State2.axis); } #define _RECONCILE_AXIS_NEGATIVE(axis) \ - { if ( State1.axis <= 0 && State2.axis <= 0 ) ReconState.axis = Min(State1.axis, State2.axis); } + { if ( State1.axis <= 0 && State2.axis <= 0 ) ReconState.axis = min(State1.axis, State2.axis); } #define _RECONCILE_AXIS(axis) \ { _RECONCILE_AXIS_POSITIVE(axis); _RECONCILE_AXIS_NEGATIVE(axis); } |