summaryrefslogtreecommitdiff
path: root/src/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-03 13:07:57 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-03 13:07:57 +0300
commitca4582756ce9ad0c4f4222da0760bd6ccffc829a (patch)
tree3d65b06b31aadf18f59bce4e0802945158a52950 /src/inputmanager.cpp
parentab4a00c231e84267c7d06b2b1bb167593f22d91f (diff)
downloadmanaplus-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.tar.gz
manaplus-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.tar.bz2
manaplus-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.tar.xz
manaplus-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.zip
Fix inventory sorting.
Was broken because conflict with buy dialog sorting.
Diffstat (limited to 'src/inputmanager.cpp')
-rw-r--r--src/inputmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 314b866e8..c011784ba 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -61,7 +61,7 @@ static class KeyFunctor final
const KeyData *keys;
-} keySorter;
+} keyDataSorter;
InputManager::InputManager() :
@@ -664,12 +664,12 @@ void InputManager::updateKeyActionMap(KeyToActionMap &actionMap,
}
}
- keySorter.keys = &keyData[0];
+ keyDataSorter.keys = &keyData[0];
FOR_EACH (KeyToActionMapIter, it, actionMap)
{
KeysVector *const keys = &it->second;
if (keys && keys->size() > 1)
- std::sort(keys->begin(), keys->end(), keySorter);
+ std::sort(keys->begin(), keys->end(), keyDataSorter);
}
}