diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-16 20:17:15 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:18:47 +0200 |
| commit | 2fabbc3b4cab40220986f402569af64673cb4cd9 (patch) | |
| tree | 3278631a5e3dd19a0af92204e6bfb48702dd04f0 /src/core/Pad.cpp | |
| parent | Cleanup (diff) | |
| download | re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.gz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.bz2 re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.lz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.xz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.zst re3-2fabbc3b4cab40220986f402569af64673cb4cd9.zip | |
Diffstat (limited to 'src/core/Pad.cpp')
| -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 f334a255..b5086d64 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); } |