Rework tool_capabilities a bit (maxwear->uses, scale dig time according to leveldiff)

[oweals/minetest.git] / src / guiKeyChangeMenu.h

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index 2caf69216fc06416eab5409d2b30a96d04939d58..1ff3d40451b4227754796ce77fb78d63ab51ff84 100644 (file)
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -27,27 +27,9 @@
 #include "modalMenu.h"
 #include "client.h"
 #include "gettext.h"
+#include "keycode.h"
 #include <string>
 
-enum
-{
-       GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR,
-       //buttons
-       GUI_ID_KEY_FORWARD_BUTTON,
-       GUI_ID_KEY_BACKWARD_BUTTON,
-       GUI_ID_KEY_LEFT_BUTTON,
-       GUI_ID_KEY_RIGHT_BUTTON,
-       GUI_ID_KEY_USE_BUTTON,
-       GUI_ID_KEY_FLY_BUTTON,
-       GUI_ID_KEY_FAST_BUTTON,
-       GUI_ID_KEY_JUMP_BUTTON,
-       GUI_ID_KEY_CHAT_BUTTON,
-       GUI_ID_KEY_SNEAK_BUTTON,
-       GUI_ID_KEY_INVENTORY_BUTTON,
-       GUI_ID_KEY_DUMP_BUTTON,
-       GUI_ID_KEY_RANGE_BUTTON
-};
-
 class GUIKeyChangeMenu: public GUIModalMenu
 {
 public:
@@ -80,27 +62,33 @@ private:
        gui::IGUIButton *use;
        gui::IGUIButton *sneak;
        gui::IGUIButton *jump;
+       gui::IGUIButton *dropbtn;
        gui::IGUIButton *inventory;
        gui::IGUIButton *fly;
        gui::IGUIButton *fast;
        gui::IGUIButton *range;
        gui::IGUIButton *dump;
        gui::IGUIButton *chat;
+       gui::IGUIButton *cmd;
+       gui::IGUIButton *console;
 
        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_drop;
+       KeyPress key_inventory;
+       KeyPress key_fly;
+       KeyPress key_fast;
+       KeyPress key_range;
+       KeyPress key_chat;
+       KeyPress key_cmd;
+       KeyPress key_console;
+       KeyPress key_dump;
 };
 
 #endif