summaryrefslogtreecommitdiff
path: root/src/input/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-18 18:40:59 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-18 18:40:59 +0300
commit31cce4c22b369148f77d7092903af9462d8151c8 (patch)
treebd11e598db5ff6e17d3f0b283c44e333ac37d696 /src/input/inputmanager.cpp
parente6afa441a57718205c1f62bcbc0a5443fd513aa3 (diff)
downloadmv-31cce4c22b369148f77d7092903af9462d8151c8.tar.gz
mv-31cce4c22b369148f77d7092903af9462d8151c8.tar.bz2
mv-31cce4c22b369148f77d7092903af9462d8151c8.tar.xz
mv-31cce4c22b369148f77d7092903af9462d8151c8.zip
Fix code style.
Diffstat (limited to 'src/input/inputmanager.cpp')
-rw-r--r--src/input/inputmanager.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 68950f4cf..22ea7f85b 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -107,7 +107,8 @@ void InputManager::retrieve()
for (int i = 0; i < InputAction::TOTAL; i++)
{
#ifdef USE_SDL2
- const std::string cf = std::string("sdl2") + inputActionData[i].configField;
+ const std::string cf = std::string("sdl2")
+ + inputActionData[i].configField;
#else
const std::string cf = inputActionData[i].configField;
#endif
@@ -162,7 +163,8 @@ void InputManager::store() const
for (int i = 0; i < InputAction::TOTAL; i++)
{
#ifdef USE_SDL2
- const std::string cf = std::string("sdl2") + inputActionData[i].configField;
+ const std::string cf = std::string("sdl2")
+ + inputActionData[i].configField;
#else
const std::string cf = inputActionData[i].configField;
#endif
@@ -276,8 +278,11 @@ bool InputManager::hasConflicts(int &restrict key1, int &restrict key2) const
size_t j;
for (j = i, j++; j < InputAction::TOTAL; j++)
{
- if ((kdi.grp & inputActionData[j].grp) == 0 || !*kdi.configField)
+ if ((kdi.grp & inputActionData[j].grp) == 0
+ || !*kdi.configField)
+ {
continue;
+ }
for (size_t j2 = 0; j2 < inputFunctionSize; j2 ++)
{