Revert old 4BS/s walk speed for now

[minetest.git] / src / guiMainMenu.h

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index a451a9c21ffb40bbac2e45b8e24623cc2af0f9ad..5f9e73f62a113c5fe0a1c492fdcc8cdf871135d5 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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
@@ -22,42 +22,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "modalMenu.h"
-#include "utility.h"
 #include <string>
-// 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_3D_CLOUDS_CB,
-       GUI_ID_DAMAGE_CB,
-       GUI_ID_CREATIVE_CB,
-       GUI_ID_JOIN_GAME_BUTTON,
-       GUI_ID_CHANGE_KEYS_BUTTON,
-       GUI_ID_DELETE_MAP_BUTTON
-};
+#include <list>
+#include "subgame.h"
+class IGameCallback;
 
 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
-       
+       // Generic
+       int selected_tab;
        // Client options
        std::wstring address;
        std::wstring port;
@@ -66,11 +40,32 @@ struct MainMenuData
        bool fancy_trees;
        bool smooth_lighting;
        bool clouds_3d;
+       bool opaque_water;
        // Server options
        bool creative_mode;
        bool enable_damage;
-       // If map deletion is requested, this is set to true
-       bool delete_map;
+       int selected_world;
+       bool simple_singleplayer_mode;
+       // Actions
+       WorldSpec delete_world_spec;
+       std::wstring create_world_name;
+       std::string create_world_gameid;
+
+       std::vector<WorldSpec> worlds;
+       std::vector<SubgameSpec> games;
+
+       MainMenuData():
+               // Generic
+               selected_tab(0),
+               // Client opts
+               fancy_trees(false),
+               smooth_lighting(false),
+               // Server opts
+               creative_mode(false),
+               enable_damage(false),
+               selected_world(0),
+               simple_singleplayer_mode(false)
+       {}
 };
 
 class GUIMainMenu : public GUIModalMenu
@@ -84,21 +79,17 @@ class GUIMainMenu : public GUIModalMenu
        ~GUIMainMenu();
        
        void removeChildren();
-       /*
-               Remove and re-add (or reposition) stuff
-       */
+       // Remove and re-add (or reposition) stuff
        void regenerateGui(v2u32 screensize);
-
        void drawMenu();
-
+       void readInput(MainMenuData *dst);
        void acceptInput();
-
        bool getStatus()
-       {
-               return m_accepted;
-       }
-
+       { return m_accepted; }
        bool OnEvent(const SEvent& event);
+       void createNewWorld(std::wstring name, std::string gameid);
+       void deleteWorld(WorldSpec spec);
+       int getTab();
        
 private:
        MainMenuData *m_data;
@@ -109,6 +100,12 @@ class GUIMainMenu : public GUIModalMenu
        gui::IGUIElement* parent;
        s32 id;
        IMenuManager *menumgr;
+       
+       bool m_is_regenerating;
+       v2s32 m_topleft_client;
+       v2s32 m_size_client;
+       v2s32 m_topleft_server;
+       v2s32 m_size_server;
 };
 
 #endif