X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FguiKeyChangeMenu.h;h=19a07620d242c2804418b3c488dcddf2d062139f;hb=006ef5b4a5e362eed848ca26b411a8059d74b965;hp=2caf69216fc06416eab5409d2b30a96d04939d58;hpb=9e35fe8c37b87e2746d9368d273a54bf4a3ba65a;p=oweals%2Fminetest.git diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h index 2caf69216..19a07620d 100644 --- a/src/guiKeyChangeMenu.h +++ b/src/guiKeyChangeMenu.h @@ -1,20 +1,20 @@ /* - Minetest-c55 - Copyright (C) 2010-11 celeron55, Perttu Ahola - Copyright (C) 2011 Ciaran Gultnieks - Copyright (C) 2011 teddydestodes + Minetest + Copyright (C) 2010-2013 celeron55, Perttu Ahola + Copyright (C) 2013 Ciaran Gultnieks + Copyright (C) 2013 teddydestodes This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License along + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -22,32 +22,23 @@ #ifndef GUIKEYCHANGEMENU_HEADER #define GUIKEYCHANGEMENU_HEADER -#include "common_irrlicht.h" -#include "utility.h" +#include "irrlichttypes_extrabloated.h" #include "modalMenu.h" #include "client.h" #include "gettext.h" +#include "keycode.h" #include - -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 +#include + +struct key_setting { + int id; + const wchar_t *button_name; + KeyPress key; + std::string setting_name; + gui::IGUIButton *button; }; + class GUIKeyChangeMenu: public GUIModalMenu { public: @@ -73,34 +64,15 @@ private: 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 *inventory; - gui::IGUIButton *fly; - gui::IGUIButton *fast; - gui::IGUIButton *range; - gui::IGUIButton *dump; - gui::IGUIButton *chat; + void add_key(int id, const wchar_t *button_name, const std::string &setting_name); + bool shift_down; + 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; + + std::vector key_used; + gui::IGUIStaticText *key_used_text; + std::vector key_settings; }; #endif