Fixed water mesh generation acting weird next to sand

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

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index 8060f511d75a6ebf61f71a1e3cf306a0ab92f51d..87561f7974fd075dd4bea9c6fc440a5470fffcfb 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -27,13 +27,48 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // For IGameCallback
 #include "guiPauseMenu.h"
 
+enum
+{
+       GUI_ID_QUIT_BUTTON = 101,
+       GUI_ID_NAME_INPUT,
+       GUI_ID_ADDRESS_INPUT,
+       GUI_ID_PORT_INPUT,
+       GUI_ID_FANCYTREE_CB,
+       GUI_ID_SMOOTH_LIGHTING_CB,
+       GUI_ID_DAMAGE_CB,
+       GUI_ID_CREATIVE_CB,
+       GUI_ID_JOIN_GAME_BUTTON,
+       GUI_ID_CHANGE_KEYS_BUTTON,
+       GUI_ID_DELETE_MAP_BUTTON
+};
+
 struct MainMenuData
 {
+       MainMenuData():
+               // Client opts
+               fancy_trees(false),
+               smooth_lighting(false),
+               // Server opts
+               creative_mode(false),
+               enable_damage(false),
+               // Actions
+               delete_map(false)
+       {}
+
        // These are in the native format of the gui elements
+       
+       // Client options
        std::wstring address;
        std::wstring port;
        std::wstring name;
+       std::wstring password;
+       bool fancy_trees;
+       bool smooth_lighting;
+       // Server options
        bool creative_mode;
+       bool enable_damage;
+       // If map deletion is requested, this is set to true
+       bool delete_map;
 };
 
 class GUIMainMenu : public GUIModalMenu
@@ -67,6 +102,11 @@ private:
        MainMenuData *m_data;
        bool m_accepted;
        IGameCallback *m_gamecallback;
+
+       gui::IGUIEnvironment* env;
+       gui::IGUIElement* parent;
+       s32 id;
+       IMenuManager *menumgr;
 };
 
 #endif