fix infinite spawners

[dragonfireclient.git] / src / guiMainMenu.h

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index a21f3b32acb4801f24e51790859b8b8bd726fb11..34362dba6495333422ff91d76e68e0c7092c9947 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -24,113 +24,40 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "modalMenu.h"
 #include <string>
 #include <list>
-#include "subgame.h"
-#include "serverlist.h"
 
-class IGameCallback;
+enum
+{
+       TAB_SINGLEPLAYER=0,
+       TAB_MULTIPLAYER,
+       TAB_ADVANCED,
+       TAB_SETTINGS,
+       TAB_CREDITS
+};
 
 struct MainMenuData
 {
-       // These are in the native format of the gui elements
-       // Generic
-       int selected_tab;
        // Client options
        std::string servername;
        std::string serverdescription;
-       std::wstring address;
-       std::wstring port;
-       std::wstring name;
-       std::wstring password;
-       bool fancy_trees;
-       bool smooth_lighting;
-       bool clouds_3d;
-       bool opaque_water;
-       bool mip_map;
-       bool anisotropic_filter;
-       bool bilinear_filter;
-       bool trilinear_filter;
-       int enable_shaders;
-       bool preload_item_visuals;
-       bool enable_particles;
+       std::string address;
+       std::string port;
+       std::string name;
+       std::string password;
+
        // Server options
-       bool creative_mode;
-       bool enable_damage;
        bool enable_public;
        int selected_world;
        bool simple_singleplayer_mode;
-       // Actions
-       std::wstring create_world_name;
-       std::string create_world_gameid;
-       bool only_refresh;
-
-       bool serverlist_show_available; // if false show local favorites only
-
-       std::vector<WorldSpec> worlds;
-       std::vector<SubgameSpec> games;
-       std::vector<ServerListSpec> servers;
 
+       //error handling
+       std::string errormessage;
        MainMenuData():
-               // Generic
-               selected_tab(0),
-               // Client opts
-               fancy_trees(false),
-               smooth_lighting(false),
-               // Server opts
-               creative_mode(false),
-               enable_damage(false),
                enable_public(false),
                selected_world(0),
                simple_singleplayer_mode(false),
-               // Actions
-               only_refresh(false),
-
-               serverlist_show_available(false)
+               errormessage("")
        {}
 };
 
-class GUIMainMenu : public GUIModalMenu
-{
-public:
-       GUIMainMenu(gui::IGUIEnvironment* env,
-                       gui::IGUIElement* parent, s32 id,
-                       IMenuManager *menumgr,
-                       MainMenuData *data,
-                       IGameCallback *gamecallback);
-       ~GUIMainMenu();
-       
-       void removeChildren();
-       // Remove and re-add (or reposition) stuff
-       void regenerateGui(v2u32 screensize);
-       void drawMenu();
-       void readInput(MainMenuData *dst);
-       void acceptInput();
-       bool getStatus()
-       { return m_accepted; }
-       bool OnEvent(const SEvent& event);
-       void createNewWorld(std::wstring name, std::string gameid);
-       void deleteWorld(const std::vector<std::string> &paths);
-       int getTab();
-       void displayMessageMenu(std::wstring msg);
-       
-private:
-       MainMenuData *m_data;
-       bool m_accepted;
-       IGameCallback *m_gamecallback;
-
-       gui::IGUIEnvironment* env;
-       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;
-       void updateGuiServerList();
-       void serverListOnSelected();
-       ServerListSpec getServerListSpec(std::string address, std::string port);
-};
-
 #endif