Smooth day-night transitions

[dragonfireclient.git] / src / guiKeyChangeMenu.h

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index 442c0882a022caf4e6bcb7a9fd097db6ccef0412..beb4f0b6fcb52a04b7272a56b44ab3e7f030dc86 100644 (file)
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -22,12 +22,22 @@
 #ifndef GUIKEYCHANGEMENU_HEADER
 #define GUIKEYCHANGEMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include "client.h"
 #include "gettext.h"
 #include "keycode.h"
 #include <string>
+#include <vector>
+
+typedef struct {
+       int id;
+       wchar_t *button_name;
+       KeyPress key;
+       std::string setting_name;
+       gui::IGUIButton *button;
+} key_setting;
+
 
 class GUIKeyChangeMenu: public GUIModalMenu
 {
@@ -54,40 +64,15 @@ class GUIKeyChangeMenu: public GUIModalMenu
 
        bool resetMenu();
 
-       gui::IGUIButton *forward;
-       gui::IGUIButton *backward;
-       gui::IGUIButton *left;
-       gui::IGUIButton *right;
-       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;
+       void add_key(int id, std::string setting_name, std::string button_name);
 
+       bool shift_down;
+       
        s32 activeKey;
-       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;
+       
+       std::vector<KeyPress> key_used;
+       gui::IGUIStaticText *key_used_text;
+       std::vector<key_setting *> key_settings;
 };
 
 #endif