summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-10 18:10:48 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-10 18:12:36 +0300
commita373717a071e4c35e1eb5c033a7c04fe44ce6c1e (patch)
tree9974117cdd545b0cdffea1c08d1e2d4bb3dab5f1 /src
parent92c196947c06a795d81ff35f7c0bf6946e214b5a (diff)
downloadmanaverse-a373717a071e4c35e1eb5c033a7c04fe44ce6c1e.tar.gz
manaverse-a373717a071e4c35e1eb5c033a7c04fe44ce6c1e.tar.bz2
manaverse-a373717a071e4c35e1eb5c033a7c04fe44ce6c1e.tar.xz
manaverse-a373717a071e4c35e1eb5c033a7c04fe44ce6c1e.zip
Fix typo handleActicateKey -> handleActivateKey
Diffstat (limited to 'src')
-rw-r--r--src/input/inputmanager.cpp2
-rw-r--r--src/input/keyboardconfig.cpp4
-rw-r--r--src/input/keyboardconfig.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index d3f14ac2c..e7cdfb4b2 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -590,7 +590,7 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2
return true;
}
- keyboard.handleActicateKey(event);
+ keyboard.handleActivateKey(event);
// send straight to gui for certain windows
#ifndef DYECMD
if (quitDialog || TextDialog::isActive())
diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp
index 81b16ecf2..888b86724 100644
--- a/src/input/keyboardconfig.cpp
+++ b/src/input/keyboardconfig.cpp
@@ -215,7 +215,7 @@ void KeyboardConfig::update()
mKeyTimeMap, InputType::KEYBOARD);
}
-void KeyboardConfig::handleActicateKey(const SDL_Event &event)
+void KeyboardConfig::handleActivateKey(const SDL_Event &event)
{
if (!mActiveKeys2)
return;
@@ -225,7 +225,7 @@ void KeyboardConfig::handleActicateKey(const SDL_Event &event)
resetRepeat(key);
}
-void KeyboardConfig::handleActicateKey(const int key)
+void KeyboardConfig::handleActivateKey(const int key)
{
if (!mActiveKeys2)
return;
diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h
index 21b7ac608..6bd66f69f 100644
--- a/src/input/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -93,9 +93,9 @@ class KeyboardConfig final
void update();
- void handleActicateKey(const SDL_Event &event);
+ void handleActivateKey(const SDL_Event &event);
- void handleActicateKey(const int key);
+ void handleActivateKey(const int key);
void handleDeActicateKey(const SDL_Event &event);