summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputmanager.cpp4
-rw-r--r--src/input/joystick.cpp2
-rw-r--r--src/input/key.cpp11
3 files changed, 9 insertions, 8 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 814e2ac76..b0aa18da5 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -816,8 +816,8 @@ bool InputManager::checkKey(const InputActionData *restrict const key) const
if ((key == nullptr) || (key->condition & mMask) != key->condition)
return false;
- return (key->modKeyIndex == InputAction::NO_VALUE
- || isActionActive0(key->modKeyIndex));
+ return key->modKeyIndex == InputAction::NO_VALUE
+ || isActionActive0(key->modKeyIndex);
}
bool InputManager::invokeKey(const InputActionData *restrict const key,
diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp
index 0c859f50d..e01177059 100644
--- a/src/input/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -349,7 +349,7 @@ bool Joystick::validate() const
if (mCalibrating || !mEnabled || !mCalibrated)
return false;
- return (mUseInactive || settings.inputFocused);
+ return mUseInactive || settings.inputFocused;
}
void Joystick::handleRepeat(const int time)
diff --git a/src/input/key.cpp b/src/input/key.cpp
index 97019e67e..13646dc8e 100644
--- a/src/input/key.cpp
+++ b/src/input/key.cpp
@@ -88,10 +88,11 @@ bool Key::isNumber() const
bool Key::isLetter() const
{
- return (((mValue >= 65 && mValue <= 90)
- || (mValue >= 97 && mValue <= 122)
- || (mValue >= 192 && mValue <= 255))
- && (mValue != 215) && (mValue != 247));
+ return ((mValue >= 65 && mValue <= 90) ||
+ (mValue >= 97 && mValue <= 122) ||
+ (mValue >= 192 && mValue <= 255)) &&
+ mValue != 215 &&
+ mValue != 247;
}
int Key::getValue() const
@@ -106,5 +107,5 @@ bool Key::operator==(const Key& key) const
bool Key::operator!=(const Key& key) const
{
- return (mValue != key.mValue);
+ return mValue != key.mValue;
}