diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-02 12:48:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-02 12:48:18 +0300 |
commit | 9ec9cec6b2485654bdee4a828e5a7b0708dcf4f4 (patch) | |
tree | 9c5c497ebedefbeff0d4cf57782c83d5480438bb /src/input/inputmanager.cpp | |
parent | 3f76d07b673de76d7c4e434bd5a214f3480927cb (diff) | |
download | manaverse-9ec9cec6b2485654bdee4a828e5a7b0708dcf4f4.tar.gz manaverse-9ec9cec6b2485654bdee4a828e5a7b0708dcf4f4.tar.bz2 manaverse-9ec9cec6b2485654bdee4a828e5a7b0708dcf4f4.tar.xz manaverse-9ec9cec6b2485654bdee4a828e5a7b0708dcf4f4.zip |
Add missing const and static into input classes.
Diffstat (limited to 'src/input/inputmanager.cpp')
-rw-r--r-- | src/input/inputmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 090629aea..e6952a956 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -102,7 +102,7 @@ void InputManager::init() update(); } -void InputManager::update() const +void InputManager::update() { keyboard.update(); if (joystick) @@ -347,7 +347,7 @@ bool InputManager::isActionActive(const int index) const return true; } -bool InputManager::isActionActive0(const int index) const +bool InputManager::isActionActive0(const int index) { if (keyboard.isActionActive(index)) return true; @@ -497,7 +497,7 @@ void InputManager::setNewKey(const SDL_Event &event, const int type) { int val = -1; if (type == INPUT_KEYBOARD) - val = keyboard.getKeyValueFromEvent(event); + val = KeyboardConfig::getKeyValueFromEvent(event); else if (type == INPUT_JOYSTICK && joystick) val = joystick->getButtonFromEvent(event); @@ -651,7 +651,7 @@ bool InputManager::handleEvent(const SDL_Event &event) return false; } -void InputManager::handleRepeat() const +void InputManager::handleRepeat() { const int time = tick_time; keyboard.handleRepeat(time); |