diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 14:46:52 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 14:46:52 +0300 |
commit | 836e43db60ff1f3c9d160d0d58ba5a631c4293fc (patch) | |
tree | 89096c3ffd4128694542ebdbfabe94b6a618e16d /src/guiKeyChangeMenu.h | |
parent | 6596e585fe844ce87a957bb7deaf2bf92d828592 (diff) | |
parent | 7e610aece52ad547d4ae263aff5297342d5a4bff (diff) | |
download | minetest-836e43db60ff1f3c9d160d0d58ba5a631c4293fc.tar.gz minetest-836e43db60ff1f3c9d160d0d58ba5a631c4293fc.tar.bz2 minetest-836e43db60ff1f3c9d160d0d58ba5a631c4293fc.zip |
Merge remote-tracking branch 'oblomov/new_input'
Diffstat (limited to 'src/guiKeyChangeMenu.h')
-rw-r--r-- | src/guiKeyChangeMenu.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h index 2caf69216..a1dfa17c2 100644 --- a/src/guiKeyChangeMenu.h +++ b/src/guiKeyChangeMenu.h @@ -27,6 +27,7 @@ #include "modalMenu.h" #include "client.h" #include "gettext.h" +#include "keycode.h" #include <string> enum @@ -88,19 +89,19 @@ private: gui::IGUIButton *chat; s32 activeKey; - s32 key_forward; - s32 key_backward; - s32 key_left; - s32 key_right; - s32 key_use; - s32 key_sneak; - s32 key_jump; - s32 key_inventory; - s32 key_fly; - s32 key_fast; - s32 key_range; - s32 key_chat; - s32 key_dump; + KeyPress key_forward; + KeyPress key_backward; + KeyPress key_left; + KeyPress key_right; + KeyPress key_use; + KeyPress key_sneak; + KeyPress key_jump; + KeyPress key_inventory; + KeyPress key_fly; + KeyPress key_fast; + KeyPress key_range; + KeyPress key_chat; + KeyPress key_dump; }; #endif |