Particles: Do not add digging particles for airlike nodes (#6392)

[minetest.git] / src / guiKeyChangeMenu.h

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index a3d8b474351b1bfd8ee74884a766d2603ce0e48f..7cf11d3f9301fc2ccfc2431276b1e8aee58f6936 100644 (file)
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -1,61 +1,47 @@
 /*
- Minetest-c55
- Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
- Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
- Copyright (C) 2011 teddydestodes <derkomtur@schattengang.net>
+ Minetest
+ Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+ Copyright (C) 2013 Ciaran Gultnieks <ciaran@ciarang.com>
+ Copyright (C) 2013 teddydestodes <derkomtur@schattengang.net>
 
  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.
  */
 
-#ifndef GUIKEYCHANGEMENU_HEADER
-#define GUIKEYCHANGEMENU_HEADER
+#pragma once
 
-#include "common_irrlicht.h"
-#include "utility.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
-#include "client.h"
 #include "gettext.h"
 #include "keycode.h"
 #include <string>
+#include <vector>
 
-enum
+struct key_setting
 {
-       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_CMD_BUTTON,
-       GUI_ID_KEY_SNEAK_BUTTON,
-       GUI_ID_KEY_DROP_BUTTON,
-       GUI_ID_KEY_INVENTORY_BUTTON,
-       GUI_ID_KEY_DUMP_BUTTON,
-       GUI_ID_KEY_RANGE_BUTTON
+       int id;
+       const wchar_t *button_name;
+       KeyPress key;
+       std::string setting_name;
+       gui::IGUIButton *button;
 };
 
-class GUIKeyChangeMenu: public GUIModalMenu
+class GUIKeyChangeMenu : public GUIModalMenu
 {
 public:
-       GUIKeyChangeMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent,
-                       s32 id, IMenuManager *menumgr);
+       GUIKeyChangeMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
+                       IMenuManager *menumgr);
        ~GUIKeyChangeMenu();
 
        void removeChildren();
@@ -68,47 +54,21 @@ class GUIKeyChangeMenu: public GUIModalMenu
 
        bool acceptInput();
 
-       bool OnEvent(const SEvent& event);
+       bool OnEvent(const SEvent &event);
 
-private:
+       bool pausesGame() { return true; }
 
+private:
        void init_keys();
 
        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;
-
-       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_dump;
-};
+       void add_key(int id, const wchar_t *button_name, const std::string &setting_name);
 
-#endif
+       bool shift_down = false;
+       s32 activeKey = -1;
 
+       std::vector<KeyPress> key_used;
+       gui::IGUIStaticText *key_used_text = nullptr;
+       std::vector<key_setting *> key_settings;
+};