diff options
| author | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
| commit | e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0 (patch) | |
| tree | 79a5a18634069822b84b9c878d8d26742567c4a3 /src/guiMainMenu.h | |
| parent | be96fa2fb884fca571b92f63d33e0c5a592a2aad (diff) | |
| parent | 822723c2468ea763cdef447218059a5586e8e033 (diff) | |
| download | minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.gz minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.bz2 minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/guiMainMenu.h')
| -rw-r--r-- | src/guiMainMenu.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h index a594ccd41..8697344c8 100644 --- a/src/guiMainMenu.h +++ b/src/guiMainMenu.h @@ -34,11 +34,22 @@ enum { SERVERLIST_PUBLIC, }; +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; + std::string selected_game; + std::string selected_game_name; // Client options std::string servername; std::string serverdescription; @@ -78,6 +89,8 @@ struct MainMenuData MainMenuData(): // Generic selected_tab(0), + selected_game("minetest"), + selected_game_name("Minetest"), // Client opts fancy_trees(false), smooth_lighting(false), @@ -128,6 +141,8 @@ private: s32 id; IMenuManager *menumgr; + std::vector<int> m_world_indices; + bool m_is_regenerating; v2s32 m_topleft_client; v2s32 m_size_client; |