summaryrefslogtreecommitdiff
path: root/src/input/inputactionmap.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-17 16:13:39 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-17 16:13:39 +0300
commit3e16eec4b33fb8882957b45c83c5c1f2b57625d2 (patch)
tree1ed0e3286446771049652551454fae234cad6a21 /src/input/inputactionmap.h
parent25ef222f6fa5d0c9c13a76b3e2149cfec3b13227 (diff)
downloadmv-3e16eec4b33fb8882957b45c83c5c1f2b57625d2.tar.gz
mv-3e16eec4b33fb8882957b45c83c5c1f2b57625d2.tar.bz2
mv-3e16eec4b33fb8882957b45c83c5c1f2b57625d2.tar.xz
mv-3e16eec4b33fb8882957b45c83c5c1f2b57625d2.zip
Rename keydata into inputactiondata.
Diffstat (limited to 'src/input/inputactionmap.h')
-rw-r--r--src/input/inputactionmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index fb810a683..3ab04c98a 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -27,17 +27,17 @@
#include "localconsts.h"
#include "input/inputaction.h"
+#include "input/inputactiondata.h"
#include "input/inputcondition.h"
#include "input/inputmanager.h"
#include "input/inputtype.h"
-#include "input/keydata.h"
#include "utils/gettext.h"
#include <string>
// keyData must be in same order as enum keyAction.
-static const KeyData keyData[InputAction::TOTAL] = {
+static const InputActionData inputActionData[InputAction::TOTAL] = {
{"keyMoveUp",
InputType::KEYBOARD, SDLK_UP,
InputType::UNKNOWN, InputAction::NO_VALUE,